(mime-setup-enable-inline-image): Use "(fboundp 'create-image)" to

detect Emacs 21.
Use `eval-after-load' instead of `call-after-loaded' to require
`mime-image'.

diff --git a/semi-setup.el b/semi-setup.el
index 57e4bda..f4da19e 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -45,18 +45,14 @@ it is used as hook to set."
 (defvar mime-setup-enable-inline-image
   (and window-system
        (or (featurep 'xemacs)
-          (and (featurep 'mule)(module-installed-p 'bitmap))
-          ))
+          (and (featurep 'mule)
+               (or (fboundp 'create-image)
+                   (module-installed-p 'bitmap)))))
   "*If it is non-nil, semi-setup sets up to use mime-image.")
 
 (if mime-setup-enable-inline-image
-    (call-after-loaded 'mime-view
-                      (function
-                       (lambda ()
-                         (require 'mime-image)
-                         )))
-  )
-
+    (eval-after-load "mime-view"
+      '(require 'mime-image)))
 
 ;; for text/html
 (defvar mime-setup-enable-inline-html