diff options
| author | Sam Steingold <sds@gnu.org> | 2011-01-25 11:01:53 -0500 |
|---|---|---|
| committer | Sam Steingold <sds@gnu.org> | 2011-01-25 11:01:53 -0500 |
| commit | ed68f651c05c2e4d72dd57fe5d513f391cb01cba (patch) | |
| tree | dd0f8ffc667e74ef26ab2692218e3a0c1dc88cc4 /lisp/vc/vc-svn.el | |
| parent | 19e0dbe07dc31e855c5d864ad68a2915cf0f6026 (diff) | |
| download | emacs-ed68f651c05c2e4d72dd57fe5d513f391cb01cba.tar.gz emacs-ed68f651c05c2e4d72dd57fe5d513f391cb01cba.tar.bz2 emacs-ed68f651c05c2e4d72dd57fe5d513f391cb01cba.zip | |
* lisp/vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the
literal "diff" (important for windows-nt).
Diffstat (limited to 'lisp/vc/vc-svn.el')
| -rw-r--r-- | lisp/vc/vc-svn.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index bc7a1ed954e..a924b53ee62 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -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) |