diff options
| author | Stefan Monnier | 2007-07-13 04:49:30 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-07-13 04:49:30 +0000 |
| commit | e5162bc170d1c9db6433876320b381f605fba0d3 (patch) | |
| tree | b217d94b616074ed963b86d16423f6a16b78abd6 | |
| parent | fc8b8d0fb5751ee5e4363648519f2ec85e0132af (diff) | |
| download | emacs-e5162bc170d1c9db6433876320b381f605fba0d3.tar.gz emacs-e5162bc170d1c9db6433876320b381f605fba0d3.zip | |
Remove spurious * in docstrings.
(vc-handled-backends): Add BZR.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a353b168976..f82b195f006 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2007-07-13 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2007-07-13 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * vc-hooks.el: Remove spurious * in docstrings. | ||
| 4 | (vc-handled-backends): Add BZR. | ||
| 5 | |||
| 3 | * vc-hooks.el (vc-find-file-hook): Use with-demoted-errors. | 6 | * vc-hooks.el (vc-find-file-hook): Use with-demoted-errors. |
| 4 | 7 | ||
| 5 | 2007-07-12 Davis Herring <herring@lanl.gov> | 8 | 2007-07-12 Davis Herring <herring@lanl.gov> |
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 02679136bc6..9fbf4db3160 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -62,9 +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 SVN SCCS HG Arch MCVS) | 65 | (defcustom vc-handled-backends '(RCS CVS BZR SVN SCCS HG Arch MCVS) |
| 66 | ;; Arch and MCVS come last because they are per-tree rather than per-dir. | 66 | ;; Arch and MCVS come last because they are per-tree rather than per-dir. |
| 67 | "*List of version control backends for which VC will be used. | 67 | "List of version control backends for which VC will be used. |
| 68 | Entries in this list will be tried in order to determine whether a | 68 | Entries in this list will be tried in order to determine whether a |
| 69 | file is under that sort of version control. | 69 | file is under that sort of version control. |
| 70 | Removing an entry from the list prevents VC from being activated | 70 | Removing an entry from the list prevents VC from being activated |
| @@ -78,19 +78,19 @@ An empty list disables VC altogether." | |||
| 78 | (if (file-directory-p "/usr/sccs") | 78 | (if (file-directory-p "/usr/sccs") |
| 79 | '("/usr/sccs") | 79 | '("/usr/sccs") |
| 80 | nil) | 80 | nil) |
| 81 | "*List of extra directories to search for version control commands." | 81 | "List of extra directories to search for version control commands." |
| 82 | :type '(repeat directory) | 82 | :type '(repeat directory) |
| 83 | :group 'vc) | 83 | :group 'vc) |
| 84 | 84 | ||
| 85 | (defcustom vc-make-backup-files nil | 85 | (defcustom vc-make-backup-files nil |
| 86 | "*If non-nil, backups of registered files are made as with other files. | 86 | "If non-nil, backups of registered files are made as with other files. |
| 87 | If nil (the default), files covered by version control don't get backups." | 87 | If nil (the default), files covered by version control don't get backups." |
| 88 | :type 'boolean | 88 | :type 'boolean |
| 89 | :group 'vc | 89 | :group 'vc |
| 90 | :group 'backup) | 90 | :group 'backup) |
| 91 | 91 | ||
| 92 | (defcustom vc-follow-symlinks 'ask | 92 | (defcustom vc-follow-symlinks 'ask |
| 93 | "*What to do if visiting a symbolic link to a file under version control. | 93 | "What to do if visiting a symbolic link to a file under version control. |
| 94 | Editing such a file through the link bypasses the version control system, | 94 | Editing such a file through the link bypasses the version control system, |
| 95 | which is dangerous and probably not what you want. | 95 | which is dangerous and probably not what you want. |
| 96 | 96 | ||
| @@ -104,26 +104,26 @@ visited and a warning displayed." | |||
| 104 | :group 'vc) | 104 | :group 'vc) |
| 105 | 105 | ||
| 106 | (defcustom vc-display-status t | 106 | (defcustom vc-display-status t |
| 107 | "*If non-nil, display revision number and lock status in modeline. | 107 | "If non-nil, display revision number and lock status in modeline. |
| 108 | Otherwise, not displayed." | 108 | Otherwise, not displayed." |
| 109 | :type 'boolean | 109 | :type 'boolean |
| 110 | :group 'vc) | 110 | :group 'vc) |
| 111 | 111 | ||
| 112 | 112 | ||
| 113 | (defcustom vc-consult-headers t | 113 | (defcustom vc-consult-headers t |
| 114 | "*If non-nil, identify work files by searching for version headers." | 114 | "If non-nil, identify work files by searching for version headers." |
| 115 | :type 'boolean | 115 | :type 'boolean |
| 116 | :group 'vc) | 116 | :group 'vc) |
| 117 | 117 | ||
| 118 | (defcustom vc-keep-workfiles t | 118 | (defcustom vc-keep-workfiles t |
| 119 | "*If non-nil, don't delete working files after registering changes. | 119 | "If non-nil, don't delete working files after registering changes. |
| 120 | If the back-end is CVS, workfiles are always kept, regardless of the | 120 | If the back-end is CVS, workfiles are always kept, regardless of the |
| 121 | value of this flag." | 121 | value of this flag." |
| 122 | :type 'boolean | 122 | :type 'boolean |
| 123 | :group 'vc) | 123 | :group 'vc) |
| 124 | 124 | ||
| 125 | (defcustom vc-mistrust-permissions nil | 125 | (defcustom vc-mistrust-permissions nil |
| 126 | "*If non-nil, don't assume permissions/ownership track version-control status. | 126 | "If non-nil, don't assume permissions/ownership track version-control status. |
| 127 | If nil, do rely on the permissions. | 127 | If nil, do rely on the permissions. |
| 128 | See also variable `vc-consult-headers'." | 128 | See also variable `vc-consult-headers'." |
| 129 | :type 'boolean | 129 | :type 'boolean |
| @@ -137,7 +137,7 @@ See also variable `vc-consult-headers'." | |||
| 137 | (vc-backend-subdirectory-name file))))) | 137 | (vc-backend-subdirectory-name file))))) |
| 138 | 138 | ||
| 139 | (defcustom vc-stay-local t | 139 | (defcustom vc-stay-local t |
| 140 | "*Non-nil means use local operations when possible for remote repositories. | 140 | "Non-nil means use local operations when possible for remote repositories. |
| 141 | This avoids slow queries over the network and instead uses heuristics | 141 | This avoids slow queries over the network and instead uses heuristics |
| 142 | and past information to determine the current status of a file. | 142 | and past information to determine the current status of a file. |
| 143 | 143 | ||