summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2011-06-02 13:24:12 +0200
committerJuanma Barranquero <lekktu@gmail.com>2011-06-02 13:24:12 +0200
commitb3e945d3a47c5c64d84cb56594ff8c884acb1c37 (patch)
tree492e6b8576b86f6cf8db82dddc6446781244f2d3 /lisp/vc
parent910fcf6e00db45289d1257c8fce69739fa870978 (diff)
downloademacs-b3e945d3a47c5c64d84cb56594ff8c884acb1c37.tar.gz
Silence warning for unused `dotimes' counter variables.
* mpc.el (mpc-select-extend, mpc-songpointer-context): * vc/log-view.el (log-view-beginning-of-defun): * vc/smerge-mode.el (smerge-apply-resolution-patch) (smerge-refine-forward, smerge-refine-chopup-region):
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/log-view.el4
-rw-r--r--lisp/vc/smerge-mode.el6
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 9f6ad19fdb1..d8c6384934e 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -419,10 +419,10 @@ It assumes that a log entry starts with a line matching
(if (or (null arg) (zerop arg))
(setq arg 1))
(if (< arg 0)
- (dotimes (n (- arg))
+ (dotimes (_n (- arg))
(log-view-end-of-defun))
(catch 'beginning-of-buffer
- (dotimes (n arg)
+ (dotimes (_n arg)
(or (log-view-current-entry nil t)
(throw 'beginning-of-buffer nil)))
(point))))
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 286cb0ab9aa..64c4b04fb65 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -443,7 +443,7 @@ BUF contains a plain diff between match-1 and match-3."
(setq othertext
(if (null otherlines) ""
(let ((pos (point)))
- (dotimes (i otherlines) (delete-char 2) (forward-line 1))
+ (dotimes (_i otherlines) (delete-char 2) (forward-line 1))
(buffer-substring pos (point)))))
(with-current-buffer textbuf
(forward-line (- startline line))
@@ -910,7 +910,7 @@ It has the following disadvantages:
;; whitespace changes, it'll report added/removed lines :-(
(not smerge-refine-weight-hack))
(setq re (concat "[ \t]*\\(?:" re "\\)")))
- (dotimes (i n)
+ (dotimes (_i n)
(unless (looking-at re) (error "Smerge refine internal error"))
(goto-char (match-end 0)))))
@@ -948,7 +948,7 @@ chars to try and eliminate some spurious differences."
(unless (eq (char-before) ?\n) (insert ?\n))
;; HACK ALERT!!
(if smerge-refine-weight-hack
- (dotimes (i (1- (length s))) (insert s "\n")))))
+ (dotimes (_i (1- (length s))) (insert s "\n")))))
(unless (bolp) (error "Smerge refine internal error"))
(let ((coding-system-for-write 'emacs-mule))
(write-region (point-min) (point-max) file nil 'nomessage)))))