From d1493acd5a10a9ca3c469e4ef33718ed9dd1067d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 22 Sep 2004 23:21:18 +0000 Subject: [PATCH] Update maintainer. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit From H�n Malmedal : (christian-holidays): Adapt for new behaviour of holiday-advent and holiday-easter-etc functions. --- lisp/calendar/calendar.el | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 43171255bbe..9d38cde21ce 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -4,6 +4,7 @@ ;; 2000, 2001, 2003, 2004 Free Software Foundation, Inc. ;; Author: Edward M. Reingold +;; Maintainer: Glenn Morris ;; Keywords: calendar ;; Human-Keywords: calendar, Gregorian calendar, diary, holidays @@ -1046,13 +1047,43 @@ See the documentation for `calendar-holidays' for details." (defcustom christian-holidays '((if all-christian-calendar-holidays (holiday-fixed 1 6 "Epiphany")) - (holiday-easter-etc) + (holiday-easter-etc 0 "Easter Sunday") + (holiday-easter-etc -2 "Good Friday") + (holiday-easter-etc -46 "Ash Wednesday") + (if all-christian-calendar-holidays + (holiday-easter-etc -63 "Septuagesima Sunday")) + (if all-christian-calendar-holidays + (holiday-easter-etc -56 "Sexagesima Sunday")) + (if all-christian-calendar-holidays + (holiday-easter-etc -49 "Shrove Sunday")) + (if all-christian-calendar-holidays + (holiday-easter-etc -48 "Shrove Monday")) + (if all-christian-calendar-holidays + (holiday-easter-etc -47 "Shrove Tuesday")) + (if all-christian-calendar-holidays + (holiday-easter-etc -14 "Passion Sunday")) + (if all-christian-calendar-holidays + (holiday-easter-etc -7 "Palm Sunday")) + (if all-christian-calendar-holidays + (holiday-easter-etc -3 "Maundy Thursday")) + (if all-christian-calendar-holidays + (holiday-easter-etc 35 "Rogation Sunday")) + (if all-christian-calendar-holidays + (holiday-easter-etc 39 "Ascension Day")) + (if all-christian-calendar-holidays + (holiday-easter-etc 49 "Pentecost (Whitsunday)")) + (if all-christian-calendar-holidays + (holiday-easter-etc 50 "Whitmonday")) + (if all-christian-calendar-holidays + (holiday-easter-etc 56 "Trinity Sunday")) + (if all-christian-calendar-holidays + (holiday-easter-etc 60 "Corpus Christi")) (if all-christian-calendar-holidays (holiday-greek-orthodox-easter)) (if all-christian-calendar-holidays (holiday-fixed 8 15 "Assumption")) (if all-christian-calendar-holidays - (holiday-advent)) + (holiday-advent 0 "Advent")) (holiday-fixed 12 25 "Christmas") (if all-christian-calendar-holidays (holiday-julian 12 25 "Eastern Orthodox Christmas"))) -- 2.11.4.GIT