aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2011-01-25 11:01:53 -0500
committerSam Steingold2011-01-25 11:01:53 -0500
commited68f651c05c2e4d72dd57fe5d513f391cb01cba (patch)
treedd0f8ffc667e74ef26ab2692218e3a0c1dc88cc4
parent19e0dbe07dc31e855c5d864ad68a2915cf0f6026 (diff)
downloademacs-ed68f651c05c2e4d72dd57fe5d513f391cb01cba.tar.gz
emacs-ed68f651c05c2e4d72dd57fe5d513f391cb01cba.zip
* lisp/vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the
literal "diff" (important for windows-nt).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/vc-svn.el8
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d758d4bb18..41608b4037c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-01-25 Sam Steingold <sds@gnu.org>
2
3 * vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the
4 literal "diff" (important for windows-nt).
5
12011-01-25 Glenn Morris <rgm@gnu.org> 62011-01-25 Glenn Morris <rgm@gnu.org>
2 7
3 * emacs-lisp/copyright.el (copyright-at-end-flag) 8 * 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."
72 t ;`svn' doesn't support common args like -c or -b. 72 t ;`svn' doesn't support common args like -c or -b.
73 "String or list of strings specifying extra switches for svn diff under VC. 73 "String or list of strings specifying extra switches for svn diff under VC.
74If nil, use the value of `vc-diff-switches' (or `diff-switches'), 74If nil, use the value of `vc-diff-switches' (or `diff-switches'),
75together with \"-x --diff-cmd=diff\" (since svn diff does not 75together with \"-x --diff-cmd=\"`diff-command' (since 'svn diff'
76support the default \"-c\" value of `diff-switches'). If you 76does not support the default \"-c\" value of `diff-switches').
77want to force an empty list of arguments, use t." 77If you want to force an empty list of arguments, use t."
78 :type '(choice (const :tag "Unspecified" nil) 78 :type '(choice (const :tag "Unspecified" nil)
79 (const :tag "None" t) 79 (const :tag "None" t)
80 (string :tag "Argument String") 80 (string :tag "Argument String")
@@ -523,7 +523,7 @@ or svn+ssh://."
523 (let* ((switches 523 (let* ((switches
524 (if vc-svn-diff-switches 524 (if vc-svn-diff-switches
525 (vc-switches 'SVN 'diff) 525 (vc-switches 'SVN 'diff)
526 (list "--diff-cmd=diff" "-x" 526 (list (concat "--diff-cmd=" diff-command) "-x"
527 (mapconcat 'identity (vc-switches nil 'diff) " ")))) 527 (mapconcat 'identity (vc-switches nil 'diff) " "))))
528 (async (and (not vc-disable-async-diff) 528 (async (and (not vc-disable-async-diff)
529 (vc-stay-local-p files 'SVN) 529 (vc-stay-local-p files 'SVN)