* lisp/vc/add-log.el (change-log-next-buffer): Don't create an empty

buffer "ChangeLog" when the current buffer doesn't match ChangeLog.[0-9].
Return the current buffer if no files match the default pattern
ChangeLog.[0-9].  Signal "end of multi" when file is nil.

Fixes: debbugs:18547

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c87af7bd16a57f1eeaca8549325d145ae048b5f4..eb52886a4a9f8383a13066ee10a2ddbb7192da5a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-25  Juri Linkov  <juri@jurta.org>
+
+       * vc/add-log.el (change-log-next-buffer): Don't create an empty
+       buffer "ChangeLog" when the current buffer doesn't match ChangeLog.[0-9].
+       Return the current buffer if no files match the default pattern
+       ChangeLog.[0-9].  Signal "end of multi" when file is nil. (Bug#18547)
+
 2014-09-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * net/tramp-sh.el (tramp-sh-handle-vc-registered): Don't modify

diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index 8e44c024dc4d0cc95347f39ef4b117277c950653..cd6fcaec28e664b98df3294768bce620b1f0bb4f 100644 (file)
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -1097,12 +1097,17 @@ file were isearch was started."
                                    (ignore-errors
                                      (version< (substring b (length name))
                                                (substring a (length name))))))))
-        (files (if isearch-forward files (reverse files))))
-    (find-file-noselect
-     (if wrap
-        (car files)
-       (cadr (member (file-name-nondirectory (buffer-file-name buffer))
-                    files))))))
+        (files (if isearch-forward files (reverse files)))
+        (file (if wrap
+                  (car files)
+                (cadr (member (file-name-nondirectory (buffer-file-name buffer))
+                              files)))))
+    ;; If there are no files that match the default pattern ChangeLog.[0-9],
+    ;; return the current buffer to force isearch wrapping to its beginning.
+    ;; If file is nil, multi-isearch-search-fun will signal "end of multi".
+    (if (file-exists-p file)
+       (find-file-noselect file)
+      (current-buffer))))
 
 (defun change-log-fill-forward-paragraph (n)
   "Cut paragraphs so filling preserves open parentheses at beginning of lines."