From 498063ecdd75096b731b8ccde8c7f15068de0eae Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Tue, 5 Apr 2005 04:10:27 +0000
Subject: [PATCH] Revision:
 miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-234

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 56-58)

   - Update from CVS
   - Collapse feature addition/removal within single ChangeLog entry

2005-04-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/message.el (message-make-date): Add defvars in order to silence
   the byte compiler inside the defun.

   * lisp/gnus/nnimap.el (nnimap-date-days-ago): Ditto.

   * lisp/gnus/gnus-demon.el (parse-time-string): Added autoload.

   * lisp/gnus/gnus-delay.el (parse-time-string): Added autoload.

   * lisp/gnus/gnus-art.el (parse-time-string): Added autoload.

   * lisp/gnus/nnultimate.el (parse-time): Require for `parse-time-string'.
---
 lisp/gnus/ChangeLog     | 19 +++++++++++++++++--
 lisp/gnus/gnus-art.el   |  1 +
 lisp/gnus/gnus-delay.el |  1 +
 lisp/gnus/gnus-demon.el |  2 ++
 lisp/gnus/message.el    |  2 ++
 lisp/gnus/nnimap.el     |  2 ++
 lisp/gnus/nnultimate.el |  1 +
 7 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b19598eb3ab..14c47ab1f30 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,7 +1,22 @@
+2005-04-04  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* message.el (message-make-date): Add defvars in order to silence
+	the byte compiler inside the defun.
+
+	* nnimap.el (nnimap-date-days-ago): Ditto.
+
+	* gnus-demon.el (parse-time-string): Added autoload.
+
+	* gnus-delay.el (parse-time-string): Added autoload.
+
+	* gnus-art.el (parse-time-string): Added autoload.
+
+	* nnultimate.el (parse-time): Require for `parse-time-string'.
+
 2005-04-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-	* gnus-sum.el (gnus-summary-make-menu-bar): Fix an
-	"unrecognised menu descriptor" error.
+	* gnus-sum.el (gnus-summary-make-menu-bar): Avoid the
+	"Unrecognized menu descriptor" error in XEmacs.
 
 2005-03-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index ff04bfbb56f..9d09e58fd31 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -46,6 +46,7 @@
 (autoload 'gnus-msg-mail "gnus-msg" nil t)
 (autoload 'gnus-button-mailto "gnus-msg")
 (autoload 'gnus-button-reply "gnus-msg" nil t)
+(autoload 'parse-time-string "parse-time" nil nil)
 
 (defgroup gnus-article nil
   "Article display."
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index acf7670b0ed..e0c673d1bf8 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -37,6 +37,7 @@
 
 (require 'nndraft)
 (require 'gnus-draft)
+(autoload 'parse-time-string "parse-time" nil nil)
 
 ;;;###autoload
 (defgroup gnus-delay nil
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 8d2018a0048..dbb9d82ba5f 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -40,6 +40,8 @@
       (require 'itimer)
     (require 'timer)))
 
+(autoload 'parse-time-string "parse-time" nil nil)
+
 (defgroup gnus-demon nil
   "Demonic behaviour."
   :group 'gnus)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 9edbce2620e..0722ec1177b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4568,6 +4568,8 @@ Otherwise, generate and save a value for `canlock-password' first."
   "Make a valid data header.
 If NOW, use that time instead."
   (require 'parse-time)
+  (defvar parse-time-weekdays)
+  (defvar parse-time-months)
   (let* ((now (or now (current-time)))
 	 (zone (nth 8 (decode-time now)))
 	 (sign "+"))
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 06bc1d76134..d7cec7a864f 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1388,6 +1388,8 @@ function is generally only called when Gnus is shutting down."
 
 (defun nnimap-date-days-ago (daysago)
   "Return date, in format \"3-Aug-1998\", for DAYSAGO days ago."
+  (require 'parse-time)
+  (defvar parse-time-months)
   (let* ((time (nnimap-time-substract (current-time) (days-to-time daysago)))
 	 (date (format-time-string
 		(format "%%d-%s-%%Y"
diff --git a/lisp/gnus/nnultimate.el b/lisp/gnus/nnultimate.el
index b785e49af52..42fbc13a6ff 100644
--- a/lisp/gnus/nnultimate.el
+++ b/lisp/gnus/nnultimate.el
@@ -39,6 +39,7 @@
 (require 'mm-util)
 (require 'mm-url)
 (require 'nnweb)
+(require 'parse-time)
 (autoload 'w3-parse-buffer "w3-parse")
 
 (nnoo-declare nnultimate)