Mercurial > emacs
changeset 108192:27c366fe4d1f
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 27 Apr 2010 06:45:13 +0000 |
| parents | d1f2942e6652 (current diff) aacd4ee6c3af (diff) |
| children | 3fc390a10afb |
| files | |
| diffstat | 2 files changed, 13 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Tue Apr 27 06:37:03 2010 +0000 +++ b/lisp/gnus/ChangeLog Tue Apr 27 06:45:13 2010 +0000 @@ -1,3 +1,7 @@ +2010-04-27 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-util.el: Don't load tm and apel XEmacs packages when compiling. + 2010-04-23 Stefan Monnier <monnier@iro.umontreal.ca> * mm-util.el (mm-find-buffer-file-coding-system):
--- a/lisp/gnus/gnus-util.el Tue Apr 27 06:37:03 2010 +0000 +++ b/lisp/gnus/gnus-util.el Tue Apr 27 06:45:13 2010 +0000 @@ -1070,23 +1070,15 @@ ;;; 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)