[Emacs-diffs] Changes to emacs/lisp/vc-bzr.el,v [EMACS_22_BASE]

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Dan Nicolaescu <dann>   08/03/20 07:48:11

Index: vc-bzr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.11.2.14
retrieving revision 1.11.2.15
diff -u -b -r1.11.2.14 -r1.11.2.15
--- vc-bzr.el   19 Mar 2008 03:49:08 -0000      1.11.2.14
+++ vc-bzr.el   20 Mar 2008 07:48:07 -0000      1.11.2.15
@@ -375,13 +375,16 @@
   (vc-setup-buffer buffer)
   ;; If the buffer exists from a previous invocation it might be
   ;; read-only.
-  (let ((inhibit-read-only t))
+  (let ((inhibit-read-only t)
+       ;; Support both the old print-log interface that passes a
+       ;; single file, and the new one that passes a file list.
+       (flist (if (listp files) files (list files))))
     ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so
     ;; the log display may not what the user wants - but I see no other
     ;; way of getting the above regexps working.
     ;; "bzr log" (as of bzr-1.1) can only take a single file argument.
     ;; Loop through the file list.
-    (dolist (file files)
+    (dolist (file flist)
       (with-current-buffer buffer
        ;; Insert the file name so that log-view.el can find it.
        (insert "Working file: " file "\n")) ;; Like RCS/CVS.
@@ -403,7 +406,7 @@
         (concat "^[ ]*-+\n[ ]*revno: " 
                 ;; The revision can contain ".", quote it so that it
                 ;; does not interfere with regexp matching.
-                (regexp-quote revision) "$") nil t)
+                (regexp-quote version) "$") nil t)
         (beginning-of-line 0)
       (goto-char (point-min)))))