[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 01/01: Fixes: debbugs:18579
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] emacs-24 01/01: Fixes: debbugs:18579 |
Date: |
Mon, 24 Nov 2014 02:11:44 +0000 |
branch: emacs-24
commit 5ceb233b2ddf189333a3ccd199d80ed639fe74c2
Author: Dmitry Gutov <address@hidden>
Date: Mon Nov 24 04:11:36 2014 +0200
Fixes: debbugs:18579
* lisp/vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files.
---
lisp/ChangeLog | 3 +++
lisp/vc/vc-hg.el | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c367b4..5798e96 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2014-11-24 Dmitry Gutov <address@hidden>
+ * vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files.
+ (Bug#18579)
+
* vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored
files. (Bug#18579)
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index a66fb9f..c8b811f 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -628,7 +628,7 @@ REV is the revision to check out into WORKFILE."
(vc-hg-after-dir-status update-function)))
(defun vc-hg-dir-status-files (dir files _default-state update-function)
- (apply 'vc-hg-command (current-buffer) 'async dir "status" "-C" files)
+ (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C"
files)
(vc-run-delayed
(vc-hg-after-dir-status update-function)))