# HG changeset patch # User Dan Nicolaescu # Date 1205999288 0 # Node ID a88ae58b90539769bfe9812a2b7f3a3dfb500914 # Parent 35dfb85c0e6b33840146b06f2748732a19f56a8d (vc-bzr-print-log): Ensure it works when passed a single file argument. (vc-bzr-show-log-entry): Fix typo. diff -r 35dfb85c0e6b -r a88ae58b9053 lisp/ChangeLog --- a/lisp/ChangeLog Thu Mar 20 06:15:05 2008 +0000 +++ b/lisp/ChangeLog Thu Mar 20 07:48:08 2008 +0000 @@ -1,3 +1,9 @@ +2008-03-20 Dan Nicolaescu + + * 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 * progmodes/verilog-mode.el (verilog-easy-menu-filter): New diff -r 35dfb85c0e6b -r a88ae58b9053 lisp/vc-bzr.el --- a/lisp/vc-bzr.el Thu Mar 20 06:15:05 2008 +0000 +++ b/lisp/vc-bzr.el Thu Mar 20 07:48:08 2008 +0000 @@ -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)))))