[Emacs-diffs] emacs/lisp ChangeLog vc-svn.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/11/30 01:58:10

Modified files:
        lisp           : ChangeLog vc-svn.el 

Log message:
        (vc-svn-diff-switches): Doc fix.
        (vc-svn-diff): Fix the case where vc-svn-diff-switches is nil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14889&r2=1.14890
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-svn.el?cvsroot=emacs&r1=1.102&r2=1.103

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14889
retrieving revision 1.14890
diff -u -b -r1.14889 -r1.14890
--- ChangeLog   30 Nov 2008 01:45:29 -0000      1.14889
+++ ChangeLog   30 Nov 2008 01:58:06 -0000      1.14890
@@ -1,5 +1,8 @@
 2008-11-30  Glenn Morris  <address@hidden>
 
+       * 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.

Index: vc-svn.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-svn.el,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- vc-svn.el   22 Nov 2008 03:27:18 -0000      1.102
+++ vc-svn.el   30 Nov 2008 01:58:09 -0000      1.103
@@ -66,8 +66,10 @@
 (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 @@
   (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.