Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1168

3 files changed, 27 insertions, 7 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f8dffcd8a29..9f4ef735a54 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-16  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * mml.el (mml-attach-buffer): Prompt for `disposition'.
+
+        * message.el (message-bogus-address-regexp): Fix and improve custom
+        type.
+        (message-setup-hook): Add message-check-recipients as custom option.
+
 2008-05-15  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * message.el (message-cite-function): Remove bogus autoload which crept
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 6cf571d6222..82dd24c56b6 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4064,7 +4064,15 @@ not have PROP."
   "Regexp of potentially bogus mail addresses."
   :version "23.1" ;; No Gnus
   :group 'message-headers
-  :type 'regexp)
+  :type '(choice (const :tag "None" nil)
+                 (repeat :value-to-internal (lambda (widget value)
+                                              (custom-split-regexp-maybe value))
+                         :match (lambda (widget value)
+                                  (or (stringp value)
+                                      (widget-editable-list-match widget value)))
+                         regexp)
+                 (const "noreply\\|nospam\\|invalid")
+                 regexp))
 
 (defun message-fix-before-sending ()
   "Do various things to make the message nice before sending it."
@@ -4150,7 +4158,7 @@ not have PROP."
           (forward-char)
           (skip-chars-forward mm-7bit-chars)))))
   (message-check 'bogus-recipient
-    ;; Warn before composing or sending a mail to an invalid address.
+    ;; Warn before sending a mail to an invalid address.
     (message-check-recipients)))
 
 (defun message-bogus-recipient-p (recipients)
@@ -4197,6 +4205,8 @@ This function could be useful in `message-setup-hook'."
                         "Address `%s' might be bogus.  Continue? " bog)))
                  (error "Bogus address."))))))))
 
+(custom-add-option 'message-setup-hook 'message-check-recipients)
+
 (defun message-add-action (action &rest types)
   "Add ACTION to be performed when doing an exit of type TYPES."
   (while types
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 3aaa9c79207..7490a002d37 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1313,18 +1313,20 @@ Ask for type, description or disposition according to
           (setq disposition (mml-minibuffer-read-disposition type nil file)))
         (mml-attach-file file type description disposition)))))
 
-(defun mml-attach-buffer (buffer &optional type description)
+(defun mml-attach-buffer (buffer &optional type description disposition)
   "Attach a buffer to the outgoing MIME message.
-See `mml-attach-file' for details of operation."
+BUFFER is the name of the buffer to attach.  See
+`mml-attach-file' for details of operation."
   (interactive
    (let* ((buffer (read-buffer "Attach buffer: "))
           (type (mml-minibuffer-read-type buffer "text/plain"))
-          (description (mml-minibuffer-read-description)))
-     (list buffer type description)))
+          (description (mml-minibuffer-read-description))
+          (disposition (mml-minibuffer-read-disposition type nil)))
+     (list buffer type description disposition)))
   (save-excursion
     (unless (message-in-body-p) (goto-char (point-max)))
     (mml-insert-empty-tag 'part 'type type 'buffer buffer
-                          'disposition "attachment"
+                          'disposition disposition
                           'description description)))
 
 (defun mml-attach-external (file &optional type description)