[Emacs-diffs] /srv/bzr/emacs/trunk r111675: * lisp/vc/vc.el (vc-next-action): Fix inf-loop.

[Stefan Monnier]

------------------------------------------------------------
revno: 111675
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13610
author: Thierry Volpiatto <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-02-04 16:23:15 -0500
message:
  * lisp/vc/vc.el (vc-next-action): Fix inf-loop.
  (vc-update-change-log): Use dolist.
modified:
  lisp/ChangeLog
  lisp/vc/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-04 12:02:25 +0000
+++ b/lisp/ChangeLog    2013-02-04 21:23:15 +0000
@@ -1,3 +1,8 @@
+2013-02-04  Thierry Volpiatto  <address@hidden>
+
+       * vc/vc.el (vc-next-action): Fix inf-loop (bug#13610).
+       (vc-update-change-log): Use dolist.
+
 2013-02-04  Chong Yidong  <address@hidden>
 
        * thingatpt.el: Rewrite the URL detection routines, absorbing some
@@ -10,13 +15,13 @@
        (thing-at-point-newsgroup-heads)
        (thing-at-point-default-mail-uri-scheme): New variables.
        (thing-at-point-bounds-of-url-at-point): Rewrite.  Use ffap's
-       method to find the possible bounds of the URI at point.  New
-       optional argument to find ill-formed URIs.
+       method to find the possible bounds of the URI at point.
+       New optional argument to find ill-formed URIs.
        (thing-at-point-url-at-point): Rewrite.  New arguments for finding
        ill-formed URIs.  Use thing-at-point-bounds-of-url-at-point, and
        the scheme-adding heuristics from ffap-url-at-point.
-       (thing-at-point--bounds-of-well-formed-url): New function.  Do
-       parens matching to decide whether to include parens in the URI
+       (thing-at-point--bounds-of-well-formed-url): New function.
+       Do parens matching to decide whether to include parens in the URI
        (Bug#9153).
 
        * ffap.el: Require thingatpt.
@@ -41,8 +46,8 @@
        (tramp-handle-insert-file-contents): Use `visit' when inserting
        the local copy.
 
-       * net/tramp-sh.el (tramp-sh-handle-set-visited-file-modtime): Use
-       `remote-file-name-inhibit-cache'.
+       * net/tramp-sh.el (tramp-sh-handle-set-visited-file-modtime):
+       Use `remote-file-name-inhibit-cache'.
 
 2013-02-03  Stefan Monnier  <address@hidden>
 

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2013-01-06 02:58:57 +0000
+++ b/lisp/vc/vc.el     2013-02-04 21:23:15 +0000
@@ -1079,15 +1079,13 @@
     ;; If a buffer has unsaved changes, a checkout would discard those
     ;; changes, so treat the buffer as having unlocked changes.
     (when (and (not (eq model 'implicit)) (eq state 'up-to-date))
-      (let ((files files))
-       (while files
-         (let ((buffer (get-file-buffer (car files))))
-           (and buffer
-                (buffer-modified-p buffer)
-                (setq state 'unlocked-changes
-                      files nil))))))
+      (dolist (file files)
+        (let ((buffer (get-file-buffer file)))
+          (and buffer
+               (buffer-modified-p buffer)
+               (setq state 'unlocked-changes)))))
 
-    ;; Do the right thing
+    ;; Do the right thing.
     (cond
      ((eq state 'missing)
       (error "Fileset files are missing, so cannot be operated on"))
@@ -2667,14 +2665,11 @@
    (cond ((consp current-prefix-arg)   ;C-u
          (list buffer-file-name))
         (current-prefix-arg            ;Numeric argument.
-         (let ((files nil)
-               (buffers (buffer-list))
-               file)
-           (while buffers
-             (setq file (buffer-file-name (car buffers)))
-             (and file (vc-backend file)
-                  (setq files (cons file files)))
-             (setq buffers (cdr buffers)))
+         (let ((files nil))
+            (dolist (buffer (buffer-list))
+             (let ((file (buffer-file-name buffer)))
+                (and file (vc-backend file)
+                     (setq files (cons file files)))))
            files))
         (t
           ;; Don't supply any filenames to backend; this means