Mercurial > emacs
changeset 100059:18d556e2b8e1
(vc-svn-diff-switches): Doc fix.
(vc-svn-diff): Fix the case where vc-svn-diff-switches is nil.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 30 Nov 2008 01:58:06 +0000 |
| parents | fc3d57499127 |
| children | 4857e032f3d6 |
| files | lisp/ChangeLog lisp/vc-svn.el |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Nov 30 01:45:29 2008 +0000 +++ b/lisp/ChangeLog Sun Nov 30 01:58:06 2008 +0000 @@ -1,5 +1,8 @@ 2008-11-30 Glenn Morris <rgm@gnu.org> + * vc-svn.el (vc-svn-diff-switches): Doc fix. + (vc-svn-diff): Fix the case where vc-svn-diff-switches is nil. + * vc-git.el (vc-git-diff): * vc-hg.el (vc-hg-diff): * vc-mtn.el (vc-mtn-diff): No need to duplicate vc-switches logic.
--- a/lisp/vc-svn.el Sun Nov 30 01:45:29 2008 +0000 +++ b/lisp/vc-svn.el Sun Nov 30 01:58:06 2008 +0000 @@ -66,8 +66,10 @@ (defcustom vc-svn-diff-switches t ;`svn' doesn't support common args like -c or -b. "String or list of strings specifying extra switches for svn diff under VC. -If nil, use the value of `vc-diff-switches'. -If you want to force an empty list of arguments, use t." +If nil, use the value of `vc-diff-switches' (or `diff-switches'), +together with \"-x --diff-cmd=diff\" (since svn diff does not +support the default \"-c\" value of `diff-switches'). If you +want to force an empty list of arguments, use t." :type '(choice (const :tag "Unspecified" nil) (const :tag "None" t) (string :tag "Argument String") @@ -496,7 +498,8 @@ (let* ((switches (if vc-svn-diff-switches (vc-switches 'SVN 'diff) - (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " ")))) + (list "--diff-cmd=diff" "-x" + (mapconcat 'identity (vc-switches nil 'diff) " ")))) (async (and (not vc-disable-async-diff) (vc-stay-local-p files) (or oldvers newvers)))) ; Svn diffs those locally.