X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Ftm.git;a=blobdiff_plain;f=tm-edit.el;fp=tm-edit.el;h=70268a28b5c9dd4adc09ab0ebe868648822e9315;hp=03587b0fafdff18ea0c7045ecab1c7032f112f95;hb=8e18eb1fd95180a6ea115a00ce2f045815809b49;hpb=5281e887c9b0861e341e5b767a243f50a7e516f4

diff --git a/tm-edit.el b/tm-edit.el
index 03587b0..70268a2 100644
--- a/tm-edit.el
+++ b/tm-edit.el
@@ -6,7 +6,7 @@
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/08/21 renamed from mime.el
-;; Version: $Revision: 7.98 $
+;; Version: $Revision: 7.99 $
 ;; Keywords: mail, news, MIME, multimedia, multilingual
 
 ;; This file is part of tm (Tools for MIME).
@@ -120,7 +120,7 @@
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: tm-edit.el,v 7.98 1996/12/23 14:49:34 morioka Exp $")
+  "$Id: tm-edit.el,v 7.99 1996/12/24 12:08:50 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -292,42 +292,42 @@ To insert a signature file automatically, call the function
      )
     ("\\.tar\\.gz$"
      "application" "octet-stream" (("type" . "tar+gzip"))
-     nil
+     "base64"
      "attachment"	(("filename" . file))
      )
     ("\\.tgz$"
      "application" "octet-stream" (("type" . "tar+gzip"))
-     nil
+     "base64"
      "attachment"	(("filename" . file))
      )
     ("\\.tar\\.Z$"
      "application" "octet-stream" (("type" . "tar+compress"))
-     nil
+     "base64"
      "attachment"	(("filename" . file))
      )
     ("\\.taz$"
      "application" "octet-stream" (("type" . "tar+compress"))
-     nil
+     "base64"
      "attachment"	(("filename" . file))
      )
     ("\\.gz$"
      "application" "octet-stream" (("type" . "gzip"))
-     nil
+     "base64"
      "attachment"	(("filename" . file))
      )
     ("\\.Z$"
      "application" "octet-stream" (("type" . "compress"))
-     nil
+     "base64"
      "attachment"	(("filename" . file))
      )
     ("\\.lzh$"
      "application" "octet-stream" (("type" . "lha"))
-     nil
+     "base64"
      "attachment"	(("filename" . file))
      )
     ("\\.zip$"
      "application" "zip" nil
-     nil
+     "base64"
      "attachment"	(("filename" . file))
      )
     ("\\.diff$"
@@ -898,7 +898,7 @@ Charset is automatically obtained from the `mime/lc-charset-alist'."
 	(setq type    (mime-prompt-for-type type)
 	      subtype (mime-prompt-for-subtype type subtype)
 	      ))
-    (if (interactive-p)
+    (if (or (interactive-p) verbose)
 	(setq encoding (mime-prompt-for-encoding encoding))
       )
     (if (or (consp parameters) (stringp disposition-type))
@@ -1387,22 +1387,15 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 
 (defun mime-prompt-for-encoding (default)
   "Ask for Content-Transfer-Encoding. [tm-edit.el]"
-  (let ((ret
-	 (completing-read
-	  (concat "What transfer encoding"
-		  (if default
-		      (concat " (default "
-			      (if (string-equal default "")
-				  "\"\""
-				default)
-			      ")"
-			      ))
-		  ": ")
-	  mime-file-encoding-method-alist nil t nil)
-	 ))
-    (if (string= ret "")
-	default
-      ret)))
+  (let (encoding)
+    (while (string=
+	    (setq encoding
+		  (completing-read
+		   "What transfer encoding: "
+		   mime-file-encoding-method-alist nil t default)
+		  )
+	    ""))
+    encoding))
 
 
 ;;; @ Translate the tagged MIME messages into a MIME compliant message.