summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc-hg.el4
-rw-r--r--lisp/vc-hooks.el2
3 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 653dd294452..f0e38047bda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-05 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * vc-hooks.el (vc-handled-backends): Add HG.
+
+ * vc-hg.el (vc-handled-backends): Remove, done in vc-hooks.el now.
+
2007-07-05 Stefan Monnier <monnier@iro.umontreal.ca>
* complete.el (PC-do-complete-and-exit): Add support for the new
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 7bfa6953e60..a301a3ad5d8 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -58,10 +58,6 @@
(eval-when-compile
(require 'vc))
-;; XXX This should be moved to vc-hooks when we can be sure that vc-state
-;; and friends are always harmless.
-(add-to-list 'vc-handled-backends 'HG)
-
;;; Customization options
(defcustom vc-hg-global-switches nil
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 22935ab7f3b..89d271431fa 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -62,7 +62,7 @@ interpreted as hostnames."
:type 'regexp
:group 'vc)
-(defcustom vc-handled-backends '(RCS CVS SVN SCCS Arch MCVS)
+(defcustom vc-handled-backends '(RCS CVS SVN SCCS HG Arch MCVS)
;; Arch and MCVS come last because they are per-tree rather than per-dir.
"*List of version control backends for which VC will be used.
Entries in this list will be tried in order to determine whether a