From: Katsumi Yamaoka Date: Tue, 27 Apr 2010 06:40:58 +0000 (+0000) Subject: Don't load tm and apel XEmacs packages when compiling. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~376 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62fe59e783e94ffd25130a37391999fd4f918b3f;p=emacs.git Don't load tm and apel XEmacs packages when compiling. --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index b7ef5824772..ae4ede200aa 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2010-04-27 Katsumi Yamaoka + + * gnus-util.el: Don't load tm and apel XEmacs packages when compiling. + 2010-04-23 Stefan Monnier * mm-util.el (mm-find-buffer-file-coding-system): diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index f011cda31a4..ed6d3f362a4 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1070,23 +1070,15 @@ with potentially long computations." ;;; Functions for saving to babyl/mail files. (eval-when-compile - (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))) - ;; 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")))) + (if (featurep 'xemacs) + ;; Don't load tm and apel XEmacs packages that provide some + ;; Emacs emulating functions and variables. + (let ((features features)) + (provide 'tm-view) + (unless (fboundp 'set-alist) (defalias 'set-alist 'ignore)) + (require 'rmail)) ;; It requires tm-view that loads apel. + (require 'rmail)) + (autoload 'rmail-update-summary "rmailsum")) (defvar mm-text-coding-system)