From 60aff9248a70af7ba42db6dbb2b10bc8542947f0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 2 Oct 2008 17:32:40 +0000 Subject: [PATCH] (vc-bzr-diff): Use vc-switches rather than the obsolete vc-diff-switches. --- lisp/ChangeLog | 5 +++++ lisp/vc-bzr.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2424124ba32..cec036fafc8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-10-02 Glenn Morris + + * vc-bzr.el (vc-bzr-diff): Use vc-switches rather than the obsolete + vc-diff-switches. + 2008-10-01 Vinicius Jose Latorre * 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." ;; `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. -- 2.39.5