From: Miles Bader <miles@gnu.org>
Date: Tue, 4 Oct 2005 13:55:17 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-572
X-Git-Tag: emacs-pretest-22.0.90~6830
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbcb5072a3944bb55def85edb61d05639a38f149;p=emacs.git

Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-572

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 129-130)

   - Update from CVS

2005-09-30  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/time-date.el: Autoload parse-time-string, XEmacs needs it.
---

diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index be3490dfaff..b1646a5665c 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -91,6 +91,7 @@ and type 3 is the list (HIGH LOW MICRO)."
    ((eq type 1) (list high low))
    ((eq type 2) (list high low micro))))
 
+(autoload 'parse-time-string "parse-time")
 (autoload 'timezone-make-date-arpa-standard "timezone")
 
 ;;;###autoload
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ebe75811cb0..69bfd79b460 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* time-date.el: Autoload parse-time-string, XEmacs needs it.
+
 2005-09-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* mm-decode.el (mm-inline-media-tests): Check presence of the diff-mode