summaryrefslogtreecommitdiff
path: root/lisp/vc-bzr.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2009-12-03 07:31:15 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2009-12-03 07:31:15 +0000
commit3f6bd7904e8a9a8c312089abcbf2f71ec11b5353 (patch)
treef19cfaf68c4152804a28c0c8606526340c0cb443 /lisp/vc-bzr.el
parent842d73a12ebe59c92c5140799c135a6d19d04cc8 (diff)
downloademacs-3f6bd7904e8a9a8c312089abcbf2f71ec11b5353.tar.gz
emacs-3f6bd7904e8a9a8c312089abcbf2f71ec11b5353.tar.bz2
emacs-3f6bd7904e8a9a8c312089abcbf2f71ec11b5353.zip
(vc-bzr-print-log): Deal with nil arguments better.
Diffstat (limited to 'lisp/vc-bzr.el')
-rw-r--r--lisp/vc-bzr.el11
1 files changed, 6 insertions, 5 deletions
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."