This commit was manufactured by cvs2svn to create branch 'emh-1_5'.

[elisp/emh.git] / emh.el

diff --git a/emh.el b/emh.el
index 85541cf..4594479 100644 (file)
--- a/emh.el
+++ b/emh.el
@@ -1,6 +1,6 @@
 ;;; emh.el --- MIME extender for mh-e
 
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;         OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
@@ -8,7 +8,6 @@
 ;; Created: 1993/11/21
 ;;     Renamed: 1993/11/27 from mh-e-mime.el
 ;;     Renamed: 1997/02/21 from tm-mh-e.el
-;; Version: $Revision: 0.25 $
 ;; Keywords: MH, MIME, multimedia, encoded-word, multilingual, mail
 
 ;; This file is part of emh.
@@ -31,16 +30,15 @@
 ;;; Code:
 
 (require 'mh-e)
+(require 'alist)
 (require 'mime-view)
+(eval-when-compile (require 'mime-text))
 
 
 ;;; @ version
 ;;;
 
-(defconst emh-RCS-ID
-  "$Id: emh.el,v 0.25 1998-02-17 13:50:17 morioka Exp $")
-
-(defconst emh-version (get-version-string emh-RCS-ID))
+(defconst emh-version "1.4.0")
 
 
 ;;; @ variable
@@ -102,9 +100,7 @@ nil, `emh-automatic-mime-preview' is used as default value."
                   (setq abuf (get-buffer-create aname))
                   (set-buffer abuf)
                   )
-                (let ((coding-system-for-read 'raw-text))
-                  (insert-file-contents msg-filename)
-                  )
+                (insert-file-contents-as-raw-text msg-filename)
                 (set-buffer-modified-p nil)
                 (setq buffer-read-only t)
                 (setq buffer-file-name msg-filename)
@@ -230,12 +226,7 @@ digest are inserted into the folder after that message."
 ;;; @ for mime-view
 ;;;
 
-(fset 'emh-text-decode-buffer
-      (symbol-function 'mime-text-decode-buffer))
-
-(set-alist 'mime-text-decoder-alist
-          'mh-show-mode
-          (function emh-text-decode-buffer))
+(set-alist 'mime-raw-representation-type-alist 'mh-show-mode 'binary)
 
 (defvar emh-content-header-filter-hook
   (if window-system
@@ -271,9 +262,8 @@ It is registered to variable `mime-view-content-header-filter-alist'."
     (mh-show (mh-get-msg-num t))
     ))
 
-(set-alist 'mime-view-quitting-method-alist
-          'mh-show-mode
-          (function emh-quitting-method))
+(set-alist 'mime-preview-quitting-method-alist
+          'mh-show-mode #'emh-quitting-method)
 (set-alist 'mime-view-show-summary-method
           'mh-show-mode
           (function emh-quitting-method))
@@ -300,32 +290,31 @@ It is registered to variable `mime-view-content-header-filter-alist'."
 ;;; @@ for mime-partial
 ;;;
 
-(eval-after-load
-    "mime-view"
-  '(progn
-     (autoload 'mime-combine-message/partials-automatically
-       "mime-partial"
-       "Internal method to combine message/partial messages automatically.")
-     (set-atype 'mime-acting-condition
-               '((type . "message/partial")
-                 (method . mime-combine-message/partials-automatically)
-                 (major-mode . mh-show-mode)
-                 (summary-buffer-exp
-                  . (and (or (string-match "^article-\\(.+\\)$"
-                                           article-buffer)
-                             (string-match "^show-\\(.+\\)$" article-buffer))
-                         (substring article-buffer
-                                    (match-beginning 1) (match-end 1))
-                         ))
-                 ))
-     (set-alist 'mime-view-partial-message-method-alist
-               'mh-show-mode
-               (function
-                (lambda ()
-                  (let ((emh-automatic-mime-preview t))
-                    (emh-show)
-                    ))))
-     ))
+(autoload 'mime-method-to-combine-message/partial-pieces
+  "mime-partial"
+  "Internal method to combine message/partial messages automatically.")
+
+(mime-add-condition
+ 'action
+ '((type . message)(subtype . partial)
+   (method . mime-method-to-combine-message/partial-pieces)
+   (major-mode . mh-show-mode)
+   (summary-buffer-exp
+    . (and (or (string-match "^article-\\(.+\\)$"
+                            article-buffer)
+              (string-match "^show-\\(.+\\)$" article-buffer))
+          (substring article-buffer
+                     (match-beginning 1) (match-end 1))
+          ))
+   ))
+
+(set-alist 'mime-view-partial-message-method-alist
+          'mh-show-mode
+          (function
+           (lambda ()
+             (let ((emh-automatic-mime-preview t))
+               (emh-show)
+               ))))
 
 
 ;;; @ set up
@@ -344,8 +333,8 @@ It is registered to variable `mime-view-content-header-filter-alist'."
     (if buf
        (let ((the-buf (current-buffer)))
          (switch-to-buffer buf)
-         (if (and mime-view-buffer
-                  (setq buf (get-buffer mime-view-buffer))
+         (if (and mime-preview-buffer
+                  (setq buf (get-buffer mime-preview-buffer))
                   )
              (progn
                (switch-to-buffer the-buf)