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

* vc/vc-svn.el (vc-svn-diff): Fix bug #19312.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ca2f2222953630581870355c9af46ef78238cd2..f3d56c9924124b3e2f9950c0b91e131d078f129c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index c36e90b9fdf39c5cd520f7561b99ec3a6ea0f262..5db26767fda0b616d81c1cb5f385c403e47a4e49 100644 (file)
--- 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"