diff options
| author | Gnus developers <ding@gnus.org> | 2011-01-23 00:34:08 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-01-23 00:34:08 +0000 |
| commit | 9e928ac989c824c376b1ab576a6da69cd86b12c6 (patch) | |
| tree | 704cba2ff5a46a17e07c654027b723c1118ade59 /lisp/gnus/message.el | |
| parent | 572bf6f254ce23f9ce06584b88c12f07e776c1c9 (diff) | |
| download | emacs-9e928ac989c824c376b1ab576a6da69cd86b12c6.tar.gz | |
Merge chages made in Gnus trunk.
mailcap.el (mailcap-mime-extensions): Rename text/org to text/x-org.
gnus-draft.el (gnus-group-send-queue): Update the queue group in the group buffer after sending the queue.
gnus-draft.el (gnus-group-send-queue): Really refresh the queue group after sending.
gnus-agent.el (gnus-agent-send-mail): Ditto.
gnus-group.el (gnus-group-refresh-group): New convenience function.
message.el (message-bogus-addresses): Remove commented-out value.
message.el (message-check-recipients): Display the encoded version of the bogus address if they differ.
flow-fill.el (fill-flowed): Make `delete-space' option correspond to "DelSp" parameter in RFC3676.
gnus-sum.el (gnus-summary-move-article): Protect against backends (i.e., nnimap) returning nil as the article number.
Diffstat (limited to 'lisp/gnus/message.el')
| -rw-r--r-- | lisp/gnus/message.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 81093136d5a..50f509a14b0 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -4128,7 +4128,6 @@ not have PROP." (nreverse regions))) (defcustom message-bogus-addresses - ;; '("noreply" "nospam" "invalid") '("noreply" "nospam" "invalid" "@@" "[^[:ascii:]].*@" "[ \t]") "List of regexps of potentially bogus mail addresses. See `message-check-recipients' how to setup checking. @@ -4294,7 +4293,17 @@ This function could be useful in `message-setup-hook'." (and bog (not (y-or-n-p (format - "Address `%s' might be bogus. Continue? " bog))) + "Address `%s'%s might be bogus. Continue? " + bog + ;; If the encoded version of the email address + ;; is different from the unencoded version, + ;; then we likely have invisible characters or + ;; the like. Display the encoded version, + ;; too. + (let ((encoded (rfc2047-encode-string bog))) + (if (string= encoded bog) + "" + (format " (%s)" encoded)))))) (error "Bogus address")))))))) (custom-add-option 'message-setup-hook 'message-check-recipients) |