# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1259825475 0
# Node ID d1166d927ca28deb02fc582b21c41ccd4589b81f
# Parent  cd8b405d57c6e9e73aeb60a96991cb3066b4e3ea
(vc-bzr-print-log): Deal with nil arguments better.

diff -r cd8b405d57c6 -r d1166d927ca2 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Dec 03 05:41:17 2009 +0000
+++ b/lisp/ChangeLog	Thu Dec 03 07:31:15 2009 +0000
@@ -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 -r cd8b405d57c6 -r d1166d927ca2 lisp/vc-bzr.el
--- a/lisp/vc-bzr.el	Thu Dec 03 05:41:17 2009 +0000
+++ b/lisp/vc-bzr.el	Thu Dec 03 07:31:15 2009 +0000
@@ -493,11 +493,12 @@
   ;; 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."