X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emh-comp.el;h=130829c57fa1fb6e3b53d1ab0ace36cad9bbc049;hb=627ca8430ccaa9184b22b235e5dc0e474ec37db0;hp=8cb94987624b9d618ebf846d6b9148c92e0ee799;hpb=78a42570e016a4782c3ff3caec323d6037ecc6c7;p=elisp%2Femh.git

diff --git a/emh-comp.el b/emh-comp.el
index 8cb9498..130829c 100644
--- a/emh-comp.el
+++ b/emh-comp.el
@@ -1,13 +1,11 @@
 ;;; emh-comp.el --- emh functions for composing messages
 
-;; Copyright (C) 1993,1994,1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1993,1994,1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;         OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
-;; 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.3 1997-03-18 14:57:53 morioka Exp $
 ;; Keywords: mail composing, MH, MIME, mail
 
 ;; This file is part of emh.
@@ -238,11 +236,14 @@ See also documentation for `\\[mh-send]' function."
 			 )
 		     name))
 		  (t
-		   (as-binary-input-file
-		    (mh-read-draft "clean-up" (mh-msg-filename msg) nil)
-		    )
-		   )))
-	   )
+		   (let ((flag enable-multibyte-characters))
+		     (prog1
+			 (as-binary-input-file
+			  (mh-read-draft "clean-up"
+					 (mh-msg-filename msg) nil))
+		       (set-buffer-multibyte flag)
+		       ))
+		   ))))
       (goto-char (point-min))
       (mh-clean-msg-header (point-min) mh-new-draft-cleaned-headers nil)
       (let ((cs (detect-coding-region (point-min)(point-max))))
@@ -383,7 +384,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)
@@ -440,8 +441,8 @@ then prompt for the message sequence. See also documentation for
 (defun emh-yank-cur-msg-with-no-filter ()
   "Insert the current message into the draft buffer.
 This function makes new show-buffer from article-buffer to disable
-variable `mime-view-plain-text-preview-hook'. If you don't want to
-use text filters for replying message, please set it to
+variable `mime-preview-text/plain-hook'. If you don't want to use text
+filters for replying message, please set it to
 `emh-message-yank-function'.
 Prefix each non-blank line in the message with the string in
 `mh-ins-buf-prefix'. The entire message will be inserted if
@@ -459,7 +460,7 @@ yanked message will be deleted."
 	(set-buffer mh-show-buffer)	; Find displayed message
 	(let ((mh-ins-str
 	       (if mime-raw-buffer
-		   (let (mime-view-plain-text-preview-hook buf)
+		   (let (mime-preview-text/plain-hook buf)
 		     (prog1
 			 (save-window-excursion
 			   (set-buffer mime-raw-buffer)