(config-emh): set LISPDIR.

[elisp/emh.git] / emh.el

diff --git a/emh.el b/emh.el
index eeb7bc2..f4a5075 100644 (file)
--- a/emh.el
+++ b/emh.el
@@ -1,6 +1,6 @@
 ;;; emh.el --- MIME extender for mh-e
 
-;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;         OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
@@ -8,7 +8,7 @@
 ;; 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.0 $
+;; Version: $Revision: 0.20 $
 ;; Keywords: MH, MIME, multimedia, encoded-word, multilingual, mail
 
 ;; This file is part of emh.
@@ -30,8 +30,6 @@
 
 ;;; Code:
 
-(require 'tl-str)
-(require 'tl-misc)
 (require 'mh-e)
 (require 'mime-view)
 
@@ -40,7 +38,7 @@
 ;;;
 
 (defconst emh-RCS-ID
-  "$Id: emh.el,v 0.0 1997-02-24 02:04:06 tmorioka Exp $")
+  "$Id: emh.el,v 0.20 1997-05-12 12:32:35 morioka Exp $")
 
 (defconst emh-version (get-version-string emh-RCS-ID))
 
@@ -59,6 +57,9 @@
 ;;;
 
 (defun mh-display-msg (msg-num folder &optional show-buffer mode)
+  "Display message number MSG-NUM of FOLDER.
+This function uses `mime-view-mode' if MODE is not nil.  If MODE is
+nil, `emh-automatic-mime-preview' is used as default value."
   (or mode
       (setq mode emh-automatic-mime-preview)
       )
@@ -130,7 +131,7 @@
                     (t
                      (mh-start-of-uncleaned-message)))
               (if emh-decode-encoded-word
-                  (eword-decode-message-header)
+                  (eword-decode-header)
                 )
               (set-buffer-modified-p nil)
               (setq buffer-read-only t)
@@ -176,9 +177,9 @@ With arg, turn MIME processing on if arg is positive."
   (save-excursion
     (set-buffer mh-show-buffer)
     (if (null emh-automatic-mime-preview)
-       (if (and mime::preview/article-buffer
-                (get-buffer mime::preview/article-buffer))
-           (kill-buffer mime::preview/article-buffer)
+       (if (and mime-raw-buffer
+                (get-buffer mime-raw-buffer))
+           (kill-buffer mime-raw-buffer)
          )))
   (mh-invalidate-show-buffer)
   (mh-show (mh-get-msg-num t))
@@ -224,18 +225,29 @@ digest are inserted into the folder after that message."
 ;;; @ for mime-view
 ;;;
 
-(fset 'emh-decode-charset-buffer
-      (symbol-function 'mime-charset/decode-buffer))
+(fset 'emh-text-decode-buffer
+      (symbol-function 'mime-text-decode-buffer))
 
 (set-alist 'mime-text-decoder-alist
           'mh-show-mode
-          (function emh-decode-charset-buffer))
+          (function emh-text-decode-buffer))
+
+(defvar emh-content-header-filter-hook
+  (if window-system
+      '(emh-highlight-header)
+    )
+  "Hook for header filtering.")
+
+(autoload 'emh-highlight-header "emh-face")
 
 (defun emh-content-header-filter ()
+  "Header filter for mime-view.
+It is registered to variable `mime-view-content-header-filter-alist'."
   (goto-char (point-min))
-  (mime-preview/cut-header)
-  (emh-decode-charset-buffer default-mime-charset)
-  (eword-decode-message-header)
+  (mime-view-cut-header)
+  (emh-text-decode-buffer default-mime-charset)
+  (eword-decode-header)
+  (run-hooks 'emh-content-header-filter-hook)
   )
 
 (set-alist 'mime-view-content-header-filter-alist
@@ -243,13 +255,8 @@ digest are inserted into the folder after that message."
           (function emh-content-header-filter))
 
 (defun emh-quitting-method ()
-  (let ((win (get-buffer-window
-             mime/output-buffer-name))
-       (buf (current-buffer))
-       )
-    (if win
-       (delete-window win)
-      )
+  (let ((buf (current-buffer)))
+    (mime-hide-echo-buffer)
     (pop-to-buffer
      (let ((name (buffer-name buf)))
        (substring name 5)
@@ -290,12 +297,15 @@ digest are inserted into the folder after that message."
 ;;;
 
 (call-after-loaded
- 'mime-partial
+ 'mime-view
  (function
   (lambda ()
-    (set-atype 'mime/content-decoding-condition
+    (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-article/grab-message/partials)
+                (method . mime-combine-message/partials-automatically)
                 (major-mode . mh-show-mode)
                 (summary-buffer-exp
                  . (and (or (string-match "^article-\\(.+\\)$" article-buffer)
@@ -304,7 +314,7 @@ digest are inserted into the folder after that message."
                                    (match-beginning 1) (match-end 1))
                         ))
                 ))
-    (set-alist 'mime-partial/preview-article-method-alist
+    (set-alist 'mime-view-partial-message-method-alist
               'mh-show-mode
               (function
                (lambda ()
@@ -330,8 +340,8 @@ digest are inserted into the folder after that message."
     (if buf
        (let ((the-buf (current-buffer)))
          (switch-to-buffer buf)
-         (if (and mime::article/preview-buffer
-                  (setq buf (get-buffer mime::article/preview-buffer))
+         (if (and mime-view-buffer
+                  (setq buf (get-buffer mime-view-buffer))
                   )
              (progn
                (switch-to-buffer the-buf)
@@ -342,7 +352,7 @@ digest are inserted into the folder after that message."
          ))))
 
 (add-hook 'mh-before-quit-hook (function emh-summary-before-quit))
-            
+
 
 ;;; @@ for emh-comp.el
 ;;;
@@ -383,7 +393,7 @@ digest are inserted into the folder after that message."
  'bbdb
  (function
   (lambda ()
-    (require 'tm-bbdb)
+    (require 'mime-bbdb)
     )))