diff options
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/bs.el | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-loaddefs.el | 2 | ||||
| -rw-r--r-- | lisp/mpc.el | 6 | ||||
| -rw-r--r-- | lisp/vc/log-view.el | 4 | ||||
| -rw-r--r-- | lisp/vc/smerge-mode.el | 6 |
6 files changed, 20 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1f82735806a..3834c99f000 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2011-06-02 Juanma Barranquero <lekktu@gmail.com> + + * bs.el (bs--mark-unmark, bs--nth-wrapper): + * 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): + Silence warning for unused `dotimes' counter variables. + 2011-06-02 Stefan Monnier <monnier@iro.umontreal.ca> * net/tramp.el (tramp-with-progress-reporter): Rename from diff --git a/lisp/bs.el b/lisp/bs.el index 6965af1368c..95dc371e57b 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -865,7 +865,7 @@ the status of buffer on current line." (defun bs--mark-unmark (count fun) "Call FUN on COUNT consecutive buffers of *buffer-selection*." (let ((dir (if (> count 0) 1 -1))) - (dotimes (i (abs count)) + (dotimes (_i (abs count)) (let ((buffer (bs--current-buffer))) (when buffer (funcall fun buffer)) (bs--update-current-line) @@ -976,7 +976,7 @@ Uses function `toggle-read-only'." (defun bs--nth-wrapper (count fun &rest args) "Call COUNT times function FUN with arguments ARGS." - (dotimes (i (or count 1)) + (dotimes (_i (or count 1)) (apply fun args))) (defun bs-up (arg) diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 4c824d4a6d4..48c7386bd43 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@ -282,7 +282,7 @@ Not documented ;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist ;;;;;; do* do loop return-from return block etypecase typecase ecase ;;;;;; case load-time-value eval-when destructuring-bind function* -;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "fe8a5acbe14e32846a77578b2165fab5") +;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "9f551dc739a39b3c8b420fbd1ab71879") ;;; Generated autoloads from cl-macs.el (autoload 'gensym "cl-macs" "\ diff --git a/lisp/mpc.el b/lisp/mpc.el index b1e4d860cca..5319ea43898 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el @@ -1318,7 +1318,7 @@ If PLAYLIST is t or nil or missing, use the main playlist." (setq count before) (setq dir -1)) (goto-char start) - (dotimes (i (1+ (or count 0))) + (dotimes (_i (1+ (or count 0))) (mpc-select-make-overlay) (forward-line dir)))))) (when mpc-tag @@ -2114,12 +2114,12 @@ This is used so that they can be compared with `eq', which is needed for (let ((context-before '()) (context-after '())) (save-excursion - (dotimes (i size) + (dotimes (_i size) (when (re-search-backward "^[0-9]+:\\(.*\\)" nil t) (push (mpc-songs-hashcons (match-string 1)) context-before)))) ;; Skip the actual current song. (forward-line 1) - (dotimes (i size) + (dotimes (_i size) (when (re-search-forward "^[0-9]+:\\(.*\\)" nil t) (push (mpc-songs-hashcons (match-string 1)) context-after))) ;; If there isn't `size' context, then return nil. 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))))) |