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

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

Browse source 
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'.
This commit is contained in:
Dmitry Gutov 2014-12-18 15:47:11 +02:00
parent 62d7857d90
commit af1040b3f4
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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

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

@ -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)