(vc-bzr-print-log): Deal with nil arguments better.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4e9696..f684276 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-bzr.el (vc-bzr-print-log): Deal with nil arguments better.
+
 2009-12-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * textmodes/bibtex.el (bibtex-complete-internal):

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 84153a2..9f554b5 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -493,11 +493,12 @@ REV non-nil gets an error."
   ;; way of getting the above regexps working.
   (with-current-buffer buffer
     (apply 'vc-bzr-command "log" buffer 'async files
-          (when shortlog "--short")
-          (when limit (list "-l" (format "%s" limit)))
-          (if (stringp vc-bzr-log-switches)
-              (list vc-bzr-log-switches)
-            vc-bzr-log-switches))))
+          (append
+           (when shortlog '("--short"))
+           (when limit (list "-l" (format "%s" limit)))
+           (if (stringp vc-bzr-log-switches)
+               (list vc-bzr-log-switches)
+             vc-bzr-log-switches)))))
 
 (defun vc-bzr-show-log-entry (revision)
   "Find entry for patch name REVISION in bzr change log buffer."