From: Alex Branham <alex.branham@gmail.com>
To: 30235@debbugs.gnu.org
Subject: bug#30235: [patch] undo-tree byte-compiler warnings
Date: Tue, 23 Jan 2018 17:18:00 -0600 [thread overview]
Message-ID: <87y3ko9nbr.fsf@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 8294 bytes --]
I'm not sure if this is the right place to submit patches for ELPA
packages, but I couldn't find anywhere else to go. Let me know if this
should go some place else.
This patch silences several byte compiler warnings, mostly having to do
with unused lexical variables in loops. There are two remaining that I
couldn't figure out how to deal with because I'm not terribly familiar
with the innards of Emacs's undo feature. (Note that the line numbers
are after applying the attached patch):
In undo-tree-pull-undo-in-region-branch:
undo-tree.el:2261:16:Warning: ‘undo-elt-crosses-region’ is an obsolete
function (as of 25.1).
In undo-tree-pull-redo-in-region-branch:
undo-tree.el:2470:16:Warning: ‘undo-elt-crosses-region’ is an obsolete
function (as of 25.1).
From f9a275a3cdb586f9ea91e26be84b4a42efe957fc Mon Sep 17 00:00:00 2001
From: Alex Branham <branham@utexas.edu>
Date: Tue, 23 Jan 2018 17:10:48 -0600
Subject: [PATCH] Silence the byte-compiler
---
undo-tree.el | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/undo-tree.el b/undo-tree.el
index 6c7ee2f..fc52cff 100644
--- a/undo-tree.el
+++ b/undo-tree.el
@@ -757,6 +757,10 @@
(eval-when-compile (require 'cl))
(require 'diff)
+;; silence the byte compiler
+(defvar undo-tree-mode)
+(defvar undo-tree-visualizer-selection-mode)
+
\f
;;; =====================================================================
@@ -2048,7 +2052,7 @@ which is defined in the `warnings' library.\n")
((= (mod num-children 2) 1)
(setq p (undo-tree-node-next node))
;; compute left-width
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(if (undo-tree-node-lwidth (car p))
(incf lwidth (+ (undo-tree-node-lwidth (car p))
(undo-tree-node-cwidth (car p))
@@ -2064,7 +2068,7 @@ which is defined in the `warnings' library.\n")
;; compute right-width
(incf rwidth (undo-tree-node-rwidth (car p)))
(setq p (cdr p))
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(if (undo-tree-node-lwidth (car p))
(incf rwidth (+ (undo-tree-node-lwidth (car p))
(undo-tree-node-cwidth (car p))
@@ -2076,7 +2080,7 @@ which is defined in the `warnings' library.\n")
(t
(setq p (undo-tree-node-next node))
;; compute left-width
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(if (undo-tree-node-lwidth (car p))
(incf lwidth (+ (undo-tree-node-lwidth (car p))
(undo-tree-node-cwidth (car p))
@@ -2086,7 +2090,7 @@ which is defined in the `warnings' library.\n")
;; centre-width is 0 when number of children is even
(setq cwidth 0)
;; compute right-width
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(if (undo-tree-node-lwidth (car p))
(incf rwidth (+ (undo-tree-node-lwidth (car p))
(undo-tree-node-cwidth (car p))
@@ -2748,7 +2752,7 @@ changes within the current region."
;; `buffer-undo-tree'
(undo-list-transfer-to-tree)
- (dotimes (i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
+ (dotimes (_i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
;; check if at top of undo tree
(unless (undo-tree-node-previous (undo-tree-current buffer-undo-tree))
(user-error "No further undo information"))
@@ -2857,7 +2861,7 @@ changes within the current region."
;; `buffer-undo-tree'
(undo-list-transfer-to-tree)
- (dotimes (i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
+ (dotimes (_i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
;; check if at bottom of undo tree
(when (null (undo-tree-node-next (undo-tree-current buffer-undo-tree)))
(user-error "No further redo information"))
@@ -3576,7 +3580,7 @@ signaling an error if file is not found."
(car (undo-tree-node-next node)))))
(move-marker (setq pos (make-marker)) (point))
(setq n (cons nil (undo-tree-node-next node)))
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(setq n (cdr n))
(when (or (null active-branch)
(eq (car n)
@@ -3629,7 +3633,7 @@ signaling an error if file is not found."
(move-marker pos (point)))
;; right subtrees
(move-marker trunk-pos (1+ trunk-pos))
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(setq n (cdr n))
(when (or (null active-branch)
(eq (car n)
@@ -3684,7 +3688,7 @@ signaling an error if file is not found."
(when (characterp str)
(setq str (make-string arg str))
(setq arg 1))
- (dotimes (i arg) (insert str))
+ (dotimes (_i arg) (insert str))
(setq arg (* arg (length str)))
(undo-tree-move-forward arg)
;; make sure mark isn't active, otherwise `backward-delete-char' might
@@ -3769,7 +3773,7 @@ signaling an error if file is not found."
(undo-tree-move-forward
(+ (undo-tree-node-char-rwidth (car n))
(/ undo-tree-visualizer-spacing 2) 1))
- (dotimes (i (- (/ l 2) p 1))
+ (dotimes (_i (- (/ l 2) p 1))
(setq n (cdr n))
(undo-tree-move-forward
(+ (undo-tree-node-char-lwidth (car n))
@@ -3787,7 +3791,7 @@ signaling an error if file is not found."
(+ (undo-tree-node-char-rwidth (car n))
(/ undo-tree-visualizer-spacing 2) 1))
(setq n (cdr n)))
- (dotimes (i (- p (/ l 2) (mod l 2)))
+ (dotimes (_i (- p (/ l 2) (mod l 2)))
(undo-tree-move-backward
(+ (undo-tree-node-char-lwidth (car n))
(undo-tree-node-char-rwidth (car n))
@@ -3801,13 +3805,13 @@ signaling an error if file is not found."
(defun undo-tree-timestamp-to-string
- (timestamp &optional relative current register)
+ (timestamp &optional relative current register)
;; Convert TIMESTAMP to string (either absolute or RELATVE time), indicating
;; if it's the CURRENT node and/or has an associated REGISTER.
(if relative
;; relative time
(let ((time (floor (float-time
- (subtract-time (current-time) timestamp))))
+ (time-subtract (current-time) timestamp))))
n)
(setq time
;; years
@@ -4232,7 +4236,7 @@ specifies `saved', and a negative prefix argument specifies
(user-error "Undo-tree mode not enabled in buffer"))
(let ((node undo-tree-visualizer-selected-node))
(catch 'top
- (dotimes (i (or arg 1))
+ (dotimes (_i (or arg 1))
(unless (undo-tree-node-previous node) (throw 'top t))
(setq node (undo-tree-node-previous node))))
;; when using lazy drawing, extend tree upwards as required
@@ -4254,7 +4258,7 @@ specifies `saved', and a negative prefix argument specifies
(user-error "Undo-tree mode not enabled in buffer"))
(let ((node undo-tree-visualizer-selected-node))
(catch 'bottom
- (dotimes (i (or arg 1))
+ (dotimes (_i (or arg 1))
(unless (nth (undo-tree-node-branch node) (undo-tree-node-next node))
(throw 'bottom t))
(setq node
@@ -4281,7 +4285,7 @@ specifies `saved', and a negative prefix argument specifies
(goto-char (undo-tree-node-marker undo-tree-visualizer-selected-node))
(setq end (line-end-position))
(catch 'end
- (dotimes (i arg)
+ (dotimes (_i arg)
(while (or (null node) (eq node undo-tree-visualizer-selected-node))
(forward-char)
(setq node (get-text-property (point) 'undo-tree-node))
@@ -4304,7 +4308,7 @@ specifies `saved', and a negative prefix argument specifies
(goto-char (undo-tree-node-marker undo-tree-visualizer-selected-node))
(setq beg (line-beginning-position))
(catch 'beg
- (dotimes (i arg)
+ (dotimes (_i arg)
(while (or (null node) (eq node undo-tree-visualizer-selected-node))
(backward-char)
(setq node (get-text-property (point) 'undo-tree-node))
--
2.16.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Silence-the-byte-compiler.patch --]
[-- Type: text/x-patch, Size: 7320 bytes --]
From f9a275a3cdb586f9ea91e26be84b4a42efe957fc Mon Sep 17 00:00:00 2001
From: Alex Branham <branham@utexas.edu>
Date: Tue, 23 Jan 2018 17:10:48 -0600
Subject: [PATCH] Silence the byte-compiler
---
undo-tree.el | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/undo-tree.el b/undo-tree.el
index 6c7ee2f..fc52cff 100644
--- a/undo-tree.el
+++ b/undo-tree.el
@@ -757,6 +757,10 @@
(eval-when-compile (require 'cl))
(require 'diff)
+;; silence the byte compiler
+(defvar undo-tree-mode)
+(defvar undo-tree-visualizer-selection-mode)
+
\f
;;; =====================================================================
@@ -2048,7 +2052,7 @@ which is defined in the `warnings' library.\n")
((= (mod num-children 2) 1)
(setq p (undo-tree-node-next node))
;; compute left-width
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(if (undo-tree-node-lwidth (car p))
(incf lwidth (+ (undo-tree-node-lwidth (car p))
(undo-tree-node-cwidth (car p))
@@ -2064,7 +2068,7 @@ which is defined in the `warnings' library.\n")
;; compute right-width
(incf rwidth (undo-tree-node-rwidth (car p)))
(setq p (cdr p))
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(if (undo-tree-node-lwidth (car p))
(incf rwidth (+ (undo-tree-node-lwidth (car p))
(undo-tree-node-cwidth (car p))
@@ -2076,7 +2080,7 @@ which is defined in the `warnings' library.\n")
(t
(setq p (undo-tree-node-next node))
;; compute left-width
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(if (undo-tree-node-lwidth (car p))
(incf lwidth (+ (undo-tree-node-lwidth (car p))
(undo-tree-node-cwidth (car p))
@@ -2086,7 +2090,7 @@ which is defined in the `warnings' library.\n")
;; centre-width is 0 when number of children is even
(setq cwidth 0)
;; compute right-width
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(if (undo-tree-node-lwidth (car p))
(incf rwidth (+ (undo-tree-node-lwidth (car p))
(undo-tree-node-cwidth (car p))
@@ -2748,7 +2752,7 @@ changes within the current region."
;; `buffer-undo-tree'
(undo-list-transfer-to-tree)
- (dotimes (i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
+ (dotimes (_i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
;; check if at top of undo tree
(unless (undo-tree-node-previous (undo-tree-current buffer-undo-tree))
(user-error "No further undo information"))
@@ -2857,7 +2861,7 @@ changes within the current region."
;; `buffer-undo-tree'
(undo-list-transfer-to-tree)
- (dotimes (i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
+ (dotimes (_i (or (and (numberp arg) (prefix-numeric-value arg)) 1))
;; check if at bottom of undo tree
(when (null (undo-tree-node-next (undo-tree-current buffer-undo-tree)))
(user-error "No further redo information"))
@@ -3576,7 +3580,7 @@ signaling an error if file is not found."
(car (undo-tree-node-next node)))))
(move-marker (setq pos (make-marker)) (point))
(setq n (cons nil (undo-tree-node-next node)))
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(setq n (cdr n))
(when (or (null active-branch)
(eq (car n)
@@ -3629,7 +3633,7 @@ signaling an error if file is not found."
(move-marker pos (point)))
;; right subtrees
(move-marker trunk-pos (1+ trunk-pos))
- (dotimes (i (/ num-children 2))
+ (dotimes (_i (/ num-children 2))
(setq n (cdr n))
(when (or (null active-branch)
(eq (car n)
@@ -3684,7 +3688,7 @@ signaling an error if file is not found."
(when (characterp str)
(setq str (make-string arg str))
(setq arg 1))
- (dotimes (i arg) (insert str))
+ (dotimes (_i arg) (insert str))
(setq arg (* arg (length str)))
(undo-tree-move-forward arg)
;; make sure mark isn't active, otherwise `backward-delete-char' might
@@ -3769,7 +3773,7 @@ signaling an error if file is not found."
(undo-tree-move-forward
(+ (undo-tree-node-char-rwidth (car n))
(/ undo-tree-visualizer-spacing 2) 1))
- (dotimes (i (- (/ l 2) p 1))
+ (dotimes (_i (- (/ l 2) p 1))
(setq n (cdr n))
(undo-tree-move-forward
(+ (undo-tree-node-char-lwidth (car n))
@@ -3787,7 +3791,7 @@ signaling an error if file is not found."
(+ (undo-tree-node-char-rwidth (car n))
(/ undo-tree-visualizer-spacing 2) 1))
(setq n (cdr n)))
- (dotimes (i (- p (/ l 2) (mod l 2)))
+ (dotimes (_i (- p (/ l 2) (mod l 2)))
(undo-tree-move-backward
(+ (undo-tree-node-char-lwidth (car n))
(undo-tree-node-char-rwidth (car n))
@@ -3801,13 +3805,13 @@ signaling an error if file is not found."
(defun undo-tree-timestamp-to-string
- (timestamp &optional relative current register)
+ (timestamp &optional relative current register)
;; Convert TIMESTAMP to string (either absolute or RELATVE time), indicating
;; if it's the CURRENT node and/or has an associated REGISTER.
(if relative
;; relative time
(let ((time (floor (float-time
- (subtract-time (current-time) timestamp))))
+ (time-subtract (current-time) timestamp))))
n)
(setq time
;; years
@@ -4232,7 +4236,7 @@ specifies `saved', and a negative prefix argument specifies
(user-error "Undo-tree mode not enabled in buffer"))
(let ((node undo-tree-visualizer-selected-node))
(catch 'top
- (dotimes (i (or arg 1))
+ (dotimes (_i (or arg 1))
(unless (undo-tree-node-previous node) (throw 'top t))
(setq node (undo-tree-node-previous node))))
;; when using lazy drawing, extend tree upwards as required
@@ -4254,7 +4258,7 @@ specifies `saved', and a negative prefix argument specifies
(user-error "Undo-tree mode not enabled in buffer"))
(let ((node undo-tree-visualizer-selected-node))
(catch 'bottom
- (dotimes (i (or arg 1))
+ (dotimes (_i (or arg 1))
(unless (nth (undo-tree-node-branch node) (undo-tree-node-next node))
(throw 'bottom t))
(setq node
@@ -4281,7 +4285,7 @@ specifies `saved', and a negative prefix argument specifies
(goto-char (undo-tree-node-marker undo-tree-visualizer-selected-node))
(setq end (line-end-position))
(catch 'end
- (dotimes (i arg)
+ (dotimes (_i arg)
(while (or (null node) (eq node undo-tree-visualizer-selected-node))
(forward-char)
(setq node (get-text-property (point) 'undo-tree-node))
@@ -4304,7 +4308,7 @@ specifies `saved', and a negative prefix argument specifies
(goto-char (undo-tree-node-marker undo-tree-visualizer-selected-node))
(setq beg (line-beginning-position))
(catch 'beg
- (dotimes (i arg)
+ (dotimes (_i arg)
(while (or (null node) (eq node undo-tree-visualizer-selected-node))
(backward-char)
(setq node (get-text-property (point) 'undo-tree-node))
--
2.16.1
next reply other threads:[~2018-01-23 23:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-23 23:18 Alex Branham [this message]
2019-06-25 11:51 ` bug#24354: bug#30235: [patch] undo-tree byte-compiler warnings Lars Ingebrigtsen
2019-06-25 13:32 ` Basil L. Contovounesios
2019-06-25 13:34 ` Lars Ingebrigtsen
2019-06-26 3:24 ` bug#24354: " Richard Stallman
2019-09-17 12:39 ` Lars Ingebrigtsen
2019-09-18 11:51 ` Toby Cubitt
2019-09-18 13:53 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y3ko9nbr.fsf@gmail.com \
--to=alex.branham@gmail.com \
--cc=30235@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).