Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 228-240)

   - Update from CVS
   - Merge from gnus--rel--5.10

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

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
   - Collapse feature addition/removal within single ChangeLog entry

9 files changed, 32 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fe2fcab6643..d8e1065c610 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,23 @@
+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): Avoid the
+	"Unrecognized menu descriptor" error in XEmacs.
+
 2005-03-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* message.el (message-resend): Bind rfc2047-encode-encoded-words.
@@ -483,7 +503,7 @@
 
 2004-11-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-	* gnus-art. (gnus-article-edit-article): Don't associate the
+	* gnus-art.el (gnus-article-edit-article): Don't associate the
 	article buffer with a draft file.  This is a temporary measure
 	against the 2004-08-22 change to gnus-article-edit-mode.
 
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 2a774e2245a..5d7a608054e 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -12604,7 +12604,7 @@
 
 	* nnfolder.el (nnfolder-read-folder): Use group instead of
 	nnfolder-current-group.
-	Suggested by Lorentey Karoly <lorentey@elte.hu>.
+	Suggested by K,Ba(Broly L,Bu(Brentey <lorentey@elte.hu>.
 
 2001-11-17  Simon Josefsson  <jas@extundo.com>
 
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/gnus-sum.el b/lisp/gnus/gnus-sum.el
index ea8f7e063fe..8d6a5f951b5 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2250,7 +2250,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
 	       ,@(if (featurep 'xemacs) '(t)
 		   '(:help "Generate and print a PostScript image"))])
 	     ("Copy, move,... (Backend)"
-	      ,@(if (featurep 'xemacs) '(t)
+	      ,@(if (featurep 'xemacs) nil
 		  '(:help "Copying, moving, expiring articles..."))
 	      ["Respool article..." gnus-summary-respool-article t]
 	      ["Move article..." gnus-summary-move-article
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 072097b505b..4613bef6af7 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)