aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-07-16 04:25:51 +0000
committerDan Nicolaescu2007-07-16 04:25:51 +0000
commitdbd3d78766644e9f16d6699e8538c1260e67a428 (patch)
treecbf06ab6ab0799dc313b09696a0e007c71106268
parent2b1070c8f0cf09e10dbca4e3b298d961ea99c036 (diff)
downloademacs-dbd3d78766644e9f16d6699e8538c1260e67a428.tar.gz
emacs-dbd3d78766644e9f16d6699e8538c1260e67a428.zip
(vc-handled-backends): Move BZR later in the list.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-hooks.el7
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f527e004a8..47cd4978ef6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12007-07-16 Dan Nicolaescu <dann@ics.uci.edu> 12007-07-16 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc-hooks.el (vc-handled-backends): Move BZR later in the list.
4
3 * term/xterm.el (xterm-turn-on-modify-other-keys) 5 * term/xterm.el (xterm-turn-on-modify-other-keys)
4 (xterm-turn-off-modify-other-keys): New functions. 6 (xterm-turn-off-modify-other-keys): New functions.
5 (terminal-init-xterm): Enable the modifyOtherKeys feature if the 7 (terminal-init-xterm): Enable the modifyOtherKeys feature if the
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 9fbf4db3160..38ddb35c976 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -62,8 +62,9 @@ interpreted as hostnames."
62 :type 'regexp 62 :type 'regexp
63 :group 'vc) 63 :group 'vc)
64 64
65(defcustom vc-handled-backends '(RCS CVS BZR SVN SCCS HG Arch MCVS) 65(defcustom vc-handled-backends '(RCS CVS SVN SCCS BZR HG Arch MCVS)
66 ;; Arch and MCVS come last because they are per-tree rather than per-dir. 66 ;; BZR, HG, Arch and MCVS come last because they are per-tree rather
67 ;; than per-dir.
67 "List of version control backends for which VC will be used. 68 "List of version control backends for which VC will be used.
68Entries in this list will be tried in order to determine whether a 69Entries in this list will be tried in order to determine whether a
69file is under that sort of version control. 70file is under that sort of version control.
@@ -71,7 +72,7 @@ Removing an entry from the list prevents VC from being activated
71when visiting a file managed by that backend. 72when visiting a file managed by that backend.
72An empty list disables VC altogether." 73An empty list disables VC altogether."
73 :type '(repeat symbol) 74 :type '(repeat symbol)
74 :version "21.1" 75 :version "23.1"
75 :group 'vc) 76 :group 'vc)
76 77
77(defcustom vc-path 78(defcustom vc-path