summaryrefslogtreecommitdiff
path: root/lisp/mail/mailabbrev.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-04-09 12:51:06 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-04-09 12:51:06 -0700
commit9f46df23a3d01f82a24f2a3dd8730f0263fa9fde (patch)
treee10467a42658a374d5cdb7bb25fc94016abdad7a /lisp/mail/mailabbrev.el
parentb8df54ffbefc5ddf40ddcda68a2a682769c5833d (diff)
parenta130c2afed5e7d5ec10efa1a57f4de2461a9c778 (diff)
downloademacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.tar.gz
Merge from trunk; add Bug#.
Diffstat (limited to 'lisp/mail/mailabbrev.el')
-rw-r--r--lisp/mail/mailabbrev.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 51a4c6506be..fb8e1502f91 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -255,7 +255,7 @@ By default this is the file specified by `mail-personal-alias-file'."
(message "Parsing %s... done" file))
(defvar mail-alias-separator-string ", "
- "*A string inserted between addresses in multi-address mail aliases.
+ "A 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.")
@@ -423,7 +423,7 @@ fill-column, break the line at the previous comma, and indent the next line."
(defvar mail-abbrev-mode-regexp
"^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):"
- "*Regexp to select mail-headers in which mail abbrevs should be expanded.
+ "Regexp to select 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.)