aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2015-02-07 02:35:24 +0300
committerDmitry Gutov2015-02-07 02:35:24 +0300
commitfa7f79e8234c60ae425f7c3cf1b9486765a7111e (patch)
tree784a95feb5177eef80f0a48590a664abc1d32857
parent7eb2077f9dd14ae9d70a12c621151afd50ea6e96 (diff)
downloademacs-fa7f79e8234c60ae425f7c3cf1b9486765a7111e.tar.gz
emacs-fa7f79e8234c60ae425f7c3cf1b9486765a7111e.zip
(vc-cvs-dir-status-files): Don't pass DIR to `vc-cvs-command'
Fixes: debbugs:19732 * lisp/vc/vc-cvs.el (vc-cvs-dir-status-files): Don't pass DIR to `vc-cvs-command'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/vc-cvs.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea92da89ef2..c67113f2a61 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-02-06 Dmitry Gutov <dgutov@yandex.ru>
2
3 * vc/vc-cvs.el (vc-cvs-dir-status-files): Don't pass DIR to
4 `vc-cvs-command' (bug#19732).
5
12015-02-06 Nicolas Petton <nicolas@petton.fr> 62015-02-06 Nicolas Petton <nicolas@petton.fr>
2 7
3 * emacs-lisp/seq.el (seq-mapcat, seq-partition, seq-group-by): New functions. 8 * emacs-lisp/seq.el (seq-mapcat, seq-partition, seq-group-by): New functions.
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index d803c16d7cf..707090a10eb 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -1076,7 +1076,7 @@ Query all files in DIR if files is nil."
1076 (if (and (not files) local (not (eq local 'only-file))) 1076 (if (and (not files) local (not (eq local 'only-file)))
1077 (vc-cvs-dir-status-heuristic dir update-function) 1077 (vc-cvs-dir-status-heuristic dir update-function)
1078 (if (not files) (setq files (vc-expand-dirs (list dir) 'CVS))) 1078 (if (not files) (setq files (vc-expand-dirs (list dir) 'CVS)))
1079 (vc-cvs-command (current-buffer) 'async dir "-f" "status" files) 1079 (vc-cvs-command (current-buffer) 'async files "-f" "status")
1080 ;; Alternative implementation: use the "update" command instead of 1080 ;; Alternative implementation: use the "update" command instead of
1081 ;; the "status" command. 1081 ;; the "status" command.
1082 ;; (vc-cvs-command (current-buffer) 'async 1082 ;; (vc-cvs-command (current-buffer) 'async