From 1906569fe40363c9cef60370a8692f7867673923 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 3 Dec 2003 02:03:01 +0000
Subject: [PATCH] Synch to Gnus 200312030159.

---
 lisp/ChangeLog    |   13 +++++++++++++
 lisp/dns.el       |    4 ++--
 lisp/gnus-util.el |    2 ++
 lisp/gnus-xmas.el |    8 ++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e4fe75..17fad0a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2003-12-03  Steve Youngs  <sryoungs@bigpond.net.au>
+
+	* gnus-xmas.el: Add autoloads for macros defined in gnus.el.
+	From Jerry James <james@xemacs.org>.
+
+	* gnus-util.el: Get rmail definitions when compiling.
+	From Jerry James <james@xemacs.org>.
+
+	* 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 <james@xemacs.org>.
+
 2003-12-01  Kevin Greiner <kgreiner@xpediantsolutions.com>
 	* gnus-agent.el (gnus-agent-consider-all-articles): Updated
 	docstring.
diff --git a/lisp/dns.el b/lisp/dns.el
index 5e767d8..4a37823 100644
--- a/lisp/dns.el
+++ b/lisp/dns.el
@@ -281,8 +281,8 @@ 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)
+(when (featurep 'xemacs)
+  (eval-when-compile (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..1b085e2 100644
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -851,6 +851,8 @@ with potentially long computations."
 ;;; Functions for saving to babyl/mail files.
 
 (eval-when-compile
+  (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