# HG changeset patch # User Glenn Morris # Date 1207283867 0 # Node ID d772031482b8ead579a210b3676f963f0e2fd55a # Parent 0dcb238ad128404c39c36889fcf8b8a6067f1a6f Update for calendar.el name changes. diff -r 0dcb238ad128 -r d772031482b8 lisp/calendar/cal-hebrew.el --- a/lisp/calendar/cal-hebrew.el Fri Apr 04 04:37:29 2008 +0000 +++ b/lisp/calendar/cal-hebrew.el Fri Apr 04 04:37:47 2008 +0000 @@ -325,7 +325,7 @@ ;;;###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 @@ "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 @@ ;;;###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 @@ "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 @@ ;;;###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 @@ (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)))