From 3c07d7f047ab27b44027c411eced863301fc6146 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sat, 13 Dec 2014 06:15:33 -0500 Subject: [PATCH] Fix wrong humber arguments passed to vc-svn-diff. * vc/vc-svn.el (vc-svn-diff): Fix bug #19312. --- lisp/ChangeLog | 4 ++++ lisp/vc/vc-svn.el | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1ca2f222295..f3d56c99241 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-13 Eric S. Raymond + + * vc/vc-svn.el (vc-svn-diff): Fix bug #19312. + 2014-12-13 Michael Albinus * simple.el (password-word-equivalents): Add "passcode", used for diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index c36e90b9fdf..5db26767fda 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -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" -- 2.11.4.GIT