Fix based on EMY.

diff --git a/ChangeLog b/ChangeLog
index c3eeb47..431b983 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,18 @@
        * mime-w3.el (mime-preview-text/html): Use
        `mime-find-root-entity'.
 
+2000-06-15  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+       * semi-setup.el (mime-setup-enable-inline-image): Don't check
+       window-system under XEmacs.
+       * semi-def.el (select-menu-alist): Use device-on-window-system-p
+       under XEmacs.
+
+2000-06-14  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+       * semi-def.el (mime-create-xpm-buttton): Make an extent start-open.
+       Put mime-button text-property for buttonize and unbuttonize.
+
 2000-06-09   Daiki Ueno  <ueno@unixuser.org>
 
        * mime-edit.el (mime-edit-insert-key): Insert a text tag when

diff --git a/semi-setup.el b/semi-setup.el
index ecdf2ae..a6f15b1 100644 (file)
--- a/semi-setup.el
+++ b/semi-setup.el
@@ -43,8 +43,7 @@ it is used as hook to set."
 
 ;; for image/*
 (defvar mime-setup-enable-inline-image
-  (and window-system
-       (or (featurep 'xemacs)(featurep 'mule)))
+  (or (featurep 'xemacs) (and window-system (featurep 'mule)))
   "*If it is non-nil, semi-setup sets up to use mime-image.")
 
 (if mime-setup-enable-inline-image