[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el |
Date: |
Tue, 04 Feb 2003 07:49:35 -0500 |
Index: emacs/lisp/calendar/cal-hebrew.el
diff -c emacs/lisp/calendar/cal-hebrew.el:1.14
emacs/lisp/calendar/cal-hebrew.el:1.15
*** emacs/lisp/calendar/cal-hebrew.el:1.14 Sat Jul 27 15:01:40 2002
--- emacs/lisp/calendar/cal-hebrew.el Tue Feb 4 07:49:33 2003
***************
*** 115,123 ****
day)))
(if ;; If Rosh HaShanah would occur on Sunday, Wednesday, or Friday
(memq (% alternative-day 7) (list 0 3 5))
! ;; Then postpone it one (more) day and return
(1+ alternative-day)
! ;; Else return
alternative-day)))
(defun hebrew-calendar-days-in-year (year)
--- 115,123 ----
day)))
(if ;; If Rosh HaShanah would occur on Sunday, Wednesday, or Friday
(memq (% alternative-day 7) (list 0 3 5))
! ;; Then postpone it one (more) day and return
(1+ alternative-day)
! ;; Else return
alternative-day)))
(defun hebrew-calendar-days-in-year (year)
***************
*** 316,322 ****
(list (calendar-gregorian-from-absolute (+ abs-r-h 22))
"Simchat Torah")))
(optional
! (list
(list (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before 6 (- abs-r-h 4)))
"Selichot (night)")
--- 316,322 ----
(list (calendar-gregorian-from-absolute (+ abs-r-h 22))
"Simchat Torah")))
(optional
! (list
(list (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before 6 (- abs-r-h 4)))
"Selichot (night)")
***************
*** 350,356 ****
(filter-visible-calendar-holidays mandatory)))
(if all-hebrew-calendar-holidays
(setq output-list
! (append
(filter-visible-calendar-holidays optional)
output-list)))
output-list)))
--- 350,356 ----
(filter-visible-calendar-holidays mandatory)))
(if all-hebrew-calendar-holidays
(setq output-list
! (append
(filter-visible-calendar-holidays optional)
output-list)))
output-list)))
***************
*** 401,407 ****
(list (calendar-gregorian-from-absolute (+ abs-p 50))
"Shavuot")))
(optional
! (list
(list (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before 6 (- abs-p 43)))
"Shabbat Shekalim")
--- 401,407 ----
(list (calendar-gregorian-from-absolute (+ abs-p 50))
"Shavuot")))
(optional
! (list
(list (calendar-gregorian-from-absolute
(calendar-dayname-on-or-before 6 (- abs-p 43)))
"Shabbat Shekalim")
***************
*** 467,473 ****
(filter-visible-calendar-holidays mandatory)))
(if all-hebrew-calendar-holidays
(setq output-list
! (append
(filter-visible-calendar-holidays optional)
output-list)))
output-list)))
--- 467,473 ----
(filter-visible-calendar-holidays mandatory)))
(if all-hebrew-calendar-holidays
(setq output-list
! (append
(filter-visible-calendar-holidays optional)
output-list)))
output-list)))
***************
*** 481,487 ****
(list 5 9 (+ displayed-year 3760)))))
(filter-visible-calendar-holidays
! (list
(list (calendar-gregorian-from-absolute
(if (= (% abs-t-a 7) 6) (- abs-t-a 20) (- abs-t-a 21)))
"Tzom Tammuz")
--- 481,487 ----
(list 5 9 (+ displayed-year 3760)))))
(filter-visible-calendar-holidays
! (list
(list (calendar-gregorian-from-absolute
(if (= (% abs-t-a 7) 6) (- abs-t-a 20) (- abs-t-a 21)))
"Tzom Tammuz")
***************
*** 513,519 ****
(mark (regexp-quote diary-nonmarking-symbol)))
(calendar-for-loop i from 1 to number do
(let* ((d diary-date-forms)
! (hdate (calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian gdate)))
(month (extract-calendar-month hdate))
(day (extract-calendar-day hdate))
--- 513,519 ----
(mark (regexp-quote diary-nonmarking-symbol)))
(calendar-for-loop i from 1 to number do
(let* ((d diary-date-forms)
! (hdate (calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian gdate)))
(month (extract-calendar-month hdate))
(day (extract-calendar-day hdate))
***************
*** 683,689 ****
(setq mm 0)
(setq
mm
! (cdr
(assoc-ignore-case
mm-name
(calendar-make-alist
--- 683,689 ----
(setq mm 0)
(setq
mm
! (cdr
(assoc-ignore-case
mm-name
(calendar-make-alist
***************
*** 775,781 ****
(make-diary-entry
(concat
hebrew-diary-entry-symbol
! (calendar-date-string
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))
--- 775,781 ----
(make-diary-entry
(concat
hebrew-diary-entry-symbol
! (calendar-date-string
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))
***************
*** 794,800 ****
(make-diary-entry
(concat
hebrew-diary-entry-symbol
! (calendar-date-string
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
--- 794,800 ----
(make-diary-entry
(concat
hebrew-diary-entry-symbol
! (calendar-date-string
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
***************
*** 814,820 ****
(make-diary-entry
(concat
hebrew-diary-entry-symbol
! (calendar-date-string
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
--- 814,820 ----
(make-diary-entry
(concat
hebrew-diary-entry-symbol
! (calendar-date-string
(calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
(calendar-cursor-to-date t)))))
***************
*** 900,906 ****
"Omer count diary entry.
Entry applies if date is within 50 days after Passover.
! An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((passover
(calendar-absolute-from-hebrew
--- 900,906 ----
"Omer count diary entry.
Entry applies if date is within 50 days after Passover.
! An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((passover
(calendar-absolute-from-hebrew
***************
*** 909,915 ****
(week (/ omer 7))
(day (% omer 7)))
(if (and (> omer 0) (< omer 50))
! (cons mark
(format "Day %d%s of the omer (until sunset)"
omer
(if (zerop week)
--- 909,915 ----
(week (/ omer 7))
(day (% omer 7)))
(if (and (> omer 0) (< omer 50))
! (cons mark
(format "Day %d%s of the omer (until sunset)"
omer
(if (zerop week)
***************
*** 930,936 ****
Hebrew calendar yahrzeit is determined. If `european-calendar-style' is t,
the
order of the parameters is changed to DEATH-DAY, DEATH-MONTH, DEATH-YEAR.
! An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((h-date (calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
--- 930,936 ----
Hebrew calendar yahrzeit is determined. If `european-calendar-style' is t,
the
order of the parameters is changed to DEATH-DAY, DEATH-MONTH, DEATH-YEAR.
! An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((h-date (calendar-hebrew-from-absolute
(calendar-absolute-from-gregorian
***************
*** 959,965 ****
"Rosh Hodesh diary entry.
Entry applies if date is Rosh Hodesh, the day before, or the Saturday before.
! An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((d (calendar-absolute-from-gregorian date))
(h-date (calendar-hebrew-from-absolute d))
--- 959,965 ----
"Rosh Hodesh diary entry.
Entry applies if date is Rosh Hodesh, the day before, or the Saturday before.
! An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let* ((d (calendar-absolute-from-gregorian date))
(h-date (calendar-hebrew-from-absolute d))
***************
*** 976,982 ****
(h-yesterday (extract-calendar-day
(calendar-hebrew-from-absolute (1- d)))))
(if (or (= h-day 30) (and (= h-day 1) (/= h-month 7)))
! (cons mark
(format
"Rosh Hodesh %s"
(if (= h-day 30)
--- 976,982 ----
(h-yesterday (extract-calendar-day
(calendar-hebrew-from-absolute (1- d)))))
(if (or (= h-day 30) (and (= h-day 1) (/= h-month 7)))
! (cons mark
(format
"Rosh Hodesh %s"
(if (= h-day 30)
***************
*** 990,996 ****
(format "%s (second day)" this-month)
this-month))))
(if (= (% d 7) 6) ;; Saturday--check for Shabbat Mevarchim
! (cons mark
(cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
(format "Mevarchim Rosh Hodesh %s (%s)"
(aref h-month-names
--- 990,996 ----
(format "%s (second day)" this-month)
this-month))))
(if (= (% d 7) 6) ;; Saturday--check for Shabbat Mevarchim
! (cons mark
(cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
(format "Mevarchim Rosh Hodesh %s (%s)"
(aref h-month-names
***************
*** 1019,1025 ****
(defun diary-parasha (&optional mark)
"Parasha diary entry--entry applies if date is a Saturday.
! An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let ((d (calendar-absolute-from-gregorian date)))
(if (= (% d 7) 6) ;; Saturday
--- 1019,1025 ----
(defun diary-parasha (&optional mark)
"Parasha diary entry--entry applies if date is a Saturday.
! An optional parameter MARK specifies a face or single-character string to
use when highlighting the day in the calendar."
(let ((d (calendar-absolute-from-gregorian date)))
(if (= (% d 7) 6) ;; Saturday
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-hebrew.el,
Juanma Barranquero <=