From 7ce93e519fd11ae2261214ff73c4d10be9127ad8 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 3 Dec 2003 09:32:52 +0000 Subject: [PATCH] Synch to Gnus 200312030928. --- lisp/ChangeLog | 20 ++++++++++++++++++++ lisp/dns.el | 5 +++-- lisp/gnus-util.el | 5 +++++ lisp/gnus-xmas.el | 8 ++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3e4fe75..374dedf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,23 @@ +2003-12-03 Katsumi Yamaoka + + * dns.el: Fix misplaced eval-when-compile. + + * gnus-util.el: Require alist and provide tm-view when compiling + with XEmacs. + +2003-12-03 Steve Youngs + + * gnus-xmas.el: Add autoloads for macros defined in gnus.el. + From Jerry James . + + * gnus-util.el: Get rmail definitions when compiling. + From Jerry James . + + * dns.el: Require gnus-xmas at compile time instead of trying to + autoload `gnus-xmas-open-network-stream' because it wasn't picking + up the macro. + From Jerry James . + 2003-12-01 Kevin Greiner * gnus-agent.el (gnus-agent-consider-all-articles): Updated docstring. diff --git a/lisp/dns.el b/lisp/dns.el index 5e767d8..f21bb99 100644 --- a/lisp/dns.el +++ b/lisp/dns.el @@ -281,8 +281,9 @@ If TCP-P, the first two bytes of the package with be the length field." (setq dns-servers (nreverse dns-servers))))) ;;; Interface functions. - -(autoload 'gnus-xmacs-open-network-stream "gnus-xmas" nil nil 'macro) +(eval-when-compile + (when (featurep 'xemacs) + (require 'gnus-xmas))) (defmacro dns-make-network-process (server) (if (featurep 'xemacs) diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index f111e0c..42fd2cf 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -851,6 +851,11 @@ with potentially long computations." ;;; Functions for saving to babyl/mail files. (eval-when-compile + (when (featurep 'xemacs) + (require 'alist) + (provide 'tm-view)) + (require 'rmail) + (autoload 'rmail-update-summary "rmailsum") (defvar rmail-default-rmail-file) (defvar mm-text-coding-system)) diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index f5babab..6fff59e 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -28,6 +28,14 @@ ;;; Code: +(eval-when-compile + (autoload 'gnus-active "gnus" nil nil 'macro) + (autoload 'gnus-group-entry "gnus" nil nil 'macro) + (autoload 'gnus-info-level "gnus" nil nil 'macro) + (autoload 'gnus-info-marks "gnus" nil nil 'macro) + (autoload 'gnus-info-method "gnus" nil nil 'macro) + (autoload 'gnus-info-score "gnus" nil nil 'macro)) + (require 'text-props) (defvar menu-bar-mode (featurep 'menubar)) (require 'messagexmas) -- 1.7.10.4