aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-04-10 07:34:40 +0000
committerDan Nicolaescu2008-04-10 07:34:40 +0000
commit7d3541789341856c6be840b9d94317a873c27410 (patch)
tree41202a0c557800893de03063859404c9c4f1c645
parent7fbb47976eca08ae8fee6ac1a64ad961ef25d9f4 (diff)
downloademacs-7d3541789341856c6be840b9d94317a873c27410.tar.gz
emacs-7d3541789341856c6be840b9d94317a873c27410.zip
(vc-hg-dir-status): Remove unneeded call.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-hg.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09ed4033594..a7aeb668041 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -20,6 +20,8 @@
20 * vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status): 20 * vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
21 Detect the conflict state. 21 Detect the conflict state.
22 22
23 * vc-hg.el (vc-hg-dir-status): Remove unneeded call.
24
232008-04-10 Glenn Morris <rgm@gnu.org> 252008-04-10 Glenn Morris <rgm@gnu.org>
24 26
25 * Makefile.in (MH_E_DIR): New variable. 27 * Makefile.in (MH_E_DIR): New variable.
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 8be1be82eec..2a65691cb9d 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -487,7 +487,7 @@ REV is the revision to check out into WORKFILE."
487 (?! . missing) 487 (?! . missing)
488 (?? . unregistered))) 488 (?? . unregistered)))
489 (translated nil) 489 (translated nil)
490 (result nil)) 490 (result nil))
491 (goto-char (point-min)) 491 (goto-char (point-min))
492 (while (not (eobp)) 492 (while (not (eobp))
493 (setq status-char (char-after)) 493 (setq status-char (char-after))
@@ -502,8 +502,6 @@ REV is the revision to check out into WORKFILE."
502 502
503;; XXX Experimental function for the vc-dired replacement. 503;; XXX Experimental function for the vc-dired replacement.
504(defun vc-hg-dir-status (dir update-function status-buffer) 504(defun vc-hg-dir-status (dir update-function status-buffer)
505 "Return a list of conses (file . state) for DIR."
506 (erase-buffer)
507 (vc-hg-command (current-buffer) 'async dir "status") 505 (vc-hg-command (current-buffer) 'async dir "status")
508 (vc-exec-after 506 (vc-exec-after
509 `(vc-hg-after-dir-status (quote ,update-function) ,status-buffer))) 507 `(vc-hg-after-dir-status (quote ,update-function) ,status-buffer)))