Mercurial > emacs
annotate lisp/calendar/cal-islam.el @ 97151:db1329fe6a49
(read-char-by-name): Accept hash notation. Doc fix.
(ucs-insert): Doc fix. Convert to number only when `arg' is
a string. Use separate error message when `arg' is not an integer.
Bind `ucs-insert' to `C-x 8 RET'.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Thu, 31 Jul 2008 16:51:45 +0000 |
parents | e49abd957e81 |
children | a9dc0e7c3f2b |
rev | line source |
---|---|
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38402
diff
changeset
|
1 ;;; cal-islam.el --- calendar functions for the Islamic calendar |
13053 | 2 |
92610
6f4bd17c2adc
(mark-islamic-calendar-date-pattern): Use zerop.
Glenn Morris <rgm@gnu.org>
parents:
92585
diff
changeset
|
3 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
6f4bd17c2adc
(mark-islamic-calendar-date-pattern): Use zerop.
Glenn Morris <rgm@gnu.org>
parents:
92585
diff
changeset
|
4 ;; 2008 Free Software Foundation, Inc. |
13053 | 5 |
6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> | |
67465
a55ee709ec8d
Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents:
65144
diff
changeset
|
7 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
13053 | 8 ;; Keywords: calendar |
9 ;; Human-Keywords: Islamic calendar, calendar, diary | |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94279
diff
changeset
|
13 ;; GNU Emacs is free software: you can redistribute it and/or modify |
13053 | 14 ;; it under the terms of the GNU General Public License as published by |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94279
diff
changeset
|
15 ;; the Free Software Foundation, either version 3 of the License, or |
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94279
diff
changeset
|
16 ;; (at your option) any later version. |
13053 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94279
diff
changeset
|
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
13053 | 25 |
26 ;;; Commentary: | |
27 | |
93462
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
28 ;; See calendar.el. |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
20268
diff
changeset
|
29 |
13053 | 30 ;;; Code: |
31 | |
93223
9aca848375df
Require calendar rather than cal-julian.
Glenn Morris <rgm@gnu.org>
parents:
93184
diff
changeset
|
32 (require 'calendar) |
13053 | 33 |
92971
56c7e60586c9
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92926
diff
changeset
|
34 (defconst calendar-islamic-month-name-array |
13053 | 35 ["Muharram" "Safar" "Rabi I" "Rabi II" "Jumada I" "Jumada II" |
52119
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
36 "Rajab" "Sha'ban" "Ramadan" "Shawwal" "Dhu al-Qada" "Dhu al-Hijjah"] |
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
37 "Array of strings giving the names of the Islamic months.") |
13053 | 38 |
93223
9aca848375df
Require calendar rather than cal-julian.
Glenn Morris <rgm@gnu.org>
parents:
93184
diff
changeset
|
39 (eval-and-compile |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
40 (autoload 'calendar-julian-to-absolute "cal-julian")) |
93223
9aca848375df
Require calendar rather than cal-julian.
Glenn Morris <rgm@gnu.org>
parents:
93184
diff
changeset
|
41 |
9aca848375df
Require calendar rather than cal-julian.
Glenn Morris <rgm@gnu.org>
parents:
93184
diff
changeset
|
42 (defconst calendar-islamic-epoch |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
43 (eval-when-compile (calendar-julian-to-absolute '(7 16 622))) |
93223
9aca848375df
Require calendar rather than cal-julian.
Glenn Morris <rgm@gnu.org>
parents:
93184
diff
changeset
|
44 "Absolute date of start of Islamic calendar = July 16, 622 AD (Julian).") |
13053 | 45 |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
46 (defun calendar-islamic-leap-year-p (year) |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
47 "Return t if YEAR is a leap year on the Islamic calendar." |
13053 | 48 (memq (% year 30) |
49 (list 2 5 7 10 13 16 18 21 24 26 29))) | |
50 | |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
51 (defun calendar-islamic-last-day-of-month (month year) |
13053 | 52 "The last day in MONTH during YEAR on the Islamic calendar." |
53 (cond | |
54 ((memq month (list 1 3 5 7 9 11)) 30) | |
55 ((memq month (list 2 4 6 8 10)) 29) | |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
56 (t (if (calendar-islamic-leap-year-p year) 30 29)))) |
13053 | 57 |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
58 (defun calendar-islamic-day-number (date) |
13053 | 59 "Return the day number within the year of the Islamic date DATE." |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
60 (let ((month (calendar-extract-month date))) |
92926
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
61 (+ (* 30 (/ month 2)) |
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
62 (* 29 (/ (1- month) 2)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
63 (calendar-extract-day date)))) |
13053 | 64 |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
65 (defun calendar-islamic-to-absolute (date) |
13053 | 66 "Absolute date of Islamic DATE. |
67 The absolute date is the number of days elapsed since the (imaginary) | |
68 Gregorian date Sunday, December 31, 1 BC." | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
69 (let* ((month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
70 (day (calendar-extract-day date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
71 (year (calendar-extract-year date)) |
13053 | 72 (y (% year 30)) |
92991
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
73 (leap-years-in-cycle (cond ((< y 3) 0) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
74 ((< y 6) 1) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
75 ((< y 8) 2) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
76 ((< y 11) 3) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
77 ((< y 14) 4) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
78 ((< y 17) 5) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
79 ((< y 19) 6) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
80 ((< y 22) 7) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
81 ((< y 25) 8) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
82 ((< y 27) 9) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
83 (t 10)))) |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
84 (+ (calendar-islamic-day-number date) ; days so far this year |
92644 | 85 (* (1- year) 354) ; days in all non-leap years |
86 (* 11 (/ year 30)) ; leap days in complete cycles | |
87 leap-years-in-cycle ; leap days this cycle | |
88 (1- calendar-islamic-epoch)))) ; days before start of calendar | |
13053 | 89 |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
90 (define-obsolete-function-alias 'calendar-absolute-from-islamic |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
91 'calendar-islamic-to-absolute "23.1") |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
92 |
13053 | 93 (defun calendar-islamic-from-absolute (date) |
94 "Compute the Islamic date (month day year) corresponding to absolute DATE. | |
95 The absolute date is the number of days elapsed since the (imaginary) | |
96 Gregorian date Sunday, December 31, 1 BC." | |
97 (if (< date calendar-islamic-epoch) | |
92644 | 98 (list 0 0 0) ; pre-Islamic date |
13053 | 99 (let* ((approx (/ (- date calendar-islamic-epoch) |
92644 | 100 355)) ; approximation from below |
101 (year ; search forward from the approximation | |
13053 | 102 (+ approx |
103 (calendar-sum y approx | |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
104 (>= date (calendar-islamic-to-absolute |
13053 | 105 (list 1 1 (1+ y)))) |
106 1))) | |
92644 | 107 (month ; search forward from Muharram |
13053 | 108 (1+ (calendar-sum m 1 |
109 (> date | |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
110 (calendar-islamic-to-absolute |
13053 | 111 (list m |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
112 (calendar-islamic-last-day-of-month |
13053 | 113 m year) |
114 year))) | |
115 1))) | |
92644 | 116 (day ; calculate the day by subtraction |
13053 | 117 (- date |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
118 (1- (calendar-islamic-to-absolute (list month 1 year)))))) |
13053 | 119 (list month day year)))) |
120 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
121 ;;;###cal-autoload |
13053 | 122 (defun calendar-islamic-date-string (&optional date) |
123 "String of Islamic date before sunset of Gregorian DATE. | |
124 Returns the empty string if DATE is pre-Islamic. | |
125 Defaults to today's date if DATE is not given. | |
126 Driven by the variable `calendar-date-display-form'." | |
127 (let ((calendar-month-name-array calendar-islamic-month-name-array) | |
128 (islamic-date (calendar-islamic-from-absolute | |
129 (calendar-absolute-from-gregorian | |
130 (or date (calendar-current-date)))))) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
131 (if (< (calendar-extract-year islamic-date) 1) |
13053 | 132 "" |
133 (calendar-date-string islamic-date nil t)))) | |
134 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
135 ;;;###cal-autoload |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
136 (defun calendar-islamic-print-date () |
13053 | 137 "Show the Islamic calendar equivalent of the date under the cursor." |
138 (interactive) | |
139 (let ((i (calendar-islamic-date-string (calendar-cursor-to-date t)))) | |
140 (if (string-equal i "") | |
141 (message "Date is pre-Islamic") | |
142 (message "Islamic date (until sunset): %s" i)))) | |
143 | |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
144 (define-obsolete-function-alias 'calendar-print-islamic-date |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
145 'calendar-islamic-print-date "23.1") |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
146 |
93184
63a7509590a7
(calendar-islamic-read-date): New name for
Glenn Morris <rgm@gnu.org>
parents:
92991
diff
changeset
|
147 (defun calendar-islamic-read-date () |
63a7509590a7
(calendar-islamic-read-date): New name for
Glenn Morris <rgm@gnu.org>
parents:
92991
diff
changeset
|
148 "Interactively read the arguments for an Islamic date command. |
63a7509590a7
(calendar-islamic-read-date): New name for
Glenn Morris <rgm@gnu.org>
parents:
92991
diff
changeset
|
149 Reads a year, month, and day." |
92991
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
150 (let* ((today (calendar-current-date)) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
151 (year (calendar-read |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
152 "Islamic calendar year (>0): " |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
153 (lambda (x) (> x 0)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
154 (number-to-string |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
155 (calendar-extract-year |
92991
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
156 (calendar-islamic-from-absolute |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
157 (calendar-absolute-from-gregorian today)))))) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
158 (month-array calendar-islamic-month-name-array) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
159 (completion-ignore-case t) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
160 (month (cdr (assoc-string |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
161 (completing-read |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
162 "Islamic calendar month name: " |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
163 (mapcar 'list (append month-array nil)) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
164 nil t) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
165 (calendar-make-alist month-array 1) t))) |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
166 (last (calendar-islamic-last-day-of-month month year)) |
92991
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
167 (day (calendar-read |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
168 (format "Islamic calendar day (1-%d): " last) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
169 (lambda (x) (and (< 0 x) (<= x last)))))) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
170 (list (list month day year)))) |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
171 |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
172 ;;;###cal-autoload |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
173 (defun calendar-islamic-goto-date (date &optional noecho) |
92926
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
174 "Move cursor to Islamic DATE; echo Islamic date unless NOECHO is non-nil." |
93184
63a7509590a7
(calendar-islamic-read-date): New name for
Glenn Morris <rgm@gnu.org>
parents:
92991
diff
changeset
|
175 (interactive (calendar-islamic-read-date)) |
13053 | 176 (calendar-goto-date (calendar-gregorian-from-absolute |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
177 (calendar-islamic-to-absolute date))) |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
178 (or noecho (calendar-islamic-print-date))) |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
179 |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
180 (define-obsolete-function-alias 'calendar-goto-islamic-date |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
181 'calendar-islamic-goto-date "23.1") |
13053 | 182 |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
183 (defvar displayed-month) ; from calendar-generate |
92926
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
184 (defvar displayed-year) |
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
185 |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
186 ;;;###holiday-autoload |
13053 | 187 (defun holiday-islamic (month day string) |
188 "Holiday on MONTH, DAY (Islamic) called STRING. | |
94279 | 189 If MONTH, DAY (Islamic) is visible, returns the corresponding |
190 Gregorian date as the list (((month day year) STRING)). | |
191 Returns nil if it is not visible in the current calendar window." | |
93462
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
192 ;; Islamic date corresponding to the center of the calendar window. |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
193 ;; Since the calendar displays 3 months at a time, there are approx |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
194 ;; 45 visible days either side of this date. Given the length of |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
195 ;; the Islamic months, this means up to two different months are |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
196 ;; visible either side of the central date. |
13053 | 197 (let* ((islamic-date (calendar-islamic-from-absolute |
198 (calendar-absolute-from-gregorian | |
199 (list displayed-month 15 displayed-year)))) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
200 (m (calendar-extract-month islamic-date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
201 (y (calendar-extract-year islamic-date)) |
93373
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
202 date) |
92926
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
203 (unless (< m 1) ; Islamic calendar doesn't apply |
93462
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
204 ;; Since converting to absolute dates can be a complex |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
205 ;; operation, we try to speed things up by excluding those date |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
206 ;; ranges that can't possibly be visible. |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
207 ;; We can view the situation (see above) as if we had a calendar |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
208 ;; window displaying 5 months at a time. When month m is |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
209 ;; central, months m-2:m+2 (modulo 12) might be visible. |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
210 ;; Recall from holiday-fixed that with a 3 month calendar |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
211 ;; window, November is special, because we can do a one-sided |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
212 ;; inclusion test. When November is central is when the end of |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
213 ;; year first appears on the calendar. Similarly, with a 5 |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
214 ;; month window, October is special. When October is central is |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
215 ;; when the end of year first appears, and when January is |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
216 ;; central, October is no longer visible. October is visible |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
217 ;; when the central month is >= 8. |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
218 ;; Hence to test if any given month might be visible, we can |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
219 ;; shift things and ask about October. |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
220 ;; At the same time, we work out the appropriate year y to use. |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
221 (calendar-increment-month m y (- 10 month)) |
93462
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
222 (and (> m 7) ; Islamic date might be visible |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
223 (calendar-date-is-visible-p |
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
224 (setq date (calendar-gregorian-from-absolute |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
225 (calendar-islamic-to-absolute (list month day y))))) |
93462
263786b8fe73
(Commentary): Replace with reference to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93373
diff
changeset
|
226 (list (list date string)))))) |
13053 | 227 |
93577
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
228 ;;;###holiday-autoload |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
229 (defun holiday-islamic-new-year () |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
230 "Holiday entry for the Islamic New Year, if visible in the calendar window." |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
231 (let ((date (caar (holiday-islamic 1 1 ""))) |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
232 (m displayed-month) |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
233 (y displayed-year)) |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
234 (and date |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
235 (list (list date |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
236 (format "Islamic New Year %d" |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
237 (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
238 (calendar-increment-month m y 1) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
239 (calendar-extract-year |
93577
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
240 (calendar-islamic-from-absolute |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
241 (calendar-absolute-from-gregorian |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
242 (list m (calendar-last-day-of-month m y) y) |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
243 )))))))))) |
bac2b63b476f
(holiday-islamic-new-year): New function.
Glenn Morris <rgm@gnu.org>
parents:
93471
diff
changeset
|
244 |
92971
56c7e60586c9
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92926
diff
changeset
|
245 (autoload 'diary-list-entries-1 "diary-lib") |
92677
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
246 |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
247 ;;;###diary-autoload |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
248 (defun diary-islamic-list-entries () |
13053 | 249 "Add any Islamic date entries from the diary file to `diary-entries-list'. |
93733
e1a9003feedf
Update for rename islamic-diary-entry-symbol to diary-islamic-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93642
diff
changeset
|
250 Islamic date diary entries must be prefaced by `diary-islamic-entry-symbol' |
92971
56c7e60586c9
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92926
diff
changeset
|
251 \(normally an `I'). The same `diary-date-forms' govern the style |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
252 of the Islamic calendar entries, except that the Islamic month |
93268
691804e8889b
(list-islamic-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93223
diff
changeset
|
253 names cannot be abbreviated. The Islamic months are numbered |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
254 from 1 to 12 with Muharram being 1 and 12 being Dhu al-Hijjah. |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
255 If an Islamic date diary entry begins with `diary-nonmarking-symbol', |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
256 the entry will appear in the diary listing, but will not be |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
257 marked in the calendar. This function is provided for use with |
93794
509de9778a6d
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93733
diff
changeset
|
258 `diary-nongregorian-listing-hook'." |
92971
56c7e60586c9
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92926
diff
changeset
|
259 (diary-list-entries-1 calendar-islamic-month-name-array |
93733
e1a9003feedf
Update for rename islamic-diary-entry-symbol to diary-islamic-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93642
diff
changeset
|
260 diary-islamic-entry-symbol |
92971
56c7e60586c9
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92926
diff
changeset
|
261 'calendar-islamic-from-absolute)) |
13053 | 262 |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
263 (define-obsolete-function-alias 'list-islamic-diary-entries |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
264 'diary-islamic-list-entries "23.1") |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
265 |
92991
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
266 (autoload 'calendar-mark-1 "diary-lib") |
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
267 |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
268 ;;;###diary-autoload |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
269 (defun calendar-islamic-mark-date-pattern (month day year &optional color) |
13053 | 270 "Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR. |
92991
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
271 A value of 0 in any position is a wildcard. Optional argument COLOR is |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93794
diff
changeset
|
272 passed to `calendar-mark-visible-date' as MARK." |
92991
24a6717aed7f
(calendar-mark-1): Autoload it.
Glenn Morris <rgm@gnu.org>
parents:
92971
diff
changeset
|
273 (calendar-mark-1 month day year 'calendar-islamic-from-absolute |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
274 'calendar-islamic-to-absolute color)) |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
275 |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
276 (define-obsolete-function-alias 'mark-islamic-calendar-date-pattern |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
277 'calendar-islamic-mark-date-pattern "23.1") |
13053 | 278 |
92971
56c7e60586c9
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92926
diff
changeset
|
279 (autoload 'diary-mark-entries-1 "diary-lib") |
92926
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
280 |
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
281 ;;;###diary-autoload |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
282 (defun diary-islamic-mark-entries () |
92926
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
283 "Mark days in the calendar window that have Islamic date diary entries. |
92971
56c7e60586c9
(number, original-date, add-to-diary-list)
Glenn Morris <rgm@gnu.org>
parents:
92926
diff
changeset
|
284 Marks each entry in `diary-file' (or included files) visible in the calendar |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
285 window. See `diary-islamic-list-entries' for more information." |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
286 (diary-mark-entries-1 'calendar-islamic-mark-date-pattern |
93471
31158dd82f24
(mark-islamic-diary-entries): Fix argument order in call to
Glenn Morris <rgm@gnu.org>
parents:
93462
diff
changeset
|
287 calendar-islamic-month-name-array |
93733
e1a9003feedf
Update for rename islamic-diary-entry-symbol to diary-islamic-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93642
diff
changeset
|
288 diary-islamic-entry-symbol |
93471
31158dd82f24
(mark-islamic-diary-entries): Fix argument order in call to
Glenn Morris <rgm@gnu.org>
parents:
93462
diff
changeset
|
289 'calendar-islamic-from-absolute)) |
92926
b87a8e95883b
(displayed-month, displayed-year)
Glenn Morris <rgm@gnu.org>
parents:
92832
diff
changeset
|
290 |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
291 (define-obsolete-function-alias |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
292 'mark-islamic-diary-entries 'diary-islamic-mark-entries "23.1") |
93373
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
293 |
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
294 (autoload 'diary-insert-entry-1 "diary-lib") |
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
295 |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
296 ;;;###cal-autoload |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
297 (defun diary-islamic-insert-entry (arg) |
13053 | 298 "Insert a diary entry. |
299 For the Islamic date corresponding to the date indicated by point. | |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
300 Prefix argument ARG makes the entry nonmarking." |
13053 | 301 (interactive "P") |
93373
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
302 (diary-insert-entry-1 nil arg calendar-islamic-month-name-array |
93733
e1a9003feedf
Update for rename islamic-diary-entry-symbol to diary-islamic-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93642
diff
changeset
|
303 diary-islamic-entry-symbol |
93373
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
304 'calendar-islamic-from-absolute)) |
13053 | 305 |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
306 (define-obsolete-function-alias 'insert-islamic-diary-entry |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
307 'diary-islamic-insert-entry "23.1") |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
308 |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
309 ;;;###cal-autoload |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
310 (defun diary-islamic-insert-monthly-entry (arg) |
13053 | 311 "Insert a monthly diary entry. |
312 For the day of the Islamic month corresponding to the date indicated by point. | |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
313 Prefix argument ARG makes the entry nonmarking." |
13053 | 314 (interactive "P") |
93373
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
315 (diary-insert-entry-1 'monthly arg calendar-islamic-month-name-array |
93733
e1a9003feedf
Update for rename islamic-diary-entry-symbol to diary-islamic-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93642
diff
changeset
|
316 diary-islamic-entry-symbol |
93373
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
317 'calendar-islamic-from-absolute)) |
13053 | 318 |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
319 (define-obsolete-function-alias 'insert-monthly-islamic-diary-entry |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
320 'diary-islamic-insert-monthly-entry "23.1") |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
321 |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
322 ;;;###cal-autoload |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
323 (defun diary-islamic-insert-yearly-entry (arg) |
13053 | 324 "Insert an annual diary entry. |
325 For the day of the Islamic year corresponding to the date indicated by point. | |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
326 Prefix argument ARG makes the entry nonmarking." |
13053 | 327 (interactive "P") |
93373
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
328 (diary-insert-entry-1 'yearly arg calendar-islamic-month-name-array |
93733
e1a9003feedf
Update for rename islamic-diary-entry-symbol to diary-islamic-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93642
diff
changeset
|
329 diary-islamic-entry-symbol |
93373
6facf919dde4
Autoload diary-insert-entry-1.
Glenn Morris <rgm@gnu.org>
parents:
93268
diff
changeset
|
330 'calendar-islamic-from-absolute)) |
93642
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
331 (define-obsolete-function-alias |
d01118f40990
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93577
diff
changeset
|
332 'insert-yearly-islamic-diary-entry 'diary-islamic-insert-yearly-entry "23.1") |
13053 | 333 |
92677
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
334 (defvar date) |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
335 |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
336 ;; To be called from diary-sexp-entry, where DATE, ENTRY are bound. |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
337 ;;;###diary-autoload |
92677
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
338 (defun diary-islamic-date () |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
339 "Islamic calendar equivalent of date diary entry." |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
340 (let ((i (calendar-islamic-date-string date))) |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
341 (if (string-equal i "") |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
342 "Date is pre-Islamic" |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
343 (format "Islamic date (until sunset): %s" i)))) |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
344 |
14684
66450c507ee4
Renamed from cal-islamic.el to avoid 14-character limitation.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
345 (provide 'cal-islam) |
13053 | 346 |
92585
c9eb56890fe0
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
347 ;; arch-tag: a951b6c1-6f47-48d5-bac3-1b505cd719f7 |
14684
66450c507ee4
Renamed from cal-islamic.el to avoid 14-character limitation.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
348 ;;; cal-islam.el ends here |