diff options
| author | Dmitry Gutov | 2014-12-08 18:24:07 +0200 |
|---|---|---|
| committer | Dmitry Gutov | 2014-12-08 18:24:07 +0200 |
| commit | 5872f843ff45de150f4b35cbc9b11e9f63c96cf2 (patch) | |
| tree | ff9d52b041e31d2d059280e154f15010f402cf7d | |
| parent | 7fb8fc35ebf980ed299ce9dfd1694fa0f1ea169b (diff) | |
| download | emacs-5872f843ff45de150f4b35cbc9b11e9f63c96cf2.tar.gz emacs-5872f843ff45de150f4b35cbc9b11e9f63c96cf2.zip | |
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 @@ | |||
| 1 | 2014-12-08 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * vc/vc-hg.el (vc-hg-dir-status-files): Only include ignores files | ||
| 4 | when FILES is non-nil (bug#19304). | ||
| 5 | |||
| 1 | 2014-12-08 Eric S. Raymond <esr@snark.thyrsus.com> | 6 | 2014-12-08 Eric S. Raymond <esr@snark.thyrsus.com> |
| 2 | 7 | ||
| 3 | * vc/vc-arch.el: Moved to obsolete directory so a test framework | 8 | * 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." | |||
| 613 | (declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) | 613 | (declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) |
| 614 | 614 | ||
| 615 | (defun vc-hg-dir-status-files (dir files update-function) | 615 | (defun vc-hg-dir-status-files (dir files update-function) |
| 616 | (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C" files) | 616 | (apply 'vc-hg-command (current-buffer) 'async dir "status" |
| 617 | (concat "-mardu" (if files "i")) | ||
| 618 | "-C" files) | ||
| 617 | (vc-run-delayed | 619 | (vc-run-delayed |
| 618 | (vc-hg-after-dir-status update-function))) | 620 | (vc-hg-after-dir-status update-function))) |
| 619 | 621 | ||
| 620 | (defun vc-hg-dir-extra-header (name &rest commands) | 622 | (defun vc-hg-dir-extra-header (name &rest commands) |
| 621 | (concat (propertize name 'face 'font-lock-type-face) | 623 | (concat (propertize name 'face 'font-lock-type-face) |