[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master af1040b: Fix recent vc-svn-dir-status-files breakag
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] master af1040b: Fix recent vc-svn-dir-status-files breakage |
Date: |
Thu, 18 Dec 2014 13:47:22 +0000 |
branch: master
commit af1040b3f4ec4dbf714a532846b9639abcddb105
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
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'.
---
lisp/ChangeLog | 3 +++
lisp/vc/vc-svn.el | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d5cdd1..89a92f6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2014-12-18 Dmitry Gutov <address@hidden>
+ * 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 eedccd8..f477b39 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master af1040b: Fix recent vc-svn-dir-status-files breakage,
Dmitry Gutov <=