(What's EMH?): Modify for the new URLs of APEL, FLIM and SEMI.

[elisp/emh.git] / emh.el

diff --git a/emh.el b/emh.el
index 22a2d7e..05a9678 100644 (file)
--- a/emh.el
+++ b/emh.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;;         OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
-;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Maintainer: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Created: 1993/11/21
 ;;     Renamed: 1993/11/27 from mh-e-mime.el
 ;;     Renamed: 1997/02/21 from tm-mh-e.el
@@ -37,7 +37,7 @@
 ;;; @ version
 ;;;
 
-(defconst emh-version "1.13.0")
+(defconst emh-version "1.14.1")
 
 
 ;;; @ variable
@@ -58,6 +58,17 @@
   :group 'emh
   :type 'boolean)
 
+(defcustom emh-icon-directory (if (fboundp 'locate-data-directory)
+                                 (locate-data-directory "emh")
+                               (let ((icons (expand-file-name 
+                                             "emh/icons/"
+                                             data-directory)))
+                                 (if (file-directory-p icons)
+                                     icons)))
+  "*Directory to load the icon files from, or nil if none."
+  :group 'emh
+  :type '(choice (const :tag "none" nil)
+                 string))
 
 ;;; @ functions
 ;;;
@@ -98,21 +109,18 @@ nil, `emh-automatic-mime-preview' is used as default value."
                     (progn
                       (set-buffer abuf)
                       (setq buffer-read-only nil)
-                      (erase-buffer)
-                      )
+                      (erase-buffer))
                   (setq abuf (get-buffer-create aname))
                   (set-buffer abuf)
-                  (set-buffer-multibyte nil)
-                  )
-                (insert-file-contents-as-raw-text msg-filename)
+                  (set-buffer-multibyte nil))
+                (8bit-insert-encoded-file msg-filename)
                 (set-buffer-modified-p nil)
                 (setq buffer-read-only t)
                 (setq buffer-file-name msg-filename)
                 (mh-show-mode)
                 (mime-display-message (mime-open-entity 'buffer aname)
                                       (concat "show-" folder))
-                (goto-char (point-min))
-                )
+                (goto-char (point-min)))
             (let ((clean-message-header mh-clean-message-header)
                   (invisible-headers mh-invisible-headers)
                   (visible-headers mh-visible-headers))
@@ -135,8 +143,7 @@ nil, `emh-automatic-mime-preview' is used as default value."
                     (t
                      (mh-start-of-uncleaned-message)))
               (if emh-decode-encoded-word
-                  (eword-decode-header)
-                )
+                  (mime-decode-header-in-buffer))
               (set-buffer-modified-p nil)
               (setq buffer-read-only t)
               (setq buffer-file-name msg-filename)
@@ -283,11 +290,12 @@ digest are inserted into the folder after that message."
 
 (defun emh-request-partial-message ()
   (let ((msg-filename (mh-msg-filename (mh-get-msg-num t)))
-       (show-buffer mh-show-buffer))
+       (show-buffer mh-show-buffer)
+       (coding-system-for-read 'raw-text))
     (set-buffer (get-buffer-create " *Partial Article*"))
     (erase-buffer)
     (setq mime-preview-buffer show-buffer)
-    (insert-file-contents-as-raw-text msg-filename)
+    (insert-file-contents msg-filename)
     (mime-parse-buffer)
     ))
 
@@ -348,6 +356,12 @@ digest are inserted into the folder after that message."
 
 (eval-after-load "bbdb" '(require 'mime-bbdb))
 
+;;; @ Toolbar
+
+(if (and (not (featurep 'xemacs))
+        (boundp 'emacs-major-version)
+        (>= emacs-major-version 21))
+    (require 'emh-e21))
 
 ;;; @ end
 ;;;