aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-03-22 15:57:43 -0400
committerGlenn Morris2012-03-22 15:57:43 -0400
commit9e1a1109f7ba74795897cbcb4cb9bbc5d4046bf6 (patch)
tree8154c80ed2fab6828d6866ebf62a06011154a0fc
parentb4715d2a084182032d1c7de5527818bf0a2d4a41 (diff)
downloademacs-9e1a1109f7ba74795897cbcb4cb9bbc5d4046bf6.tar.gz
emacs-9e1a1109f7ba74795897cbcb4cb9bbc5d4046bf6.zip
Tweak previous vz-bzr change yet again
-rw-r--r--lisp/vc/vc-bzr.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 58e1c27c226..798131236d5 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -116,7 +116,8 @@ prepends `vc-bzr-status-switches' to ARGS."
116 process-environment))) 116 process-environment)))
117 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-bzr-program 117 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-bzr-program
118 file-or-list bzr-command 118 file-or-list bzr-command
119 (if (string-equal "status" bzr-command) 119 (if (and (string-equal "status" bzr-command)
120 vc-bzr-status-switches)
120 (append (if (stringp vc-bzr-status-switches) 121 (append (if (stringp vc-bzr-status-switches)
121 (list vc-bzr-status-switches) 122 (list vc-bzr-status-switches)
122 vc-bzr-status-switches) 123 vc-bzr-status-switches)