[Emacs-diffs] /srv/bzr/emacs/trunk r102976: * lisp/vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the

[Sam Steingold]

------------------------------------------------------------
revno: 102976
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Tue 2011-01-25 11:01:53 -0500
message:
  * lisp/vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the
  literal "diff" (important for windows-nt).
modified:
  lisp/ChangeLog
  lisp/vc/vc-svn.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-25 08:36:34 +0000
+++ b/lisp/ChangeLog    2011-01-25 16:01:53 +0000
@@ -1,3 +1,8 @@
+2011-01-25  Sam Steingold  <address@hidden>
+
+       * vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the
+       literal "diff" (important for windows-nt).
+
 2011-01-25  Glenn Morris  <address@hidden>
 
        * emacs-lisp/copyright.el (copyright-at-end-flag)

=== modified file 'lisp/vc/vc-svn.el'
--- a/lisp/vc/vc-svn.el 2011-01-25 04:08:28 +0000
+++ b/lisp/vc/vc-svn.el 2011-01-25 16:01:53 +0000
@@ -72,9 +72,9 @@
   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 @@
   (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)