Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ed68f651
Commit
ed68f651
authored
Jan 25, 2011
by
Sam Steingold
Browse files
* lisp/vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the
literal "diff" (important for windows-nt).
parent
19e0dbe0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/vc/vc-svn.el
lisp/vc/vc-svn.el
+4
-4
No files found.
lisp/ChangeLog
View file @
ed68f651
2011-01-25 Sam Steingold <sds@gnu.org>
* vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the
literal "diff" (important for windows-nt).
2011-01-25 Glenn Morris <rgm@gnu.org>
* emacs-lisp/copyright.el (copyright-at-end-flag)
...
...
lisp/vc/vc-svn.el
View file @
ed68f651
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment