# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1121972910 0
# Node ID 3196fbe995477d24f4231eb787ab5fa1b9f53e22
# Parent  87f087128cf2bb59047fff053734fe830af60cb4
(mml-minibuffer-read-disposition): Don't use inline by default
for text/rtf.  Display default in prompt.  Pass default for M-n.

diff -r 87f087128cf2 -r 3196fbe99547 lisp/gnus/mml.el
--- a/lisp/gnus/mml.el	Thu Jul 21 19:03:30 2005 +0000
+++ b/lisp/gnus/mml.el	Thu Jul 21 19:08:30 2005 +0000
@@ -943,13 +943,15 @@
     description))
 
 (defun mml-minibuffer-read-disposition (type &optional default)
-  (let* ((default (or default
-		      (if (string-match "^text/.*" type)
-			  "inline"
-			"attachment")))
-	 (disposition (completing-read "Disposition: "
-				       '(("attachment") ("inline") (""))
-				       nil t)))
+  (unless default (setq default
+                        (if (and (string-match "\\`text/" type)
+                                 (not (string-match "\\`text/rtf\\'" type)))
+                            "inline"
+                          "attachment")))
+  (let ((disposition (completing-read
+                      (format "Disposition (default %s): " default)
+                      '(("attachment") ("inline") (""))
+                      nil t nil nil default)))
     (if (not (equal disposition ""))
 	disposition
       default)))