aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-10-02 17:32:40 +0000
committerGlenn Morris2008-10-02 17:32:40 +0000
commit60aff9248a70af7ba42db6dbb2b10bc8542947f0 (patch)
tree9d60ff90bf0d7a315f552c30657ceabc2e3ae8c2
parent06b2d4c6a24366698449c4789b5864ad7caa9338 (diff)
downloademacs-60aff9248a70af7ba42db6dbb2b10bc8542947f0.tar.gz
emacs-60aff9248a70af7ba42db6dbb2b10bc8542947f0.zip
(vc-bzr-diff): Use vc-switches rather than the obsolete vc-diff-switches.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-bzr.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2424124ba32..cec036fafc8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-10-02 Glenn Morris <rgm@gnu.org>
2
3 * vc-bzr.el (vc-bzr-diff): Use vc-switches rather than the obsolete
4 vc-diff-switches.
5
12008-10-01 Vinicius Jose Latorre <viniciusjl@ig.com.br> 62008-10-01 Vinicius Jose Latorre <viniciusjl@ig.com.br>
2 7
3 * whitespace.el: Eliminate whitespace-kill-buffer-hook functionality, 8 * whitespace.el: Eliminate whitespace-kill-buffer-hook functionality,
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index ddce0ed8222..45269e5eed9 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -485,7 +485,7 @@ REV non-nil gets an error."
485 ;; `bzr diff' exits with code 1 if diff is non-empty. 485 ;; `bzr diff' exits with code 1 if diff is non-empty.
486 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files 486 (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files
487 "--diff-options" (mapconcat 'identity 487 "--diff-options" (mapconcat 'identity
488 (vc-diff-switches-list bzr) 488 (vc-switches 'bzr 'diff)
489 " ") 489 " ")
490 ;; This `when' is just an optimization because bzr-1.2 is *much* 490 ;; This `when' is just an optimization because bzr-1.2 is *much*
491 ;; faster when the revision argument is not given. 491 ;; faster when the revision argument is not given.