[Emacs-diffs] Changes to emacs/lisp/gnus/mml.el

[Stefan Monnier]

Index: emacs/lisp/gnus/mml.el
diff -c emacs/lisp/gnus/mml.el:1.25 emacs/lisp/gnus/mml.el:1.26
*** emacs/lisp/gnus/mml.el:1.25 Mon Jul  4 17:55:15 2005
--- emacs/lisp/gnus/mml.el      Thu Jul 21 19:08:30 2005
***************
*** 943,955 ****
      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)))
      (if (not (equal disposition ""))
        disposition
        default)))
--- 943,957 ----
      description))
  
  (defun mml-minibuffer-read-disposition (type &optional default)
!   (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)))