Fix recent vc-svn-dir-status-files breakage

Fixes: debbugs:19387 debbugs:19405
* lisp/vc/vc-svn.el (vc-svn-dir-status-files): Revert the 2014-12-02
change.  Use `apply' on `vc-dir-command'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d5cdd1f848cab01c474c4d0571fed494a7b2160..89a92f6454f31ed5751aa011fb4d0ae796bd33c2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-12-18  Dmitry Gutov  <dgutov@yandex.ru>
 
+       * vc/vc-svn.el (vc-svn-dir-status-files): Revert the 2014-12-02
+       change (bug#19387).  Use `apply' on `vc-dir-command'  (bug#19405).
+
        * emacs-lisp/package.el (package-activate-1): Add RELOAD argument
        and a docstring.
        (package-activate): Call itself on dependencies on PACKAGE with

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index eedccd81d4c22fecdc2c646c224c8d495efa01d2..f477b394a1710b2bf4d5981f5d399858c9b2ece7 100644 (file)
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -202,12 +202,12 @@ If you want to force an empty list of arguments, use t."
 
 (autoload 'vc-expand-dirs "vc")
 
-(defun vc-svn-dir-status-files (dir files callback)
+(defun vc-svn-dir-status-files (_dir files callback)
   "Run 'svn status' for DIR and update BUFFER via CALLBACK.
 CALLBACK is called as (CALLBACK RESULT BUFFER), where
 RESULT is a list of conses (FILE . STATE) for directory DIR."
-  (if (not files) (setq files (vc-expand-dirs (list dir) 'SVN)))
-  (vc-svn-command (current-buffer) 'async nil "status" "-u" files)
+  ;; ;; FIXME shouldn't this rather default to all the files in dir?
+  (apply #'vc-svn-command (current-buffer) 'async nil "status" "-u" files)
   (vc-run-delayed (vc-svn-after-dir-status callback)))
 
 (defun vc-svn-dir-extra-headers (_dir)