diff options
| -rw-r--r-- | lisp/ChangeLog | 16 | ||||
| -rw-r--r-- | lisp/calendar/cal-bahai.el | 4 | ||||
| -rw-r--r-- | lisp/calendar/cal-hebrew.el | 12 | ||||
| -rw-r--r-- | lisp/calendar/holidays.el | 4 |
4 files changed, 26 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cf5a79abbea..8cd6097c9e2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2008-04-04 Glenn Morris <rgm@gnu.org> + + * calendar/calendar.el (calendar-hebrew-all-holidays-flag): + Rename all-hebrew-calendar-holidays. Update callers, keep old name + as alias. + (calendar-christian-all-holidays-flag): Rename + all-christian-calendar-holidays. Update callers, keep old name as + alias. + (calendar-islamic-all-holidays-flag): Rename + all-islamic-calendar-holidays. Update callers, keep old name as + alias. + (calendar-bahai-all-holidays-flag): Rename all-bahai-calendar-holidays. + Update callers, keep old name as alias. + * calendar/cal-bahai.el, calendar/cal-hebrew.el, calendar/holidays.el: + Update for the above name changes. + 2008-04-04 Juanma Barranquero <lekktu@gmail.com> * hilit-chg.el (global-highlight-changes-mode) diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el index ad72c852579..bdc4b5b8142 100644 --- a/lisp/calendar/cal-bahai.el +++ b/lisp/calendar/cal-bahai.el @@ -239,12 +239,12 @@ nil if it is not visible in the current calendar window." (defun holiday-bahai-ridvan (&optional all) "Holidays related to Ridvan, as visible in the calendar window. Only considers the first, ninth, and twelfth days, unless ALL or -`all-bahai-calendar-holidays' is non-nil." +`calendar-bahai-all-holidays-flag' is non-nil." (let ((ord ["First" "Second" "Third" "Fourth" "Fifth" "Sixth" "Seventh" "Eighth" "Ninth" "Tenth" "Eleventh" "Twelfth"]) (show '(0 8 11)) rid h) - (if (or all all-bahai-calendar-holidays) + (if (or all calendar-bahai-all-holidays-flag) (setq show (number-sequence 0 11))) ;; More trouble than it was worth...? (dolist (i show (nreverse rid)) diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el index 4bbc9f78a73..cde2750a039 100644 --- a/lisp/calendar/cal-hebrew.el +++ b/lisp/calendar/cal-hebrew.el @@ -325,7 +325,7 @@ nil if it is not visible in the current calendar window." ;;;###holiday-autoload (defun holiday-rosh-hashanah-etc (&optional all) "List of dates related to Rosh Hashanah, as visible in calendar window. -Shows only the major holidays, unless `all-hebrew-calendar-holidays' +Shows only the major holidays, unless `calendar-hebrew-all-holidays-flag' or ALL is non-nil." (when (memq displayed-month '(8 9 10 11)) (let ((abs-r-h (calendar-absolute-from-hebrew @@ -343,7 +343,7 @@ or ALL is non-nil." "Shemini Atzeret") (list (calendar-gregorian-from-absolute (+ abs-r-h 22)) "Simchat Torah")) - (when (or all all-hebrew-calendar-holidays) + (when (or all calendar-hebrew-all-holidays-flag) (list (list (calendar-gregorian-from-absolute (calendar-dayname-on-or-before 6 (- abs-r-h 4))) @@ -378,7 +378,7 @@ or ALL is non-nil." ;;;###holiday-autoload (defun holiday-hanukkah (&optional all) "List of dates related to Hanukkah, as visible in calendar window. -Shows only Hanukkah, unless `all-hebrew-calendar-holidays' or ALL +Shows only Hanukkah, unless `calendar-hebrew-all-holidays-flag' or ALL is non-nil." ;; This test is only to speed things up a bit, it works fine without it. (when (memq displayed-month '(10 11 12 1 2)) @@ -395,7 +395,7 @@ is non-nil." "seventh" "eighth"]) han) (holiday-filter-visible-calendar - (if (or all all-hebrew-calendar-holidays) + (if (or all calendar-hebrew-all-holidays-flag) (append (list (list (calendar-gregorian-from-absolute (1- abs-h)) @@ -410,7 +410,7 @@ is non-nil." ;;;###holiday-autoload (defun holiday-passover-etc (&optional all) "List of dates related to Passover, as visible in calendar window. -Shows only the major holidays, unless `all-hebrew-calendar-holidays' +Shows only the major holidays, unless `calendar-hebrew-all-holidays-flag' or ALL is non-nil." (when (< displayed-month 8) (let ((abs-p (calendar-absolute-from-hebrew @@ -422,7 +422,7 @@ or ALL is non-nil." (list (calendar-gregorian-from-absolute abs-p) "Passover") (list (calendar-gregorian-from-absolute (+ abs-p 50)) "Shavuot")) - (when (or all all-hebrew-calendar-holidays) + (when (or all calendar-hebrew-all-holidays-flag) (list (list (calendar-gregorian-from-absolute (calendar-dayname-on-or-before 6 (- abs-p 43))) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index f81f2012fcf..67f53af7e51 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -389,7 +389,7 @@ Nth day before or after Easter. For backwards compatibility, if this function is called with no arguments, then it returns a list of \"standard\" Easter-related -holidays (with more entries if `all-christian-calendar-holidays' +holidays (with more entries if `calendar-christian-all-holidays-flag' is non-nil)." ;; Backwards compatibility layer. (if (not n) @@ -398,7 +398,7 @@ is non-nil)." (apply 'holiday-easter-etc e)) ;; The combined list is not in order. (append - (if all-christian-calendar-holidays + (if calendar-christian-all-holidays-flag '((-63 "Septuagesima Sunday") (-56 "Sexagesima Sunday") (-49 "Shrove Sunday") |