Revert 2003-12-03 change, instead, provide the compiler macro for

rmail-select-summary if rmail is not available.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb89cd8..cadfba1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-util.el: Revert 2003-12-03 change, instead, provide the
+       compiler macro for rmail-select-summary if rmail is not available.
+
 2003-12-08  Simon Josefsson  <jas@extundo.com>
 
        * flow-fill.el (fill-flowed-encode-tests, fill-flowed-test): Add.

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 6c4d54d..d3d4be1 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -803,14 +803,17 @@ with potentially long computations."
 ;;; Functions for saving to babyl/mail files.
 
 (eval-when-compile
-  (when (featurep 'xemacs)
-    ;; The XEmacs version of rmail requires tm, however tm was taken
-    ;; over to SEMI and FLIM long ago.  So, there may be those who
-    ;; have not installed tm.
-    (require 'alist)
-    (provide 'tm-view))
-  (require 'rmail)
-  (autoload 'rmail-update-summary "rmailsum")
+  (condition-case nil
+      (progn
+       (require 'rmail)
+       (autoload 'rmail-update-summary "rmailsum"))
+    (error
+     (define-compiler-macro rmail-select-summary (&rest body)
+       ;; Rmail of the XEmacs version is supplied by the package, and
+       ;; requires tm and apel packages.  However, there may be those
+       ;; who haven't installed those packages.  This macro helps such
+       ;; people even if they install those packages later.
+       `(eval '(rmail-select-summary ,@body)))))
   (defvar rmail-default-rmail-file)
   (defvar mm-text-coding-system))