(vc-bzr-print-log): Ensure it works when passed a

single file argument.
(vc-bzr-show-log-entry): Fix typo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fba2d6a3aefc0ff3bf185714b58be9571f66ab55..b1aecb57b2ee69cd8b333bb0ed89f4950169cee1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-bzr.el (vc-bzr-print-log): Ensure it works when passed a
+       single file argument.
+       (vc-bzr-show-log-entry): Fix typo.
+
 2008-03-19  Wilson Snyder  <wsnyder@wsnyder.org>
 
        * progmodes/verilog-mode.el (verilog-easy-menu-filter): New

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 2d0e1a18c3d74157ccdc644d30ca712e0560d856..c689d70deef1f8d64848f97e3206455128f8f202 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -375,13 +375,16 @@ EDITABLE is ignored."
   (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 @@ EDITABLE is ignored."
         (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)))))