# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1159575797 0
# Node ID 380c726c2e33fb61b716b0de88a253130d902a89
# Parent  3dbfd59b44b596b57e04b985e38bf7c0bee28e44
*** empty log message ***

diff -r 3dbfd59b44b5 -r 380c726c2e33 admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Sat Sep 30 00:20:16 2006 +0000
+++ b/admin/FOR-RELEASE	Sat Sep 30 00:23:17 2006 +0000
@@ -47,8 +47,6 @@
 
 ** Martin Rudalics Sep 28: widget-move-and-invoke scrolls spuriously.
 
-** ottomaddox@fastmail.fm Sep 28: european-calendar-style customize bug
-
 ** Peter_Dyballa@Web.DE, Sep 21: An iso-8859-6 cannot be saved
 
 ** XIM hotkey doesn't work in Emacs.
diff -r 3dbfd59b44b5 -r 380c726c2e33 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Sep 30 00:20:16 2006 +0000
+++ b/lisp/ChangeLog	Sat Sep 30 00:23:17 2006 +0000
@@ -1,3 +1,10 @@
+2006-09-29  Glenn Morris  <rgm@gnu.org>
+
+	* calendar/calendar.el (european-calendar-style): Call
+	european-calendar or american-calendar as needed when set.
+	(diary-view-entries, list-calendar-holidays): Move autoloads
+	before use.
+
 2006-09-29  Juri Linkov  <juri@jurta.org>
 
 	* progmodes/cperl-mode.el (cperl-after-expr-p): Don't move point