X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emh-comp.el;h=484b7313fdb2a8ebf853966acdabbe665cff67e5;hb=f76ddcff03e23168843c3d51ccb9ed6591cc3202;hp=aa9a11011270f073bd9b18b84cdc672e325342e5;hpb=31e10a97d2d2699d527a2422f2fe2a8b3aa36eef;p=elisp%2Femh.git

diff --git a/emh-comp.el b/emh-comp.el
index aa9a110..484b731 100644
--- a/emh-comp.el
+++ b/emh-comp.el
@@ -7,7 +7,7 @@
 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1996/2/29 (separated from tm-mh-e.el)
 ;;	Renamed: 1997/2/21 from tmh-comp.el
-;; Version: $Id: emh-comp.el,v 0.1 1997-03-05 13:13:00 morioka Exp $
+;; Version: $Id: emh-comp.el,v 0.5 1997-11-11 11:48:57 morioka Exp $
 ;; Keywords: mail composing, MH, MIME, mail
 
 ;; This file is part of emh.
@@ -150,7 +150,7 @@ system MH lib directory.")
 		    (save-excursion
 		      (set-buffer gnus-article-buffer)
 		      (if (eq major-mode 'mime-view-mode)
-			  mime::preview/article-buffer
+			  mime-raw-buffer
 			(current-buffer)
 			)))
 		   ))))
@@ -219,21 +219,18 @@ See also documentation for `\\[mh-send]' function."
   (catch 'tag
     (let* ((from-folder mh-current-folder)
 	   (config (current-window-configuration))
-	   code-conversion
 	   (draft
 	    (cond ((and mh-draft-folder (equal from-folder mh-draft-folder))
 		   (let ((name (format "draft-%d" msg)))
 		     (if (get-buffer name)
 			 (throw 'tag (pop-to-buffer name))
 		       )
-		     (let ((file-coding-system-for-read *noconv*)
-			   (filename
+		     (let ((filename
 			    (mh-msg-filename msg mh-draft-folder)
 			    ))
 		       (set-buffer (get-buffer-create name))
-		       (insert-file-contents filename)
+		       (as-binary-input-file (insert-file-contents filename))
 		       (setq buffer-file-name filename)
-		       (setq code-conversion t)
 		       )
 		     (pop-to-buffer name)
 		     (if (re-search-forward "^-+$" nil t)
@@ -241,24 +238,23 @@ See also documentation for `\\[mh-send]' function."
 			 )
 		     name))
 		  (t
-		   (prog1
-		       (let ((file-coding-system-for-read *noconv*))
-			 (mh-read-draft "clean-up" (mh-msg-filename msg) nil)
-			 )
-		     (setq code-conversion t)
-		     ))))
-	   )
+		   (let ((flag enable-multibyte-characters))
+		     (prog1
+			 (as-binary-input-file
+			  (mh-read-draft "clean-up"
+					 (mh-msg-filename msg) nil))
+		       (setq enable-multibyte-characters flag)
+		       ))
+		   ))))
       (goto-char (point-min))
       (mh-clean-msg-header (point-min) mh-new-draft-cleaned-headers nil)
-      (if code-conversion
-	  (let ((cs (detect-coding-region (point-min)(point-max))))
-	    (set-buffer-file-coding-system
-	     (if (listp cs)
-		 (car cs)
-	       cs))
-	    ))
+      (let ((cs (detect-coding-region (point-min)(point-max))))
+	(set-buffer-file-coding-system
+	 (if (listp cs)
+	     (car cs)
+	   cs)))
       (save-buffer)
-      (mime-edit-again code-conversion t t)
+      (mime-edit-again nil 'no-separator 'not-turn-on)
       (goto-char (point-min))
       (mh-compose-and-send-mail draft "" from-folder nil nil nil nil nil nil
 				config)
@@ -390,7 +386,7 @@ then prompt for the message sequence. See also documentation for
 		  )))
 	    (delete-region (point) (point-max))
 	    (if multipart-flag
-		(mime-edit-enclose-region "digest" beg (point))
+		(mime-edit-enclose-digest-region beg (point))
 	      ))))
       (re-search-forward tag-regexp)
       (forward-line 1)
@@ -465,11 +461,11 @@ yanked message will be deleted."
 	    (delete-windows-on mh-show-buffer))
 	(set-buffer mh-show-buffer)	; Find displayed message
 	(let ((mh-ins-str
-	       (if mime::preview/article-buffer
+	       (if mime-raw-buffer
 		   (let (mime-view-plain-text-preview-hook buf)
 		     (prog1
 			 (save-window-excursion
-			   (set-buffer mime::preview/article-buffer)
+			   (set-buffer mime-raw-buffer)
 			   (setq buf (mime-view-mode))
 			   (buffer-string)
 			   )