procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix wrong humber arguments passed to vc-svn-diff.

Browse source 
* vc/vc-svn.el (vc-svn-diff): Fix bug #19312.
This commit is contained in:
Eric S. Raymond 2014-12-13 06:15:33 -05:00
parent a859d1cc23
commit 3c07d7f047
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2014-12-13 Eric S. Raymond <esr@snark.thyrsus.com>
* vc/vc-svn.el (vc-svn-diff): Fix bug #19312.
2014-12-13 Michael Albinus <michael.albinus@gmx.de>
* simple.el (password-word-equivalents): Add "passcode", used for

6
lisp/vc/vc-svn.el
View file

@ -548,7 +548,7 @@ If LIMIT is non-nil, show no more than this many entries."
(if start-revision (format "-r%s" start-revision) "-rHEAD:0"))
(when limit (list "--limit" (format "%s" limit)))))))))
(defun vc-svn-diff (files &optional oldvers newvers buffer)
(defun vc-svn-diff (files &optional async oldvers newvers buffer)
"Get a difference report using SVN between two revisions of fileset FILES."
(and oldvers
(not newvers)
@ -563,12 +563,12 @@ If LIMIT is non-nil, show no more than this many entries."
;; has a different revision, we fetch the lot, which is
;; obviously sub-optimal.
(setq oldvers nil))
(setq async (and async (or oldvers newvers))) ; Svn diffs those locally.
(let* ((switches
(if vc-svn-diff-switches
(vc-switches 'SVN 'diff)
(list (concat "--diff-cmd=" diff-command) "-x"
(mapconcat 'identity (vc-switches nil 'diff) " "))))
(async (or oldvers newvers))) ; Svn diffs those locally.
(mapconcat 'identity (vc-switches nil 'diff) " ")))))
(apply 'vc-svn-command buffer
(if async 'async 0)
files "diff"