(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 394d660..05a9678 100644 (file)
--- a/emh.el
+++ b/emh.el
@@ -37,7 +37,7 @@
 ;;; @ version
 ;;;
 
-(defconst emh-version "1.14.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
 ;;;
@@ -279,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)
-    (raw-text-insert-file-contents msg-filename)
+    (insert-file-contents msg-filename)
     (mime-parse-buffer)
     ))
 
@@ -344,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
 ;;;