From: hayashi <hayashi>
Date: Tue, 16 May 2000 05:55:07 +0000 (+0000)
Subject: * mime-view.el (mime-view-automatic-conversion): New variable.
X-Git-Tag: emy-1_13_6~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=47228f086fb1d7b4681efe053e8532ac5923a698;p=elisp%2Fsemi.git

* mime-view.el (mime-view-automatic-conversion): New variable.
(mime-display-text): Decode CTE when FLIM 1.14.
---

diff --git a/ChangeLog b/ChangeLog
index 7e684f6..dce0470 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2000-05-16  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* mime-edit.el (mime-edit-mime-version-field-for-message/partial):
+	Remove mime-edit-version.
+	(mime-edit-message-default-max-lines): Increment to 5000.
+	(mime-edit-split-and-send):
+	(mime-edit-exit):
+	Shut up byte compiler.
+
+2000-05-16  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* mime-view.el (mime-view-automatic-conversion): New variable.
+	(mime-display-text): Decode CTE when FLIM 1.14.
+
 2000-05-12  Yoshiki Hayashi  <yoshiki@xemacs.org>
 
 	* mime-view (mime-display-entity): Show header when message
diff --git a/mime-edit.el b/mime-edit.el
index 9fd0c89..922adb1 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -527,7 +527,7 @@ Each elements are regexp of field-name.")
   :group 'mime-edit
   :type 'boolean)
 
-(defcustom mime-edit-message-default-max-lines 1000
+(defcustom mime-edit-message-default-max-lines 5000
   "*Default maximum lines of a message."
   :group 'mime-edit
   :type 'integer)
@@ -678,10 +678,11 @@ Tspecials means any character that matches with it in header must be quoted.")
   "MIME version number.")
 
 (defconst mime-edit-mime-version-field-for-message/partial
-  (concat "MIME-Version:"
-	  (eword-encode-field-body
-	   (concat " 1.0 (split by " mime-edit-version ")\n")
-	   "MIME-Version:"))
+  "MIME-Version: 1.0"
+;;  (concat "MIME-Version:"
+;;	  (eword-encode-field-body
+;;	   (concat " 1.0 (split by " mime-edit-version ")\n")
+;;	   "MIME-Version:"))
   "MIME version field for message/partial.")
 
 
@@ -1042,7 +1043,7 @@ no errors will be signaled even if it is not MIME-Edit mode."
     (if (and (featurep 'xemacs)
 	     (featurep 'menubar))
 	(delete-menu-item (list mime-edit-menu-title)))
-    (end-of-invisible)
+    (disable-invisible)
     (set-buffer-modified-p (buffer-modified-p))
     (run-hooks 'mime-edit-exit-hook)
     (message "Exit MIME editor mode.")))
@@ -2417,10 +2418,11 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
       (setq mime-edit-message-max-length
 	    (or (cdr (assq major-mode mime-edit-message-max-lines-alist))
 		mime-edit-message-default-max-lines)))
-  (let* ((mime-edit-draft-file-name
-	  (or (buffer-file-name)
-	      (make-temp-name
-	       (expand-file-name "mime-draft" temporary-file-directory))))
+  (let* (
+;;	 (mime-edit-draft-file-name
+;;	  (or (buffer-file-name)
+;;	      (make-temp-name
+;;	       (expand-file-name "mime-draft" temporary-file-directory))))
 	 (separator mail-header-separator)
 	 (id (concat "\""
 		     (replace-space-with-underline (current-time-string))
diff --git a/mime-view.el b/mime-view.el
index fc08f14..53fe5b1 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -117,6 +117,14 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
 			       (const :tag "Default" t))
 		       integer)))
 
+(defvar mime-view-automatic-conversion
+  (cond ((featurep 'xemacs)
+	 'automatic-conversion)
+	((boundp 'MULE)
+	 '*autoconv*)
+	(t
+	 'undecided)))
+
 ;;; @ in raw-buffer (representation space)
 ;;;
 
@@ -637,7 +645,10 @@ Each elements are regexp of field-name.")
 	   (mime-entity-body entity)
 	 ;; #### This is wrong, but...
 	 (mime-entity-content entity))
-       (or (cdr (assq 'encoding situation)) "7bit"))
+       (or (cdr (assq 'encoding situation))
+	   (if (fboundp 'mime-entity-body)
+	       (mime-entity-encoding entity)
+	     "7bit")))
       (or (cdr (assq 'coding situation))
 	  'binary)))))
 
@@ -881,7 +892,7 @@ This can only handle gzipped contents."
 	(when (fboundp 'set-buffer-multibyte)
 	  (set-buffer-multibyte t))
 	(buffer-string))
-      'undecided))
+      mime-view-automatic-conversion))
      t)
 
 (defun mime-preview-inline ()
@@ -933,8 +944,8 @@ With prefix, it prompts for coding-system."
 	(position (mime-preview-entity-boundary))
 	(coding (if ask-coding
 		    (or (read-coding-system "Coding system: ")
-			'undecided)
-		  'undecided))
+			mime-view-automatic-conversion)
+		  mime-view-automatic-conversion))
 	(cte (if ask-coding
 		 (completing-read "Content Transfer Encoding: "
 				  (mime-encoding-alist) nil t)))