[Emacs-diffs] master 5872f84: Fix bug#19304

[Dmitry Gutov]

branch: master
commit 5872f843ff45de150f4b35cbc9b11e9f63c96cf2
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    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.
---
 lisp/ChangeLog   |    5 +++++
 lisp/vc/vc-hg.el |    6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f03214e..03ba24a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-08  Dmitry Gutov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * 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 7099def..a56ed672 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)