(vc-svn-diff-switches): Doc fix.

(vc-svn-diff): Fix the case where vc-svn-diff-switches is nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15bf417b4bafb990cabd2ed21186db9a524aff7b..c86200d85d827a62e2f80d73bdf5948bd8cff60c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index d94920df62b7658c1405d3ea98f6ab5e479b0513..69c8166c3073e9dab942c1087261b88d895c286d 100644 (file)
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -66,8 +66,10 @@ A string or list of strings passed to the checkin program by
 (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 @@ or svn+ssh://."
   (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.