aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2005-10-04 13:55:17 +0000
committerMiles Bader2005-10-04 13:55:17 +0000
commitbbcb5072a3944bb55def85edb61d05639a38f149 (patch)
tree3eed3b797fbf15e4dd415f58a751f2e00414d931
parent66533b25807362ca49147e35c76546709698d5f0 (diff)
downloademacs-bbcb5072a3944bb55def85edb61d05639a38f149.tar.gz
emacs-bbcb5072a3944bb55def85edb61d05639a38f149.zip
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.
-rw-r--r--lisp/calendar/time-date.el1
-rw-r--r--lisp/gnus/ChangeLog4
2 files changed, 5 insertions, 0 deletions
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)."
91 ((eq type 1) (list high low)) 91 ((eq type 1) (list high low))
92 ((eq type 2) (list high low micro)))) 92 ((eq type 2) (list high low micro))))
93 93
94(autoload 'parse-time-string "parse-time")
94(autoload 'timezone-make-date-arpa-standard "timezone") 95(autoload 'timezone-make-date-arpa-standard "timezone")
95 96
96;;;###autoload 97;;;###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 @@
12005-09-30 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * time-date.el: Autoload parse-time-string, XEmacs needs it.
4
12005-09-30 Stefan Monnier <monnier@iro.umontreal.ca> 52005-09-30 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * mm-decode.el (mm-inline-media-tests): Check presence of the diff-mode 7 * mm-decode.el (mm-inline-media-tests): Check presence of the diff-mode