*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index c06fed6a5cf92192e023618b38dfbccc06cbd820..18fb4f5ebd4d62d21dc8a844080fcdfca78f4136 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1409,6 +1409,11 @@ appointments, paydays or anything else using a sexp.
 year and day number, and moves to that date. Negative day numbers
 count backward from the end of the year.
 
+** The functions `holiday-easter-etc' and `holiday-advent' now take
+arguments, and only report on the specified holiday rather than all.
+This makes customization of the variable `christian-holidays' simpler,
+but existing customizations may need to be updated.
+
 ** The function `simple-diary-display' now by default sets a header line.
 This can be controlled through the variables `diary-header-line-flag'
 and `diary-header-line-format'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24bceedc33cc7c5e8b64b7483a3c1fa169ce2b8d..0842def464e61e7193c42d6dccbf16425a9b2c85 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-09-23  H\e,Ae\e(Bkon Malmedal  <hmalmedal@yahoo.no>
+
+       * calendar/holidays.el (holiday-advent): Report on a specified day
+       offset from advent, not just advent.
+       (holiday-easter-etc): Report on one specified day offset from
+       easter, not all easter holidays. Various Easter holidays moved to
+       `christian-holidays' variable in calendar.el.
+       * calendar/calendar.el (christian-holidays): Adapt for new
+       behaviour of `holiday-advent' and `holiday-easter-etc' functions.
+
 2004-09-23  Kim F. Storm  <storm@cua.dk>
 
        * image.el (insert-sliced-image): Add doc string.