Revoke the last commit; that was quite buggy!

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17fad0a..3e4fe75 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,16 +1,3 @@
-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 4a37823..5e767d8 100644 (file)
--- 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.
-(when (featurep 'xemacs)
-  (eval-when-compile (require 'gnus-xmas)))
+
+(autoload 'gnus-xmacs-open-network-stream "gnus-xmas" nil nil 'macro)
 
 (defmacro dns-make-network-process (server)
   (if (featurep 'xemacs)

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 1b085e2..f111e0c 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -851,8 +851,6 @@ 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 6fff59e..f5babab 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -28,14 +28,6 @@
 
 ;;; 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)