diff options
| author | Glenn Morris | 2008-03-08 23:10:27 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-08 23:10:27 +0000 |
| commit | 6afe7cdd7dd83d793ccd2c537b1a05da923ccc7f (patch) | |
| tree | d70165ca11ba4723db8bd91e3d1a1a294bb2ca8c | |
| parent | a603b7dbaa2dbe6a751096b0f90b2666654b5eec (diff) | |
| download | emacs-6afe7cdd7dd83d793ccd2c537b1a05da923ccc7f.tar.gz emacs-6afe7cdd7dd83d793ccd2c537b1a05da923ccc7f.zip | |
(hebrew-calendar-leap-year-p)
(hebrew-calendar-elapsed-days, hebrew-calendar-long-heshvan-p)
(hebrew-calendar-short-kislev-p, mark-hebrew-diary-entries)
(insert-hebrew-diary-entry, insert-monthly-hebrew-diary-entry)
(insert-yearly-hebrew-diary-entry, diary-yahrzeit): Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calendar/cal-hebrew.el | 35 |
2 files changed, 22 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fb4272b02b8..25a2b7bc20c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -67,6 +67,11 @@ | |||
| 67 | (diary-bahai-insert-yearly-entry): | 67 | (diary-bahai-insert-yearly-entry): |
| 68 | * calendar/cal-dst.el (calendar-next-time-zone-transition) | 68 | * calendar/cal-dst.el (calendar-next-time-zone-transition) |
| 69 | (calendar-time-zone): | 69 | (calendar-time-zone): |
| 70 | * calendar/cal-hebrew.el (hebrew-calendar-leap-year-p) | ||
| 71 | (hebrew-calendar-elapsed-days, hebrew-calendar-long-heshvan-p) | ||
| 72 | (hebrew-calendar-short-kislev-p, mark-hebrew-diary-entries) | ||
| 73 | (insert-hebrew-diary-entry, insert-monthly-hebrew-diary-entry) | ||
| 74 | (insert-yearly-hebrew-diary-entry, diary-yahrzeit): Doc fixes. | ||
| 70 | * calendar/cal-islam.el (islamic-calendar-leap-year-p) | 75 | * calendar/cal-islam.el (islamic-calendar-leap-year-p) |
| 71 | (list-islamic-diary-entries, mark-islamic-diary-entries) | 76 | (list-islamic-diary-entries, mark-islamic-diary-entries) |
| 72 | (insert-islamic-diary-entry, insert-monthly-islamic-diary-entry) | 77 | (insert-islamic-diary-entry, insert-monthly-islamic-diary-entry) |
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el index 6463a9e2081..ecf0b9d3e77 100644 --- a/lisp/calendar/cal-hebrew.el +++ b/lisp/calendar/cal-hebrew.el | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | (require 'calendar) | 47 | (require 'calendar) |
| 48 | 48 | ||
| 49 | (defun hebrew-calendar-leap-year-p (year) | 49 | (defun hebrew-calendar-leap-year-p (year) |
| 50 | "t if YEAR is a Hebrew calendar leap year." | 50 | "Non-nil if YEAR is a Hebrew calendar leap year." |
| 51 | (< (% (1+ (* 7 year)) 19) 7)) | 51 | (< (% (1+ (* 7 year)) 19) 7)) |
| 52 | 52 | ||
| 53 | (defun hebrew-calendar-last-month-of-year (year) | 53 | (defun hebrew-calendar-last-month-of-year (year) |
| @@ -57,7 +57,7 @@ | |||
| 57 | 12)) | 57 | 12)) |
| 58 | 58 | ||
| 59 | (defun hebrew-calendar-elapsed-days (year) | 59 | (defun hebrew-calendar-elapsed-days (year) |
| 60 | "Days from Sun. prior to start of Hebrew calendar to mean conjunction of Tishri of Hebrew YEAR." | 60 | "Days from Sunday before start of Hebrew calendar to mean conjunction of Tishri of Hebrew YEAR." |
| 61 | (let* ((months-elapsed | 61 | (let* ((months-elapsed |
| 62 | (+ (* 235 (/ (1- year) 19)) ; months in complete cycles so far | 62 | (+ (* 235 (/ (1- year) 19)) ; months in complete cycles so far |
| 63 | (* 12 (% (1- year) 19)) ; regular months in this cycle | 63 | (* 12 (% (1- year) 19)) ; regular months in this cycle |
| @@ -98,11 +98,11 @@ | |||
| 98 | (hebrew-calendar-elapsed-days year))) | 98 | (hebrew-calendar-elapsed-days year))) |
| 99 | 99 | ||
| 100 | (defun hebrew-calendar-long-heshvan-p (year) | 100 | (defun hebrew-calendar-long-heshvan-p (year) |
| 101 | "t if Heshvan is long in Hebrew YEAR." | 101 | "Non-nil if Heshvan is long in Hebrew YEAR." |
| 102 | (= (% (hebrew-calendar-days-in-year year) 10) 5)) | 102 | (= (% (hebrew-calendar-days-in-year year) 10) 5)) |
| 103 | 103 | ||
| 104 | (defun hebrew-calendar-short-kislev-p (year) | 104 | (defun hebrew-calendar-short-kislev-p (year) |
| 105 | "t if Kislev is short in Hebrew YEAR." | 105 | "Non-nil if Kislev is short in Hebrew YEAR." |
| 106 | (= (% (hebrew-calendar-days-in-year year) 10) 3)) | 106 | (= (% (hebrew-calendar-days-in-year year) 10) 3)) |
| 107 | 107 | ||
| 108 | (defun hebrew-calendar-last-day-of-month (month year) | 108 | (defun hebrew-calendar-last-day-of-month (month year) |
| @@ -680,15 +680,15 @@ A value of 0 in any position is a wildcard." | |||
| 680 | 680 | ||
| 681 | (defun mark-hebrew-diary-entries () | 681 | (defun mark-hebrew-diary-entries () |
| 682 | "Mark days in the calendar window that have Hebrew date diary entries. | 682 | "Mark days in the calendar window that have Hebrew date diary entries. |
| 683 | Each entry in diary-file (or included files) visible in the calendar window | 683 | Each entry in `diary-file' (or included files) visible in the calendar window |
| 684 | is marked. Hebrew date entries are prefaced by a hebrew-diary-entry-symbol | 684 | is marked. Hebrew date entries are prefaced by `hebrew-diary-entry-symbol' |
| 685 | \(normally an `H'). The same diary-date-forms govern the style of the Hebrew | 685 | \(normally an `H'). The same `diary-date-forms' govern the style of the Hebrew |
| 686 | calendar entries, except that the Hebrew month names must be spelled in full. | 686 | calendar entries, except that the Hebrew month names must be spelled in full. |
| 687 | The Hebrew months are numbered from 1 to 13 with Nisan being 1, 12 being | 687 | The Hebrew months are numbered from 1 to 13 with Nisan being 1, 12 being |
| 688 | Adar I and 13 being Adar II; you must use `Adar I' if you want Adar of a | 688 | Adar I and 13 being Adar II; you must use `Adar I' if you want Adar of a |
| 689 | common Hebrew year. Hebrew date diary entries that begin with a | 689 | common Hebrew year. Hebrew date diary entries that begin with |
| 690 | diary-nonmarking symbol will not be marked in the calendar. This function | 690 | `diary-nonmarking-symbol' will not be marked in the calendar. This function |
| 691 | is provided for use as part of the nongregorian-diary-marking-hook." | 691 | is provided for use as part of `nongregorian-diary-marking-hook'." |
| 692 | (let ((d diary-date-forms)) | 692 | (let ((d diary-date-forms)) |
| 693 | (while d | 693 | (while d |
| 694 | (let* | 694 | (let* |
| @@ -788,7 +788,7 @@ is provided for use as part of the nongregorian-diary-marking-hook." | |||
| 788 | (defun insert-hebrew-diary-entry (arg) | 788 | (defun insert-hebrew-diary-entry (arg) |
| 789 | "Insert a diary entry. | 789 | "Insert a diary entry. |
| 790 | For the Hebrew date corresponding to the date indicated by point. | 790 | For the Hebrew date corresponding to the date indicated by point. |
| 791 | Prefix arg will make the entry nonmarking." | 791 | Prefix argument ARG makes the entry nonmarking." |
| 792 | (interactive "P") | 792 | (interactive "P") |
| 793 | (let* ((calendar-month-name-array | 793 | (let* ((calendar-month-name-array |
| 794 | calendar-hebrew-month-name-array-leap-year)) | 794 | calendar-hebrew-month-name-array-leap-year)) |
| @@ -805,7 +805,7 @@ Prefix arg will make the entry nonmarking." | |||
| 805 | (defun insert-monthly-hebrew-diary-entry (arg) | 805 | (defun insert-monthly-hebrew-diary-entry (arg) |
| 806 | "Insert a monthly diary entry. | 806 | "Insert a monthly diary entry. |
| 807 | For the day of the Hebrew month corresponding to the date indicated by point. | 807 | For the day of the Hebrew month corresponding to the date indicated by point. |
| 808 | Prefix arg will make the entry nonmarking." | 808 | Prefix argument ARG makes the entry nonmarking." |
| 809 | (interactive "P") | 809 | (interactive "P") |
| 810 | (let* ((calendar-date-display-form | 810 | (let* ((calendar-date-display-form |
| 811 | (if european-calendar-style '(day " * ") '("* " day ))) | 811 | (if european-calendar-style '(day " * ") '("* " day ))) |
| @@ -823,7 +823,7 @@ Prefix arg will make the entry nonmarking." | |||
| 823 | (defun insert-yearly-hebrew-diary-entry (arg) | 823 | (defun insert-yearly-hebrew-diary-entry (arg) |
| 824 | "Insert an annual diary entry. | 824 | "Insert an annual diary entry. |
| 825 | For the day of the Hebrew year corresponding to the date indicated by point. | 825 | For the day of the Hebrew year corresponding to the date indicated by point. |
| 826 | Prefix arg will make the entry nonmarking." | 826 | Prefix argument ARG makes the entry nonmarking." |
| 827 | (interactive "P") | 827 | (interactive "P") |
| 828 | (let* ((calendar-date-display-form | 828 | (let* ((calendar-date-display-form |
| 829 | (if european-calendar-style | 829 | (if european-calendar-style |
| @@ -878,7 +878,7 @@ from the cursor position." | |||
| 878 | start-year) | 878 | start-year) |
| 879 | (lambda (x) (>= x start-year))))) | 879 | (lambda (x) (>= x start-year))))) |
| 880 | (list death-date start-year end-year))) | 880 | (list death-date start-year end-year))) |
| 881 | (message "Computing yahrzeits...") | 881 | (message "Computing Yahrzeits...") |
| 882 | (let* ((yahrzeit-buffer "*Yahrzeits*") | 882 | (let* ((yahrzeit-buffer "*Yahrzeits*") |
| 883 | (h-date (calendar-hebrew-from-absolute | 883 | (h-date (calendar-hebrew-from-absolute |
| 884 | (calendar-absolute-from-gregorian death-date))) | 884 | (calendar-absolute-from-gregorian death-date))) |
| @@ -910,7 +910,7 @@ from the cursor position." | |||
| 910 | (set-buffer-modified-p nil) | 910 | (set-buffer-modified-p nil) |
| 911 | (setq buffer-read-only t) | 911 | (setq buffer-read-only t) |
| 912 | (display-buffer yahrzeit-buffer) | 912 | (display-buffer yahrzeit-buffer) |
| 913 | (message "Computing yahrzeits...done"))) | 913 | (message "Computing Yahrzeits...done"))) |
| 914 | 914 | ||
| 915 | (defun diary-hebrew-date () | 915 | (defun diary-hebrew-date () |
| 916 | "Hebrew calendar equivalent of date diary entry." | 916 | "Hebrew calendar equivalent of date diary entry." |
| @@ -943,11 +943,11 @@ use when highlighting the day in the calendar." | |||
| 943 | day (if (= day 1) "" "s")))))))))) | 943 | day (if (= day 1) "" "s")))))))))) |
| 944 | 944 | ||
| 945 | (defun diary-yahrzeit (death-month death-day death-year &optional mark) | 945 | (defun diary-yahrzeit (death-month death-day death-year &optional mark) |
| 946 | "Yahrzeit diary entry--entry applies if date is yahrzeit or the day before. | 946 | "Yahrzeit diary entry--entry applies if date is Yahrzeit or the day before. |
| 947 | Parameters are DEATH-MONTH, DEATH-DAY, DEATH-YEAR; the diary entry is assumed | 947 | Parameters are DEATH-MONTH, DEATH-DAY, DEATH-YEAR; the diary entry is assumed |
| 948 | to be the name of the person. Date of death is on the *civil* calendar; | 948 | to be the name of the person. Date of death is on the *civil* calendar; |
| 949 | although the date of death is specified by the civil calendar, the proper | 949 | although the date of death is specified by the civil calendar, the proper |
| 950 | Hebrew calendar yahrzeit is determined. If `european-calendar-style' is t, the | 950 | Hebrew calendar Yahrzeit is determined. If `european-calendar-style' is t, the |
| 951 | order of the parameters is changed to DEATH-DAY, DEATH-MONTH, DEATH-YEAR. | 951 | order of the parameters is changed to DEATH-DAY, DEATH-MONTH, DEATH-YEAR. |
| 952 | 952 | ||
| 953 | An optional parameter MARK specifies a face or single-character string to | 953 | An optional parameter MARK specifies a face or single-character string to |
| @@ -1058,7 +1058,6 @@ use when highlighting the day in the calendar." | |||
| 1058 | 1058 | ||
| 1059 | (defun diary-parasha (&optional mark) | 1059 | (defun diary-parasha (&optional mark) |
| 1060 | "Parasha diary entry--entry applies if date is a Saturday. | 1060 | "Parasha diary entry--entry applies if date is a Saturday. |
| 1061 | |||
| 1062 | An optional parameter MARK specifies a face or single-character string to | 1061 | An optional parameter MARK specifies a face or single-character string to |
| 1063 | use when highlighting the day in the calendar." | 1062 | use when highlighting the day in the calendar." |
| 1064 | (let ((d (calendar-absolute-from-gregorian date))) | 1063 | (let ((d (calendar-absolute-from-gregorian date))) |