* gnus-art.el: Require `mime-image' when Emacs is running on the window system.

* gnus-sum.el: Don't require `mime-view'.

diff --git a/ChangeLog b/ChangeLog
index e4f9f59..5c567a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/gnus-art.el: Require `mime-image' when Emacs is running on
+       the window system.
+
+       * lisp/gnus-sum.el: Don't require `mime-view'.
+
 2003-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/nnmail.el (nnmail-lazy): Replace `widget-default-get' with

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 0f1b5e0..5bce49c 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -41,6 +41,10 @@
 (require 'gnus-win)
 (require 'alist)
 (require 'mime-view)
+(when (static-if (featurep 'xemacs)
+         (console-on-window-system-p)
+       window-system)
+  (require 'mime-image))
 (require 'wid-edit)
 
 ;; Avoid byte-compile warnings.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index f183a71..885c42c 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -41,7 +41,6 @@
 (require 'gnus-undo)
 (require 'gnus-util)
 (require 'nnoo)
-(require 'mime-view)
 
 (eval-when-compile
   (require 'mime-play)