From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Thu, 3 Dec 2009 07:31:15 +0000 (+0000)
Subject: (vc-bzr-print-log): Deal with nil arguments better.
X-Git-Tag: emacs-pretest-23.1.90~108
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f6bd7904e8a9a8c312089abcbf2f71ec11b5353;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4e9696ab8b..f6842769e69 100644
--- 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 84153a29eb0..9f554b5bd92 100644
--- 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."