From: Sam Steingold Date: Tue, 25 Jan 2011 16:01:53 +0000 (-0500) Subject: * lisp/vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~128 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed68f651c05c2e4d72dd57fe5d513f391cb01cba;p=emacs.git * lisp/vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the literal "diff" (important for windows-nt). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4d758d4bb18..41608b4037c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-25 Sam Steingold + + * vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the + literal "diff" (important for windows-nt). + 2011-01-25 Glenn Morris * emacs-lisp/copyright.el (copyright-at-end-flag) 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)