diff options
| author | Glenn Morris <[email protected]> | 2008-10-02 17:32:40 +0000 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2008-10-02 17:32:40 +0000 |
| commit | 60aff9248a70af7ba42db6dbb2b10bc8542947f0 (patch) | |
| tree | 9d60ff90bf0d7a315f552c30657ceabc2e3ae8c2 /lisp | |
| parent | 06b2d4c6a24366698449c4789b5864ad7caa9338 (diff) | |
(vc-bzr-diff): Use vc-switches rather than the obsolete vc-diff-switches.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2424124ba3..cec036fafc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Glenn Morris <[email protected]> + + * vc-bzr.el (vc-bzr-diff): Use vc-switches rather than the obsolete + vc-diff-switches. + 2008-10-01 Vinicius Jose Latorre <[email protected]> * whitespace.el: Eliminate whitespace-kill-buffer-hook functionality, diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index ddce0ed822..45269e5eed 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -485,7 +485,7 @@ REV non-nil gets an error." ;; `bzr diff' exits with code 1 if diff is non-empty. (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*") 'async files "--diff-options" (mapconcat 'identity - (vc-diff-switches-list bzr) + (vc-switches 'bzr 'diff) " ") ;; This `when' is just an optimization because bzr-1.2 is *much* ;; faster when the revision argument is not given. |