summaryrefslogtreecommitdiff
path: root/lisp/mail/mailabbrev.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-05-04 13:14:14 +0800
committerChong Yidong <cyd@gnu.org>2012-05-04 13:14:14 +0800
commit78f3273aab4817ead42af0db41e703dc7e90260b (patch)
tree71c70a9d0bd5d796e5be009d3cc562ea7a0863b4 /lisp/mail/mailabbrev.el
parentab0fa4e4ba0b2b93a9ef007842523d8d5f9eb758 (diff)
downloademacs-78f3273aab4817ead42af0db41e703dc7e90260b.tar.gz
Convert more defvars to defcustoms.
* dos-w32.el (file-name-buffer-file-type-alist) (direct-print-region-use-command-dot-com): * ffap.el (ffap-menu-regexp): * follow.el (follow-debug): * forms.el (forms--debug): * iswitchb.el (iswitchb-all-frames): * ido.el (ido-all-frames): * mail/feedmail.el (feedmail-mail-send-hook) (feedmail-mail-send-hook-queued): * mail/footnote.el (footnote-signature-separator): * mail/mailabbrev.el (mail-alias-separator-string) (mail-abbrev-mode-regexp): * mail/rmail.el (rmail-speedbar-match-folder-regexp): * progmodes/idlwave.el (idlwave-libinfo-file) (idlwave-default-completion-case-is-down) (idlwave-library-routines): Convert defvars to defcustoms. * mail/rmail.el (rmail-decode-mime-charset): * progmodes/idlw-shell.el (idlwave-shell-print-expression-function) (idlwave-shell-fix-inserted-breaks) (idlwave-shell-activate-alt-keybindings) (idlwave-shell-use-breakpoint-glyph): * facemenu.el (facemenu-unlisted-faces): Delete obsolete vars. * doc/lispref/os.texi (Timers): Use defopt for timer-max-repeats.
Diffstat (limited to 'lisp/mail/mailabbrev.el')
-rw-r--r--lisp/mail/mailabbrev.el16
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index fb8e1502f91..290c57c1c55 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -254,10 +254,12 @@ By default this is the file specified by `mail-personal-alias-file'."
mail-abbrevs)
(message "Parsing %s... done" file))
-(defvar mail-alias-separator-string ", "
- "A string inserted between addresses in multi-address mail aliases.
+(defcustom mail-alias-separator-string ", "
+ "String inserted between addresses in multi-address mail aliases.
This has to contain a comma, so \", \" is a reasonable value. You might
-also want something like \",\\n \" to get each address on its own line.")
+also want something like \",\\n \" to get each address on its own line."
+ :type 'string
+ :group 'mail-abbrev)
;; define-mail-abbrev sets this flag, which causes mail-resolve-all-aliases
;; to be called before expanding abbrevs if it's necessary.
@@ -421,14 +423,16 @@ fill-column, break the line at the previous comma, and indent the next line."
;;; Syntax tables and abbrev-expansion
-(defvar mail-abbrev-mode-regexp
+(defcustom mail-abbrev-mode-regexp
"^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):"
- "Regexp to select mail-headers in which mail abbrevs should be expanded.
+ "Regexp matching mail headers in which mail abbrevs should be expanded.
This string will be handed to `looking-at' with point at the beginning
of the current line; if it matches, abbrev mode will be turned on, otherwise
it will be turned off. (You don't need to worry about continuation lines.)
This should be set to match those mail fields in which you want abbreviations
-turned on.")
+turned on."
+ :type 'regexp
+ :group 'mail-abbrev)
(defvar mail-abbrev-syntax-table nil
"The syntax-table used for abbrev-expansion purposes.