Mercurial > emacs
comparison lisp/vc-hooks.el @ 90996:f55f9811f5d7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-831)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 70-74)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 27 Jul 2007 10:52:18 +0000 |
parents | 492971a3f31f f04985ac29f2 |
children | 35e3789db058 |
comparison
equal
deleted
inserted
replaced
90995:9a391d85a79f | 90996:f55f9811f5d7 |
---|---|
10 | 10 |
11 ;; This file is part of GNU Emacs. | 11 ;; This file is part of GNU Emacs. |
12 | 12 |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | 13 ;; GNU Emacs is free software; you can redistribute it and/or modify |
14 ;; it under the terms of the GNU General Public License as published by | 14 ;; it under the terms of the GNU General Public License as published by |
15 ;; the Free Software Foundation; either version 2, or (at your option) | 15 ;; the Free Software Foundation; either version 3, or (at your option) |
16 ;; any later version. | 16 ;; any later version. |
17 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | 18 ;; GNU Emacs is distributed in the hope that it will be useful, |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
60 to determine the VC status in directories in which filenames are | 60 to determine the VC status in directories in which filenames are |
61 interpreted as hostnames." | 61 interpreted as hostnames." |
62 :type 'regexp | 62 :type 'regexp |
63 :group 'vc) | 63 :group 'vc) |
64 | 64 |
65 (defcustom vc-handled-backends '(RCS CVS SVN SCCS BZR HG Arch MCVS) | 65 (defcustom vc-handled-backends '(RCS CVS SVN SCCS BZR GIT HG Arch MCVS) |
66 ;; BZR, HG, Arch and MCVS come last because they are per-tree rather | 66 ;; BZR, GIT, HG, Arch and MCVS come last because they are per-tree |
67 ;; than per-dir. | 67 ;; rather than per-dir. |
68 "List of version control backends for which VC will be used. | 68 "List of version control backends for which VC will be used. |
69 Entries in this list will be tried in order to determine whether a | 69 Entries in this list will be tried in order to determine whether a |
70 file is under that sort of version control. | 70 file is under that sort of version control. |
71 Removing an entry from the list prevents VC from being activated | 71 Removing an entry from the list prevents VC from being activated |
72 when visiting a file managed by that backend. | 72 when visiting a file managed by that backend. |