From: vitaly <vitaly>
Date: Mon, 25 Jan 2010 09:27:20 +0000 (+0000)
Subject: Ask user for MIME type and subtype during interactive file insertion,
X-Git-Tag: semi-1_14-wl-root~8
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33d34ecbcfe7d48c5611d4397ad7eb0ebd0119e8;p=elisp%2Fsemi.git

Ask user for MIME type and subtype during interactive file insertion,
not only encoding.
---

diff --git a/ChangeLog b/ChangeLog
index f3f48e2..b945855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
+2010-01-25  Vitaly Mayatskikh  <v.mayatskih@gmail.com>
+
+	* mime-edit.el (mime-edit-insert-file): Ask user for MIME type and
+	subtype during interactive file insertion, not only encoding.
+
 2010-01-19  Vitaly Mayatskikh  <v.mayatskih@gmail.com>
+
 	* mime-view.el (toplevel): New defcustom: mime-view-buttons-visible
 	* mime-view.el (mime-display-entity): Use mime-view-buttons-visible
 	to control visibility of MIME buttons.
diff --git a/mime-edit.el b/mime-edit.el
index e1577f0..fc68f79 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1157,13 +1157,10 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
 	  (disposition-type (nth 4 guess))
 	  (disposition-params (nth 5 guess))
 	  )
-    (if verbose
-	(setq type    (mime-prompt-for-type type)
-	      subtype (mime-prompt-for-subtype type subtype)
-	      ))
     (if (or (interactive-p) verbose)
-	(setq encoding (mime-prompt-for-encoding encoding))
-      )
+	(setq type (mime-prompt-for-type type)
+	      subtype (mime-prompt-for-subtype type subtype)
+	      encoding (mime-prompt-for-encoding encoding)))
     (if (or (consp parameters) (stringp disposition-type))
 	(let ((rest parameters) cell attribute value)
 	  (setq parameters "")