procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the

Browse source 
literal "diff" (important for windows-nt).
This commit is contained in:
Sam Steingold 2011-01-25 11:01:53 -05:00
parent 19e0dbe07d
commit ed68f651c0
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-01-25 Sam Steingold <sds@gnu.org>
* vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the
literal "diff" (important for windows-nt).
2011-01-25 Glenn Morris <rgm@gnu.org>
* emacs-lisp/copyright.el (copyright-at-end-flag)

8
lisp/vc/vc-svn.el
View file

@ -72,9 +72,9 @@ If t, use no 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' (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."
together with \"-x --diff-cmd=\"`diff-command' (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")
@ -523,7 +523,7 @@ or svn+ssh://."
(let* ((switches
(if vc-svn-diff-switches
(vc-switches 'SVN 'diff)
(list "--diff-cmd=diff" "-x"
(list (concat "--diff-cmd=" diff-command) "-x"
(mapconcat 'identity (vc-switches nil 'diff) " "))))
(async (and (not vc-disable-async-diff)
(vc-stay-local-p files 'SVN)