# HG changeset patch # User Stefan Monnier # Date 1184302170 0 # Node ID a4222c1c9c2dfe7fe040552b1fcfe67b138dbe31 # Parent 1ec5a70aa56f292f618c3431e4976560da1486cd Remove spurious * in docstrings. (vc-handled-backends): Add BZR. diff -r 1ec5a70aa56f -r a4222c1c9c2d lisp/ChangeLog --- a/lisp/ChangeLog Fri Jul 13 04:46:37 2007 +0000 +++ b/lisp/ChangeLog Fri Jul 13 04:49:30 2007 +0000 @@ -1,5 +1,8 @@ 2007-07-13 Stefan Monnier + * vc-hooks.el: Remove spurious * in docstrings. + (vc-handled-backends): Add BZR. + * vc-hooks.el (vc-find-file-hook): Use with-demoted-errors. 2007-07-12 Davis Herring diff -r 1ec5a70aa56f -r a4222c1c9c2d lisp/vc-hooks.el --- a/lisp/vc-hooks.el Fri Jul 13 04:46:37 2007 +0000 +++ b/lisp/vc-hooks.el Fri Jul 13 04:49:30 2007 +0000 @@ -62,9 +62,9 @@ :type 'regexp :group 'vc) -(defcustom vc-handled-backends '(RCS CVS SVN SCCS HG Arch MCVS) +(defcustom vc-handled-backends '(RCS CVS BZR 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. + "List of version control backends for which VC will be used. Entries in this list will be tried in order to determine whether a file is under that sort of version control. Removing an entry from the list prevents VC from being activated @@ -78,19 +78,19 @@ (if (file-directory-p "/usr/sccs") '("/usr/sccs") nil) - "*List of extra directories to search for version control commands." + "List of extra directories to search for version control commands." :type '(repeat directory) :group 'vc) (defcustom vc-make-backup-files nil - "*If non-nil, backups of registered files are made as with other files. + "If non-nil, backups of registered files are made as with other files. If nil (the default), files covered by version control don't get backups." :type 'boolean :group 'vc :group 'backup) (defcustom vc-follow-symlinks 'ask - "*What to do if visiting a symbolic link to a file under version control. + "What to do if visiting a symbolic link to a file under version control. Editing such a file through the link bypasses the version control system, which is dangerous and probably not what you want. @@ -104,26 +104,26 @@ :group 'vc) (defcustom vc-display-status t - "*If non-nil, display revision number and lock status in modeline. + "If non-nil, display revision number and lock status in modeline. Otherwise, not displayed." :type 'boolean :group 'vc) (defcustom vc-consult-headers t - "*If non-nil, identify work files by searching for version headers." + "If non-nil, identify work files by searching for version headers." :type 'boolean :group 'vc) (defcustom vc-keep-workfiles t - "*If non-nil, don't delete working files after registering changes. + "If non-nil, don't delete working files after registering changes. If the back-end is CVS, workfiles are always kept, regardless of the value of this flag." :type 'boolean :group 'vc) (defcustom vc-mistrust-permissions nil - "*If non-nil, don't assume permissions/ownership track version-control status. + "If non-nil, don't assume permissions/ownership track version-control status. If nil, do rely on the permissions. See also variable `vc-consult-headers'." :type 'boolean @@ -137,7 +137,7 @@ (vc-backend-subdirectory-name file))))) (defcustom vc-stay-local t - "*Non-nil means use local operations when possible for remote repositories. + "Non-nil means use local operations when possible for remote repositories. This avoids slow queries over the network and instead uses heuristics and past information to determine the current status of a file.