[Emacs-diffs] /srv/bzr/emacs/trunk r104479: Silence warning for unused `dotimes' counter variables.

[Juanma Barranquero]

------------------------------------------------------------
revno: 104479
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-02 13:24:12 +0200
message:
  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):
modified:
  lisp/ChangeLog
  lisp/bs.el
  lisp/mpc.el
  lisp/vc/log-view.el
  lisp/vc/smerge-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-02 03:48:23 +0000
+++ b/lisp/ChangeLog    2011-06-02 11:24:12 +0000
@@ -1,3 +1,12 @@
+2011-06-02  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tramp.el (tramp-with-progress-reporter): Rename from

=== modified file 'lisp/bs.el'
--- a/lisp/bs.el        2011-04-07 23:59:27 +0000
+++ b/lisp/bs.el        2011-06-02 11:24:12 +0000
@@ -865,7 +865,7 @@
 (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 @@
 
 (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)

=== modified file 'lisp/mpc.el'
--- a/lisp/mpc.el       2011-03-11 20:04:22 +0000
+++ b/lisp/mpc.el       2011-06-02 11:24:12 +0000
@@ -1318,7 +1318,7 @@
             (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 @@
     (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.

=== modified file 'lisp/vc/log-view.el'
--- a/lisp/vc/log-view.el       2011-03-31 04:24:03 +0000
+++ b/lisp/vc/log-view.el       2011-06-02 11:24:12 +0000
@@ -419,10 +419,10 @@
   (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))))

=== modified file 'lisp/vc/smerge-mode.el'
--- a/lisp/vc/smerge-mode.el    2011-05-23 17:03:03 +0000
+++ b/lisp/vc/smerge-mode.el    2011-06-02 11:24:12 +0000
@@ -443,7 +443,7 @@
             (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 @@
                ;; 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 @@
           (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)))))