From: ueno <ueno>
Date: Tue, 1 Feb 2000 04:03:04 +0000 (+0000)
Subject: * mime-image.el: Add checking for `x-face-mule'.
X-Git-Tag: emiko-1_13_10~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5eb41a3d12e3dec5ca0d5dc674c157e08fb98518;p=elisp%2Fsemi.git

* mime-image.el: Add checking for `x-face-mule'.
---

diff --git a/mime-image.el b/mime-image.el
index 341ee25..ac3e957 100644
--- a/mime-image.el
+++ b/mime-image.el
@@ -142,11 +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)
-  (require 'x-face-mule)
-  (when (exec-installed-p uncompface-program exec-path)
-    (add-hook 'mime-display-header-hook
-	      'x-face-decode-message-header))))
+ ((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)