summaryrefslogtreecommitdiff
path: root/lisp/gnus/nnmail.el
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2011-08-20 00:20:39 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-08-20 00:20:39 +0000
commit4d9db491a079712aeaf92ae3c63aebc56398b17e (patch)
treef499e4a786429ad2ba9dec3370417933dd19ab89 /lisp/gnus/nnmail.el
parent9234ff7fcfa79c5e19b9d3a7ae88570f4f768b9a (diff)
downloademacs-4d9db491a079712aeaf92ae3c63aebc56398b17e.tar.gz
emacs-4d9db491a079712aeaf92ae3c63aebc56398b17e.tar.bz2
emacs-4d9db491a079712aeaf92ae3c63aebc56398b17e.zip
Merge changes made in Gnus trunk.
nnimap.el (nnimap-transform-headers): Protect against (NIL ...) bodystructures (bug#9314). starttls.el (starttls-any-program-available): Define as obsolete function. gnus-util.el (gnus-y-or-n-p): Reinstate the message-clearing y-or-n-p versions which Gnus use when appropriate. gnus-group.el (gnus-group-clear-data): Add a y-or-n query, since it's a pretty destructive command. nnmail.el (nnmail-extra-headers): Clarify slightly (bug#9302). message.el (message-fix-before-sending): Make a different warning about NUL characters (bug#9270). gnus-sum.el (gnus-auto-select-subject): Allow specifying a function from custom (bug#9260).
Diffstat (limited to 'lisp/gnus/nnmail.el')
-rw-r--r--lisp/gnus/nnmail.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 8906a036779..dc2080dee1a 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -554,7 +554,9 @@ parameter. It should return nil, `warn' or `delete'."
(const delete)))
(defcustom nnmail-extra-headers '(To Newsgroups)
- "*Extra headers to parse."
+ "Extra headers to parse.
+In addition to the standard headers, these extra headers will be
+included in NOV headers (and the like) when backends parse headers."
:version "21.1"
:group 'nnmail
:type '(repeat symbol))