Mercurial > emacs

comparison lisp/gnus/mml.el @ 90203:187d6a1f84f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 485-492) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 92-94) - Merge from emacs--cvs-trunk--0 - Update from CVS
author Miles Bader <miles@gnu.org>
date Fri, 22 Jul 2005 08:27:27 +0000
parents f9a65d7ebd29 3196fbe99547
children edf295560b5a
comparison
equal deleted inserted replaced
90202:7597b4a23c3b 90203:187d6a1f84f7
940 (when (string-match "\\`[ \t]*\\'" description) 940 (when (string-match "\\`[ \t]*\\'" description)
941 (setq description nil)) 941 (setq description nil))
942 description)) 942 description))
943 943
944 (defun mml-minibuffer-read-disposition (type &optional default) 944 (defun mml-minibuffer-read-disposition (type &optional default)
945 (let* ((default (or default 945 (unless default (setq default
946 (if (string-match "^text/.*" type) 946 (if (and (string-match "\\`text/" type)
947 "inline" 947 (not (string-match "\\`text/rtf\\'" type)))
948 "attachment"))) 948 "inline"
949 (disposition (completing-read "Disposition: " 949 "attachment")))
950 '(("attachment") ("inline") ("")) 950 (let ((disposition (completing-read
951 nil t))) 951 (format "Disposition (default %s): " default)
952 '(("attachment") ("inline") (""))
953 nil t nil nil default)))
952 (if (not (equal disposition "")) 954 (if (not (equal disposition ""))
953 disposition 955 disposition
954 default))) 956 default)))
955 957
956 (defun mml-quote-region (beg end) 958 (defun mml-quote-region (beg end)