From afc05254f5403c9d977013c70e4391e7ac1643b6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 12 Sep 2006 15:43:20 +0000 Subject: Remove * in defcustom's docstrings. --- lisp/ChangeLog | 8 ++++++-- lisp/pcvs-defs.el | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee328d0b6cc..7d38ae9f079 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,10 @@ +2006-09-12 Stefan Monnier + + * pcvs-defs.el: Remove * in defcustom's docstrings. + 2006-09-12 Nick Roberts - * progmodes/compile.el (compilation-directory-properties): + * progmodes/compile.el (compilation-directory-properties): Doc fix for help-echo. 2006-09-12 Lars Hansen @@ -37,7 +41,7 @@ 2006-09-11 Stefan Monnier - * progmodes/cfengine.el (cfengine-font-lock-syntactic-keywords): New var. + * progmodes/cfengine.el (cfengine-font-lock-syntactic-keywords): Newvar. (cfengine-mode): Use it. Fix \ syntax to be like /. * bindings.el (mode-line-buffer-identification-keymap): diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el index e2c6396bdb2..d0c1950f1f8 100644 --- a/lisp/pcvs-defs.el +++ b/lisp/pcvs-defs.el @@ -98,7 +98,7 @@ repositories. It can be set interactively with \\[cvs-change-cvsroot.] There is no need to set this if $CVSROOT is set to a correct value.") (defcustom cvs-auto-remove-handled nil - "*If up-to-date files should be acknowledged automatically. + "If up-to-date files should be acknowledged automatically. If T, they will be removed from the *cvs* buffer after every command. If DELAYED, they will be removed from the *cvs* buffer before every command. If STATUS, they will only be removed after a `cvs-mode-status' command. @@ -107,24 +107,24 @@ Else, they will never be automatically removed from the *cvs* buffer." :type '(choice (const nil) (const status) (const delayed) (const t))) (defcustom cvs-auto-remove-directories 'handled - "*If ALL, directory entries will never be shown. + "If ALL, directory entries will never be shown. If HANDLED, only non-handled directories will be shown. If EMPTY, only non-empty directories will be shown." :group 'pcl-cvs :type '(choice (const :tag "No" nil) (const all) (const handled) (const empty))) (defcustom cvs-auto-revert t - "*Non-nil if changed files should automatically be reverted." + "Non-nil if changed files should automatically be reverted." :group 'pcl-cvs :type '(boolean)) (defcustom cvs-sort-ignore-file t - "*Non-nil if `cvs-mode-ignore' should sort the .cvsignore automatically." + "Non-nil if `cvs-mode-ignore' should sort the .cvsignore automatically." :group 'pcl-cvs :type '(boolean)) (defcustom cvs-force-dir-tag t - "*If non-nil, tagging can only be applied to directories. + "If non-nil, tagging can only be applied to directories. Tagging should generally be applied a directory at a time, but sometimes it is useful to be able to tag a single file. The normal way to do that is to use `cvs-mode-force-command' so as to temporarily override the restrictions," @@ -132,7 +132,7 @@ useful to be able to tag a single file. The normal way to do that is to use :type '(boolean)) (defcustom cvs-default-ignore-marks nil - "*Non-nil if cvs mode commands should ignore any marked files. + "Non-nil if cvs mode commands should ignore any marked files. Normally they run on the files that are marked (with `cvs-mode-mark'), or the file under the cursor if no files are marked. If this variable is set to a non-nil value they will by default run on the file on the @@ -151,7 +151,7 @@ current line. See also `cvs-invert-ignore-marks'" (when (and cvs-force-dir-tag (not cvs-default-ignore-marks)) (push "tag" l)) l) - "*List of cvs commands that invert the default ignore-mark behavior. + "List of cvs commands that invert the default ignore-mark behavior. Commands in this set will use the opposite default from the one set in `cvs-default-ignore-marks'." :group 'pcl-cvs @@ -160,7 +160,7 @@ in `cvs-default-ignore-marks'." (const "ignore"))) (defcustom cvs-confirm-removals t - "*Ask for confirmation before removing files. + "Ask for confirmation before removing files. Non-nil means that PCL-CVS will ask confirmation before removing files except for files whose content can readily be recovered from the repository. A value of `list' means that the list of files to be deleted will be @@ -171,7 +171,7 @@ displayed when asking for confirmation." (const nil))) (defcustom cvs-add-default-message nil - "*Default message to use when adding files. + "Default message to use when adding files. If set to nil, `cvs-mode-add' will always prompt for a message." :group 'pcl-cvs :type '(choice (const :tag "Prompt" nil) @@ -195,7 +195,7 @@ have no effect." ("tree" "*cvs-info*" cvs-status-mode) ("message" "*cvs-commit*" nil log-edit) ("log" "*cvs-info*" log-view-mode)) - "*Buffer name and mode to be used for each command. + "Buffer name and mode to be used for each command. This is a list of elements of the form (CMD BUFNAME MODE &optional POSTPROC) @@ -250,7 +250,7 @@ Output from cvs is placed here for asynchronous commands.") (if (fboundp 'ediff) '(cvs-ediff-diff . cvs-ediff-merge) '(cvs-emerge-diff . cvs-emerge-merge)) - "*Pair of functions to be used for resp. diff'ing and merg'ing interactively." + "Pair of functions to be used for resp. diff'ing and merg'ing interactively." :group 'pcl-cvs :type '(choice (const :tag "Ediff" (cvs-ediff-diff . cvs-ediff-merge)) (const :tag "Emerge" (cvs-emerge-diff . cvs-emerge-merge)))) -- cgit v1.2.1