diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2014-12-08 18:24:07 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2014-12-08 18:24:07 +0200 |
| commit | 5872f843ff45de150f4b35cbc9b11e9f63c96cf2 (patch) | |
| tree | ff9d52b041e31d2d059280e154f15010f402cf7d | |
| parent | 7fb8fc35ebf980ed299ce9dfd1694fa0f1ea169b (diff) | |
| download | emacs-5872f843ff45de150f4b35cbc9b11e9f63c96cf2.tar.gz | |
Fix bug#19304
Fixes: debbugs:19304
* lisp/vc/vc-hg.el (vc-hg-dir-status-files): Only include ignores files
when FILES is non-nil.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-hg.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f03214efba8..03ba24a4d41 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-08 Dmitry Gutov <dgutov@yandex.ru> + + * vc/vc-hg.el (vc-hg-dir-status-files): Only include ignores files + when FILES is non-nil (bug#19304). + 2014-12-08 Eric S. Raymond <esr@snark.thyrsus.com> * vc/vc-arch.el: Moved to obsolete directory so a test framework diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 7099defb37c..a56ed672828 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -613,9 +613,11 @@ REV is the revision to check out into WORKFILE." (declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) (defun vc-hg-dir-status-files (dir files update-function) - (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C" files) + (apply 'vc-hg-command (current-buffer) 'async dir "status" + (concat "-mardu" (if files "i")) + "-C" files) (vc-run-delayed - (vc-hg-after-dir-status update-function))) + (vc-hg-after-dir-status update-function))) (defun vc-hg-dir-extra-header (name &rest commands) (concat (propertize name 'face 'font-lock-type-face) |