aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2004-09-22 23:26:15 +0000
committerGlenn Morris <[email protected]>2004-09-22 23:26:15 +0000
commit97f3be50fb1715db7e511668a47b5da8b0c1808c (patch)
treeb48a3328f7792ef93db8b5b08d5131312fecd3f1
parentd1493acd5a10a9ca3c469e4ef33718ed9dd1067d (diff)
*** empty log message ***
-rw-r--r--etc/NEWS5
-rw-r--r--lisp/ChangeLog10
2 files changed, 15 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index c06fed6a5c..18fb4f5ebd 100644
--- 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 24bceedc33..0842def464 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-09-23 H,Ae(Bkon Malmedal <[email protected]>
+
+ * 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 <[email protected]>
* image.el (insert-sliced-image): Add doc string.