X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-edit.el;h=96b24f4bc2c1742da32e7e11efd9d36568761a32;hb=f22c5f217a3d1a0866db8b2bbb2c10fd65fc84ab;hp=2b6c125cadb3d3e8f4070dc050b0df28dde48ef1;hpb=1aebc49c9a28cb64181a6fb5225966f73bfe661e;p=elisp%2Fsemi.git

diff --git a/mime-edit.el b/mime-edit.el
index 2b6c125..96b24f4 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1011,26 +1011,27 @@ just return to previous mode."
     (princ (documentation 'mime-edit-mode))
     (print-help-return-message)))
 
-(defun mime-edit-insert-text ()
+(defun mime-edit-insert-text (&optional subtype)
   "Insert a text message.
-Charset is automatically obtained from the `charsets-mime-charset-alist'."
+Charset is automatically obtained from the `charsets-mime-charset-alist'.
+If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
   (interactive)
-  (let ((ret (mime-edit-insert-tag "text" nil nil)))
-  (if ret
-      (progn
-	(if (looking-at mime-edit-single-part-tag-regexp)
-	    (progn
-	      ;; Make a space between the following message.
-	      (insert "\n")
-	      (forward-char -1)
-	      ))
-	(if (and (member (cadr ret) '("enriched" "richtext"))
-		 (fboundp 'enriched-mode)
-		 )
-	    (enriched-mode t)
-	  (if (boundp 'enriched-mode)
-	      (enriched-mode -1)
-	    ))))))
+  (let ((ret (mime-edit-insert-tag "text" subtype nil)))
+    (when ret
+      (if (looking-at mime-edit-single-part-tag-regexp)
+	  (progn
+	    ;; Make a space between the following message.
+	    (insert "\n")
+	    (forward-char -1)
+	    ))
+      (if (and (member (cadr ret) '("enriched" "richtext"))
+	       (fboundp 'enriched-mode)
+	       )
+	  (enriched-mode t)
+	(if (boundp 'enriched-mode)
+	    (enriched-mode -1)
+	  ))
+      )))
 
 (defun mime-edit-insert-file (file &optional verbose)
   "Insert a message from a file."
@@ -1131,8 +1132,9 @@ Charset is automatically obtained from the `charsets-mime-charset-alist'."
   (let ((signature-insert-hook
          (function
           (lambda ()
-            (apply (function mime-edit-insert-tag)
-                   (mime-find-file-type signature-file-name))
+	    (let ((items (mime-find-file-type signature-file-name)))
+	      (apply (function mime-edit-insert-tag)
+		     (car items) (cadr items) (list (caddr items))))
             )))
         )
     (insert-signature arg)
@@ -2531,17 +2533,16 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
   "Quitting method for mime-view."
   (let ((temp mime-raw-buffer)
 	buf)
-    (mime-view-kill-buffer)
+    (mime-preview-kill-buffer)
     (set-buffer temp)
     (setq buf mime-edit-buffer)
     (kill-buffer temp)
     (switch-to-buffer buf)
     ))
 
-(set-alist 'mime-view-quitting-method-alist
+(set-alist 'mime-preview-quitting-method-alist
 	   'mime-temp-message-mode
-	   (function mime-edit-quitting-method)
-	   )
+	   #'mime-edit-quitting-method)
 
 
 ;;; @ edit again