diff options
| author | Glenn Morris | 2008-03-08 20:55:46 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-08 20:55:46 +0000 |
| commit | c723ec5e264129910c0fcaca9c7f94499aaa69d2 (patch) | |
| tree | 6fad221bae7afd26e3b24e9d6135d6af9158b21c | |
| parent | c9f8e6289cb31ec5ab64f373dbabfae5820c6720 (diff) | |
| download | emacs-c723ec5e264129910c0fcaca9c7f94499aaa69d2.tar.gz emacs-c723ec5e264129910c0fcaca9c7f94499aaa69d2.zip | |
(islamic-calendar-leap-year-p)
(list-islamic-diary-entries, mark-islamic-diary-entries)
(insert-islamic-diary-entry, insert-monthly-islamic-diary-entry)
(insert-yearly-islamic-diary-entry): Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/calendar/cal-islam.el | 33 |
2 files changed, 21 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 25a81dd4b4e..fd96e1ae578 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -40,6 +40,10 @@ | |||
| 40 | 40 | ||
| 41 | * calendar/cal-dst.el (calendar-next-time-zone-transition) | 41 | * calendar/cal-dst.el (calendar-next-time-zone-transition) |
| 42 | (calendar-time-zone): | 42 | (calendar-time-zone): |
| 43 | * calendar/cal-islam.el (islamic-calendar-leap-year-p) | ||
| 44 | (list-islamic-diary-entries, mark-islamic-diary-entries) | ||
| 45 | (insert-islamic-diary-entry, insert-monthly-islamic-diary-entry) | ||
| 46 | (insert-yearly-islamic-diary-entry): | ||
| 43 | * calendar/cal-iso.el (calendar-iso-read-args): | 47 | * calendar/cal-iso.el (calendar-iso-read-args): |
| 44 | * calendar/cal-mayan.el (calendar-string-to-mayan-long-count) | 48 | * calendar/cal-mayan.el (calendar-string-to-mayan-long-count) |
| 45 | (calendar-mayan-haab-to-string, calendar-mayan-tzolkin-to-string) | 49 | (calendar-mayan-haab-to-string, calendar-mayan-tzolkin-to-string) |
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el index 2f590cd2f0e..c151cbb9d17 100644 --- a/lisp/calendar/cal-islam.el +++ b/lisp/calendar/cal-islam.el | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | "Absolute date of start of Islamic calendar = August 29, 284 A.D. (Julian).") | 53 | "Absolute date of start of Islamic calendar = August 29, 284 A.D. (Julian).") |
| 54 | 54 | ||
| 55 | (defun islamic-calendar-leap-year-p (year) | 55 | (defun islamic-calendar-leap-year-p (year) |
| 56 | "Returns t if YEAR is a leap year on the Islamic calendar." | 56 | "Return t if YEAR is a leap year on the Islamic calendar." |
| 57 | (memq (% year 30) | 57 | (memq (% year 30) |
| 58 | (list 2 5 7 10 13 16 18 21 24 26 29))) | 58 | (list 2 5 7 10 13 16 18 21 24 26 29))) |
| 59 | 59 | ||
| @@ -204,13 +204,14 @@ nil if it is not visible in the current calendar window." | |||
| 204 | 204 | ||
| 205 | (defun list-islamic-diary-entries () | 205 | (defun list-islamic-diary-entries () |
| 206 | "Add any Islamic date entries from the diary file to `diary-entries-list'. | 206 | "Add any Islamic date entries from the diary file to `diary-entries-list'. |
| 207 | Islamic date diary entries must be prefaced by an `islamic-diary-entry-symbol' | 207 | Islamic date diary entries must be prefaced by `islamic-diary-entry-symbol' |
| 208 | \(normally an `I'). The same diary date forms govern the style of the Islamic | 208 | \(normally an `I'). The same diary date forms govern the style |
| 209 | calendar entries, except that the Islamic month names must be spelled in full. | 209 | of the Islamic calendar entries, except that the Islamic month |
| 210 | The Islamic months are numbered from 1 to 12 with Muharram being 1 and 12 being | 210 | names must be spelled in full. The Islamic months are numbered |
| 211 | Dhu al-Hijjah. If an Islamic date diary entry begins with a | 211 | from 1 to 12 with Muharram being 1 and 12 being Dhu al-Hijjah. |
| 212 | `diary-nonmarking-symbol', the entry will appear in the diary listing, but will | 212 | If an Islamic date diary entry begins with `diary-nonmarking-symbol', |
| 213 | not be marked in the calendar. This function is provided for use with the | 213 | the entry will appear in the diary listing, but will not be |
| 214 | marked in the calendar. This function is provided for use with | ||
| 214 | `nongregorian-diary-listing-hook'." | 215 | `nongregorian-diary-listing-hook'." |
| 215 | (if (< 0 number) | 216 | (if (< 0 number) |
| 216 | (let ((buffer-read-only nil) | 217 | (let ((buffer-read-only nil) |
| @@ -296,14 +297,14 @@ not be marked in the calendar. This function is provided for use with the | |||
| 296 | 297 | ||
| 297 | (defun mark-islamic-diary-entries () | 298 | (defun mark-islamic-diary-entries () |
| 298 | "Mark days in the calendar window that have Islamic date diary entries. | 299 | "Mark days in the calendar window that have Islamic date diary entries. |
| 299 | Each entry in diary-file (or included files) visible in the calendar window | 300 | Each entry in `diary-file' (or included files) visible in the calendar window |
| 300 | is marked. Islamic date entries are prefaced by a islamic-diary-entry-symbol | 301 | is marked. Islamic date entries are prefaced by `islamic-diary-entry-symbol' |
| 301 | \(normally an `I'). The same diary-date-forms govern the style of the Islamic | 302 | \(normally an `I'). The same `diary-date-forms' govern the style of the Islamic |
| 302 | calendar entries, except that the Islamic month names must be spelled in full. | 303 | calendar entries, except that the Islamic month names must be spelled in full. |
| 303 | The Islamic months are numbered from 1 to 12 with Muharram being 1 and 12 being | 304 | The Islamic months are numbered from 1 to 12 with Muharram being 1 and 12 being |
| 304 | Dhu al-Hijjah. Islamic date diary entries that begin with a | 305 | Dhu al-Hijjah. Islamic date diary entries that begin with a |
| 305 | diary-nonmarking-symbol will not be marked in the calendar. This function is | 306 | `diary-nonmarking-symbol' will not be marked in the calendar. This function is |
| 306 | provided for use as part of the nongregorian-diary-marking-hook." | 307 | provided for use as part of the `nongregorian-diary-marking-hook'." |
| 307 | (let ((d diary-date-forms)) | 308 | (let ((d diary-date-forms)) |
| 308 | (while d | 309 | (while d |
| 309 | (let* | 310 | (let* |
| @@ -459,7 +460,7 @@ A value of 0 in any position is a wildcard." | |||
| 459 | (defun insert-islamic-diary-entry (arg) | 460 | (defun insert-islamic-diary-entry (arg) |
| 460 | "Insert a diary entry. | 461 | "Insert a diary entry. |
| 461 | For the Islamic date corresponding to the date indicated by point. | 462 | For the Islamic date corresponding to the date indicated by point. |
| 462 | Prefix arg will make the entry nonmarking." | 463 | Prefix argument ARG makes the entry nonmarking." |
| 463 | (interactive "P") | 464 | (interactive "P") |
| 464 | (let* ((calendar-month-name-array calendar-islamic-month-name-array)) | 465 | (let* ((calendar-month-name-array calendar-islamic-month-name-array)) |
| 465 | (make-diary-entry | 466 | (make-diary-entry |
| @@ -476,7 +477,7 @@ Prefix arg will make the entry nonmarking." | |||
| 476 | (defun insert-monthly-islamic-diary-entry (arg) | 477 | (defun insert-monthly-islamic-diary-entry (arg) |
| 477 | "Insert a monthly diary entry. | 478 | "Insert a monthly diary entry. |
| 478 | For the day of the Islamic month corresponding to the date indicated by point. | 479 | For the day of the Islamic month corresponding to the date indicated by point. |
| 479 | Prefix arg will make the entry nonmarking." | 480 | Prefix argument ARG makes the entry nonmarking." |
| 480 | (interactive "P") | 481 | (interactive "P") |
| 481 | (let* ((calendar-date-display-form | 482 | (let* ((calendar-date-display-form |
| 482 | (if european-calendar-style '(day " * ") '("* " day ))) | 483 | (if european-calendar-style '(day " * ") '("* " day ))) |
| @@ -494,7 +495,7 @@ Prefix arg will make the entry nonmarking." | |||
| 494 | (defun insert-yearly-islamic-diary-entry (arg) | 495 | (defun insert-yearly-islamic-diary-entry (arg) |
| 495 | "Insert an annual diary entry. | 496 | "Insert an annual diary entry. |
| 496 | For the day of the Islamic year corresponding to the date indicated by point. | 497 | For the day of the Islamic year corresponding to the date indicated by point. |
| 497 | Prefix arg will make the entry nonmarking." | 498 | Prefix argument ARG makes the entry nonmarking." |
| 498 | (interactive "P") | 499 | (interactive "P") |
| 499 | (let* ((calendar-date-display-form | 500 | (let* ((calendar-date-display-form |
| 500 | (if european-calendar-style | 501 | (if european-calendar-style |