diff options
| author | Dan Nicolaescu | 2008-07-05 18:03:56 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-07-05 18:03:56 +0000 |
| commit | dbba19a737550f6d0f82b012942b2a1392d8cdda (patch) | |
| tree | 9a2a0a8ad91beeaab33ca93cbc044b46d7503845 | |
| parent | e21c597ae4ef8deadc88848c7963ab57aaca3325 (diff) | |
| download | emacs-dbba19a737550f6d0f82b012942b2a1392d8cdda.tar.gz emacs-dbba19a737550f6d0f82b012942b2a1392d8cdda.zip | |
(vc-hg-registered): Do not set vc-state.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3db04a91c1c..1548dae4d58 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2008-07-05 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2008-07-05 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * vc-hg.el (vc-hg-registered): Do not set vc-state. | ||
| 4 | |||
| 3 | * vc-annotate.el (vc-annotate-mode-menu): Add separator. | 5 | * vc-annotate.el (vc-annotate-mode-menu): Add separator. |
| 4 | 6 | ||
| 5 | 2008-07-05 Nick Roberts <nickrob@snap.net.nz> | 7 | 2008-07-05 Nick Roberts <nickrob@snap.net.nz> |
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 2b3e8db2cae..c1ca8c5ff7b 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -143,7 +143,6 @@ | |||
| 143 | "Return non-nil if FILE is registered with hg." | 143 | "Return non-nil if FILE is registered with hg." |
| 144 | (when (vc-hg-root file) ; short cut | 144 | (when (vc-hg-root file) ; short cut |
| 145 | (let ((state (vc-hg-state file))) ; expensive | 145 | (let ((state (vc-hg-state file))) ; expensive |
| 146 | (vc-file-setprop file 'vc-state state) | ||
| 147 | (and state (not (memq state '(ignored unregistered))))))) | 146 | (and state (not (memq state '(ignored unregistered))))))) |
| 148 | 147 | ||
| 149 | (defun vc-hg-state (file) | 148 | (defun vc-hg-state (file) |