From 4f5256b456e29ba912d9eecf526ce089f44bcd64 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 8 Dec 2003 09:06:24 +0000 Subject: [PATCH] Synch to Gnus 200312080901. --- lisp/ChangeLog | 4 +++- lisp/gnus-util.el | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cadfba1..8cc1144 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,9 @@ 2003-12-08 Katsumi Yamaoka * gnus-util.el: Revert 2003-12-03 change, instead, provide the - compiler macro for rmail-select-summary if rmail is not available. + compiler macro for rmail-select-summary if rmail is not available, + and bind rmail-summary-displayed and rmail-maybe-display-summary + in order to silence the compiler even if tm is not available. 2003-12-08 Simon Josefsson diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 6924cab..61224a2 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -861,7 +861,13 @@ with potentially long computations." ;; 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))))) + `(eval '(rmail-select-summary ,@body))) + ;; If there's rmail but there's no tm (or there's apel of the + ;; mainstream, not the XEmacs version), loading rmail of the XEmacs + ;; version fails halfway, however it provides the rmail-select-summary + ;; macro which uses the following functions: + (autoload 'rmail-summary-displayed "rmail") + (autoload 'rmail-maybe-display-summary "rmail"))) (defvar rmail-default-rmail-file) (defvar mm-text-coding-system)) -- 1.7.10.4