diff lisp/gnus/mml.el @ 95086:241ad02f83c7

Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1168
author Miles Bader <miles@gnu.org>
date Sun, 18 May 2008 22:43:12 +0000
parents f42ef85caf91
children 645fb33380d6
line wrap: on
line diff
--- a/lisp/gnus/mml.el	Sun May 18 21:17:21 2008 +0000
+++ b/lisp/gnus/mml.el	Sun May 18 22:43:12 2008 +0000
@@ -1313,18 +1313,20 @@
 	  (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)