projects / elisp / emh.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge emh-1_10_1_1.
[elisp/emh.git] / emh-comp.el
diff --git a/emh-comp.el b/emh-comp.el
index 547faed..4c16c36 100644 (file)
--- 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.2 1997-03-07 14:25:21 morioka Exp $
 ;; Keywords: mail composing, MH, MIME, mail
 
 ;; This file is part of emh.
@@ -32,6 +30,14 @@
 (require 'mh-comp)
 (require 'mime-edit)
 
+;; Avoid byte compile warnings.
+;; (defvar gnus-article-buffer)
+;; (defvar gnus-article-copy)
+;; (defvar gnus-original-article-buffer)
+;; (eval-when-compile
+;;   (fset 'gnus-copy-article-buffer 'ignore)
+;;   )
+
 
 ;;; @ variable
 ;;;
@@ -42,7 +48,7 @@ Default is \"forwcomps\".  If not a complete path name, the file
 is searched for first in the user's MH directory, then in the
 system MH lib directory.")
 
-(defvar emh-message-yank-function 'mh-yank-cur-msg)
+;; (defvar emh-message-yank-function 'mh-yank-cur-msg)
 
 
 ;;; @ for tm-edit
@@ -150,7 +156,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)
                        )))
                   ))))
@@ -238,11 +244,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 +392,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 +449,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
@@ -458,11 +467,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
-                  (let (mime-view-plain-text-preview-hook buf)
+              (if mime-raw-buffer
+                  (let (mime-display-text/plain-hook buf)
                     (prog1
                         (save-window-excursion
-                          (set-buffer mime::preview/article-buffer)
+                          (set-buffer mime-raw-buffer)
                           (setq buf (mime-view-mode))
                           (buffer-string)
                           )
@@ -479,37 +488,37 @@ yanked message will be deleted."
            (insert "\n"))))
     (error "There is no current message")))
 
-(defun emh-yank-current-message ()
-  "Insert the current message into the draft buffer.
-It uses variable `emh-message-yank-function'
-to select message yanking function."
-  (interactive)
-  (let ((mh-sent-from-folder mh-sent-from-folder)
-       (mh-sent-from-msg mh-sent-from-msg))
-    (if (and (not (stringp mh-sent-from-folder))
-            (boundp 'gnus-article-buffer)
-            (get-buffer gnus-article-buffer)
-            (bufferp mh-sent-from-folder)
-            ) ; might be called from GNUS
-       (if (boundp 'gnus-article-copy) ; might be sgnus
-           (save-excursion
-             (gnus-copy-article-buffer)
-             (setq mh-sent-from-folder gnus-article-copy)
-             (set-buffer mh-sent-from-folder)
-             (setq mh-show-buffer gnus-article-copy)
-             )
-         (save-excursion
-           (setq mh-sent-from-folder gnus-article-buffer)
-           (set-buffer gnus-article-buffer)
-           (setq mh-show-buffer (current-buffer))
-           )))
-    (funcall emh-message-yank-function)
-    ))
-
-(substitute-key-definition
- 'mh-yank-cur-msg 'emh-yank-current-message mh-letter-mode-map)
-(substitute-key-definition
- 'mh-insert-letter 'emh-insert-letter mh-letter-mode-map)
+;; (defun emh-yank-current-message ()
+;;   "Insert the current message into the draft buffer.
+;; It uses variable `emh-message-yank-function'
+;; to select message yanking function."
+;;   (interactive)
+;;   (let ((mh-sent-from-folder mh-sent-from-folder)
+;;         (mh-sent-from-msg mh-sent-from-msg))
+;;     (if (and (not (stringp mh-sent-from-folder))
+;;              (boundp 'gnus-article-buffer)
+;;              (get-buffer gnus-article-buffer)
+;;              (bufferp mh-sent-from-folder)
+;;              ) ; might be called from GNUS
+;;         (if (boundp 'gnus-article-copy) ; might be sgnus
+;;             (save-excursion
+;;               (gnus-copy-article-buffer)
+;;               (setq mh-sent-from-folder gnus-article-copy)
+;;               (set-buffer mh-sent-from-folder)
+;;               (setq mh-show-buffer gnus-article-copy)
+;;               )
+;;           (save-excursion
+;;             (setq mh-sent-from-folder gnus-article-buffer)
+;;             (set-buffer gnus-article-buffer)
+;;             (setq mh-show-buffer (current-buffer))
+;;             )))
+;;     (funcall emh-message-yank-function)
+;;     ))
+
+;; (substitute-key-definition
+;;  'mh-yank-cur-msg 'emh-yank-current-message mh-letter-mode-map)
+;; (substitute-key-definition
+;;  'mh-insert-letter 'emh-insert-letter mh-letter-mode-map)
 
 
 ;;; @ end