aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2014-12-18 15:47:11 +0200
committerDmitry Gutov2014-12-18 15:47:11 +0200
commitaf1040b3f4ec4dbf714a532846b9639abcddb105 (patch)
tree95e45c3d914dda80f0c574bd99920ec9ee20623b
parent62d7857d909db70d6f8bc8e13a5361160040989a (diff)
downloademacs-af1040b3f4ec4dbf714a532846b9639abcddb105.tar.gz
emacs-af1040b3f4ec4dbf714a532846b9639abcddb105.zip
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'.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc/vc-svn.el6
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d5cdd1f848..89a92f6454f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-12-18 Dmitry Gutov <dgutov@yandex.ru> 12014-12-18 Dmitry Gutov <dgutov@yandex.ru>
2 2
3 * vc/vc-svn.el (vc-svn-dir-status-files): Revert the 2014-12-02
4 change (bug#19387). Use `apply' on `vc-dir-command' (bug#19405).
5
3 * emacs-lisp/package.el (package-activate-1): Add RELOAD argument 6 * emacs-lisp/package.el (package-activate-1): Add RELOAD argument
4 and a docstring. 7 and a docstring.
5 (package-activate): Call itself on dependencies on PACKAGE with 8 (package-activate): Call itself on dependencies on PACKAGE with
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index eedccd81d4c..f477b394a17 100644
--- 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."
202 202
203(autoload 'vc-expand-dirs "vc") 203(autoload 'vc-expand-dirs "vc")
204 204
205(defun vc-svn-dir-status-files (dir files callback) 205(defun vc-svn-dir-status-files (_dir files callback)
206 "Run 'svn status' for DIR and update BUFFER via CALLBACK. 206 "Run 'svn status' for DIR and update BUFFER via CALLBACK.
207CALLBACK is called as (CALLBACK RESULT BUFFER), where 207CALLBACK is called as (CALLBACK RESULT BUFFER), where
208RESULT is a list of conses (FILE . STATE) for directory DIR." 208RESULT is a list of conses (FILE . STATE) for directory DIR."
209 (if (not files) (setq files (vc-expand-dirs (list dir) 'SVN))) 209 ;; ;; FIXME shouldn't this rather default to all the files in dir?
210 (vc-svn-command (current-buffer) 'async nil "status" "-u" files) 210 (apply #'vc-svn-command (current-buffer) 'async nil "status" "-u" files)
211 (vc-run-delayed (vc-svn-after-dir-status callback))) 211 (vc-run-delayed (vc-svn-after-dir-status callback)))
212 212
213(defun vc-svn-dir-extra-headers (_dir) 213(defun vc-svn-dir-extra-headers (_dir)