diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2014-12-18 15:47:11 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2014-12-18 15:47:11 +0200 |
| commit | af1040b3f4ec4dbf714a532846b9639abcddb105 (patch) | |
| tree | 95e45c3d914dda80f0c574bd99920ec9ee20623b | |
| parent | 62d7857d909db70d6f8bc8e13a5361160040989a (diff) | |
| download | emacs-af1040b3f4ec4dbf714a532846b9639abcddb105.tar.gz emacs-af1040b3f4ec4dbf714a532846b9639abcddb105.tar.bz2 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/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc/vc-svn.el | 6 |
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 @@ 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 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." (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) |