Sync with emiko-1_13.

diff --git a/ChangeLog b/ChangeLog
index 9a5a565..d2abe95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,9 @@
 
 2000-02-01   Daiki Ueno  <ueno@ueda.info.waseda.ac.jp>
 
-       * pgg.el,pgp-gpg.el,pgg-pgp.el,pgg-pgp5.el
+       * mime-image.el: Add checking for `x-face-mule'.
+
+       * pgg.el,pgp-gpg.el,pgg-pgp.el,pgg-pgp5.el
        (pgg-scheme-lookup-key): Rename from
        `pgg-scheme-lookup-key-string'.
        (pgg-scheme-decrypt-region): Use `pgg-scheme-lookup-key'.
@@ -14,10 +16,6 @@
        * pgg-gpg.el (pgg-scheme-lookup-key): Generate *PGG-output* buffer
        if it does not exist.
 
-2000-02-01  MORIOKA Tomohiko  <tomo@m17n.org>
-
-       * mime-image.el: Fix problem when x-face-mule is not installed.
-
 2000-01-24   Daiki Ueno  <ueno@ueda.info.waseda.ac.jp>
 
        * semi-def.el (mime-user-interface-product): Bump up to

diff --git a/mime-image.el b/mime-image.el
index 9fcb604..ac3e957 100644 (file)
--- a/mime-image.el
+++ b/mime-image.el
@@ -142,14 +142,12 @@
     (highlight-headers (point-min) (re-search-forward "^$" nil t) t))
   (add-hook 'mime-display-header-hook
            'mime-preview-x-face-function-use-highlight-headers))
- ((featurep 'mule)
-  (condition-case nil
-      (progn
-       (require 'x-face-mule)
-       (when (exec-installed-p uncompface-program exec-path)
-         (add-hook 'mime-display-header-hook
-                   'x-face-decode-message-header)))
-    (error nil))))
+ ((and (featurep 'mule)
+       (condition-case nil
+          (require 'x-face-mule)
+        (file-error nil))
+       (exec-installed-p uncompface-program exec-path))
+  (add-hook 'mime-display-header-hook 'x-face-decode-message-header)))
 
 (defvar mime-image-format-alist
   '((image jpeg                jpeg)