Mercurial > emacs
annotate lisp/calendar/cal-islam.el @ 92858:7096add7a945
Whitespace only.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 13 Mar 2008 06:27:14 +0000 |
parents | 0f2bf92fe13d |
children | b87a8e95883b |
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 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
14 ;; it under the terms of the GNU General Public License as published by | |
78216
93e11478c954
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
15 ;; the Free Software Foundation; either version 3, or (at your option) |
13053 | 16 ;; any later version. |
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 | |
14169 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, USA. | |
13053 | 27 |
28 ;;; Commentary: | |
29 | |
30 ;; This collection of functions implements the features of calendar.el and | |
31 ;; diary.el that deal with the Islamic calendar. | |
32 | |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
20268
diff
changeset
|
33 ;; Technical details of all the calendrical calculations can be found in |
61148
7f7db25577d9
Update reference to "Calendrical Calculations" book; there's a new edition.
Paul Eggert <eggert@twinsun.com>
parents:
54075
diff
changeset
|
34 ;; ``Calendrical Calculations: The Millennium Edition'' by Edward M. Reingold |
7f7db25577d9
Update reference to "Calendrical Calculations" book; there's a new edition.
Paul Eggert <eggert@twinsun.com>
parents:
54075
diff
changeset
|
35 ;; and Nachum Dershowitz, Cambridge University Press (2001). |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
20268
diff
changeset
|
36 |
13053 | 37 ;;; Code: |
38 | |
52119
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
39 (defvar displayed-month) |
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
40 (defvar displayed-year) |
65144
b3c4cec1dbcd
(date, number, original-date): Add defvars.
Juanma Barranquero <lekktu@gmail.com>
parents:
64085
diff
changeset
|
41 (defvar original-date) |
52119
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
42 |
13053 | 43 (require 'cal-julian) |
44 | |
45 (defvar calendar-islamic-month-name-array | |
46 ["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
|
47 "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
|
48 "Array of strings giving the names of the Islamic months.") |
13053 | 49 |
50 (defvar calendar-islamic-epoch (calendar-absolute-from-julian '(7 16 622)) | |
51 "Absolute date of start of Islamic calendar = August 29, 284 A.D. (Julian).") | |
52 | |
53 (defun islamic-calendar-leap-year-p (year) | |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
54 "Return t if YEAR is a leap year on the Islamic calendar." |
13053 | 55 (memq (% year 30) |
56 (list 2 5 7 10 13 16 18 21 24 26 29))) | |
57 | |
58 (defun islamic-calendar-last-day-of-month (month year) | |
59 "The last day in MONTH during YEAR on the Islamic calendar." | |
60 (cond | |
61 ((memq month (list 1 3 5 7 9 11)) 30) | |
62 ((memq month (list 2 4 6 8 10)) 29) | |
63 (t (if (islamic-calendar-leap-year-p year) 30 29)))) | |
64 | |
65 (defun islamic-calendar-day-number (date) | |
66 "Return the day number within the year of the Islamic date DATE." | |
67 (let* ((month (extract-calendar-month date)) | |
68 (day (extract-calendar-day date))) | |
69 (+ (* 30 (/ month 2)) | |
70 (* 29 (/ (1- month) 2)) | |
71 day))) | |
72 | |
73 (defun calendar-absolute-from-islamic (date) | |
74 "Absolute date of Islamic DATE. | |
75 The absolute date is the number of days elapsed since the (imaginary) | |
76 Gregorian date Sunday, December 31, 1 BC." | |
77 (let* ((month (extract-calendar-month date)) | |
78 (day (extract-calendar-day date)) | |
79 (year (extract-calendar-year date)) | |
80 (y (% year 30)) | |
81 (leap-years-in-cycle | |
82 (cond | |
83 ((< y 3) 0) ((< y 6) 1) ((< y 8) 2) ((< y 11) 3) ((< y 14) 4) | |
84 ((< y 17) 5) ((< y 19) 6) ((< y 22) 7) ((< y 25) 8) ((< y 27) 9) | |
85 (t 10)))) | |
92644 | 86 (+ (islamic-calendar-day-number date) ; days so far this year |
87 (* (1- year) 354) ; days in all non-leap years | |
88 (* 11 (/ year 30)) ; leap days in complete cycles | |
89 leap-years-in-cycle ; leap days this cycle | |
90 (1- calendar-islamic-epoch)))) ; days before start of calendar | |
13053 | 91 |
92 (defun calendar-islamic-from-absolute (date) | |
93 "Compute the Islamic date (month day year) corresponding to absolute DATE. | |
94 The absolute date is the number of days elapsed since the (imaginary) | |
95 Gregorian date Sunday, December 31, 1 BC." | |
96 (if (< date calendar-islamic-epoch) | |
92644 | 97 (list 0 0 0) ; pre-Islamic date |
13053 | 98 (let* ((approx (/ (- date calendar-islamic-epoch) |
92644 | 99 355)) ; approximation from below |
100 (year ; search forward from the approximation | |
13053 | 101 (+ approx |
102 (calendar-sum y approx | |
103 (>= date (calendar-absolute-from-islamic | |
104 (list 1 1 (1+ y)))) | |
105 1))) | |
92644 | 106 (month ; search forward from Muharram |
13053 | 107 (1+ (calendar-sum m 1 |
108 (> date | |
109 (calendar-absolute-from-islamic | |
110 (list m | |
111 (islamic-calendar-last-day-of-month | |
112 m year) | |
113 year))) | |
114 1))) | |
92644 | 115 (day ; calculate the day by subtraction |
13053 | 116 (- date |
117 (1- (calendar-absolute-from-islamic (list month 1 year)))))) | |
118 (list month day year)))) | |
119 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
120 ;;;###cal-autoload |
13053 | 121 (defun calendar-islamic-date-string (&optional date) |
122 "String of Islamic date before sunset of Gregorian DATE. | |
123 Returns the empty string if DATE is pre-Islamic. | |
124 Defaults to today's date if DATE is not given. | |
125 Driven by the variable `calendar-date-display-form'." | |
126 (let ((calendar-month-name-array calendar-islamic-month-name-array) | |
127 (islamic-date (calendar-islamic-from-absolute | |
128 (calendar-absolute-from-gregorian | |
129 (or date (calendar-current-date)))))) | |
130 (if (< (extract-calendar-year islamic-date) 1) | |
131 "" | |
132 (calendar-date-string islamic-date nil t)))) | |
133 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
134 ;;;###cal-autoload |
13053 | 135 (defun calendar-print-islamic-date () |
136 "Show the Islamic calendar equivalent of the date under the cursor." | |
137 (interactive) | |
138 (let ((i (calendar-islamic-date-string (calendar-cursor-to-date t)))) | |
139 (if (string-equal i "") | |
140 (message "Date is pre-Islamic") | |
141 (message "Islamic date (until sunset): %s" i)))) | |
142 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
143 ;;;###cal-autoload |
13053 | 144 (defun calendar-goto-islamic-date (date &optional noecho) |
145 "Move cursor to Islamic DATE; echo Islamic date unless NOECHO is t." | |
146 (interactive | |
147 (let* ((today (calendar-current-date)) | |
148 (year (calendar-read | |
149 "Islamic calendar year (>0): " | |
92585
c9eb56890fe0
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
150 (lambda (x) (> x 0)) |
13053 | 151 (int-to-string |
152 (extract-calendar-year | |
153 (calendar-islamic-from-absolute | |
154 (calendar-absolute-from-gregorian today)))))) | |
155 (month-array calendar-islamic-month-name-array) | |
156 (completion-ignore-case t) | |
54075
5c162955af7a
(calendar-goto-islamic-date, mark-islamic-diary-entries): Use
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
157 (month (cdr (assoc-string |
13053 | 158 (completing-read |
159 "Islamic calendar month name: " | |
160 (mapcar 'list (append month-array nil)) | |
24184
5b4ebdd66a82
(calendar-goto-islamic-date)
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
161 nil t) |
54075
5c162955af7a
(calendar-goto-islamic-date, mark-islamic-diary-entries): Use
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
162 (calendar-make-alist month-array 1) t))) |
13053 | 163 (last (islamic-calendar-last-day-of-month month year)) |
164 (day (calendar-read | |
165 (format "Islamic calendar day (1-%d): " last) | |
92585
c9eb56890fe0
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
166 (lambda (x) (and (< 0 x) (<= x last)))))) |
13053 | 167 (list (list month day year)))) |
168 (calendar-goto-date (calendar-gregorian-from-absolute | |
169 (calendar-absolute-from-islamic date))) | |
170 (or noecho (calendar-print-islamic-date))) | |
171 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
172 ;;;###holiday-autoload |
13053 | 173 (defun holiday-islamic (month day string) |
174 "Holiday on MONTH, DAY (Islamic) called STRING. | |
175 If MONTH, DAY (Islamic) is visible, the value returned is corresponding | |
176 Gregorian date in the form of the list (((month day year) STRING)). Returns | |
177 nil if it is not visible in the current calendar window." | |
178 (let* ((islamic-date (calendar-islamic-from-absolute | |
179 (calendar-absolute-from-gregorian | |
180 (list displayed-month 15 displayed-year)))) | |
181 (m (extract-calendar-month islamic-date)) | |
182 (y (extract-calendar-year islamic-date)) | |
183 (date)) | |
184 (if (< m 1) | |
92644 | 185 nil ; Islamic calendar doesn't apply |
13053 | 186 (increment-calendar-month m y (- 10 month)) |
92644 | 187 (if (> m 7) ; Islamic date might be visible |
13053 | 188 (let ((date (calendar-gregorian-from-absolute |
189 (calendar-absolute-from-islamic (list month day y))))) | |
190 (if (calendar-date-is-visible-p date) | |
191 (list (list date string)))))))) | |
192 | |
86490
238c9b141506
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
85502
diff
changeset
|
193 ;; l-i-d-e should be called from diary code. |
238c9b141506
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
85502
diff
changeset
|
194 (declare-function add-to-diary-list "diary-lib" |
238c9b141506
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
85502
diff
changeset
|
195 (date string specifier &optional marker globcolor literal)) |
238c9b141506
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
85502
diff
changeset
|
196 |
92677
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
197 (defvar number) ; from diary-list-entries |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
198 |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
199 ;;;###diary-autoload |
13053 | 200 (defun list-islamic-diary-entries () |
201 "Add any Islamic date entries from the diary file to `diary-entries-list'. | |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
202 Islamic date diary entries must be prefaced by `islamic-diary-entry-symbol' |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
203 \(normally an `I'). The same diary date forms govern the style |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
204 of the Islamic calendar entries, except that the Islamic month |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
205 names must be spelled in full. The Islamic months are numbered |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
206 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
|
207 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
|
208 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
|
209 marked in the calendar. This function is provided for use with |
13053 | 210 `nongregorian-diary-listing-hook'." |
211 (if (< 0 number) | |
212 (let ((buffer-read-only nil) | |
213 (diary-modified (buffer-modified-p)) | |
214 (gdate original-date) | |
215 (mark (regexp-quote diary-nonmarking-symbol))) | |
82083
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
216 (dotimes (idummy number) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
217 (let* ((d diary-date-forms) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
218 (idate (calendar-islamic-from-absolute |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
219 (calendar-absolute-from-gregorian gdate))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
220 (month (extract-calendar-month idate)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
221 (day (extract-calendar-day idate)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
222 (year (extract-calendar-year idate))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
223 (while d |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
224 (let* |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
225 ((date-form (if (equal (car (car d)) 'backup) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
226 (cdr (car d)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
227 (car d))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
228 (backup (equal (car (car d)) 'backup)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
229 (dayname |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
230 (format "%s\\|%s\\.?" |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
231 (calendar-day-name gdate) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
232 (calendar-day-name gdate 'abbrev))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
233 (calendar-month-name-array |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
234 calendar-islamic-month-name-array) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
235 (monthname |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
236 (concat |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
237 "\\*\\|" |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
238 (calendar-month-name month))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
239 (month (concat "\\*\\|0*" (int-to-string month))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
240 (day (concat "\\*\\|0*" (int-to-string day))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
241 (year |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
242 (concat |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
243 "\\*\\|0*" (int-to-string year) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
244 (if abbreviated-calendar-year |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
245 (concat "\\|" (int-to-string (% year 100))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
246 ""))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
247 (regexp |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
248 (concat |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
249 "\\(\\`\\|\^M\\|\n\\)" mark "?" |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
250 (regexp-quote islamic-diary-entry-symbol) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
251 "\\(" |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
252 (mapconcat 'eval date-form "\\)\\(") |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
253 "\\)")) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
254 (case-fold-search t)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
255 (goto-char (point-min)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
256 (while (re-search-forward regexp nil t) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
257 (if backup (re-search-backward "\\<" nil t)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
258 (if (and (or (char-equal (preceding-char) ?\^M) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
259 (char-equal (preceding-char) ?\n)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
260 (not (looking-at " \\|\^I"))) |
92644 | 261 ;; Diary entry that consists only of date. |
82083
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
262 (backward-char 1) |
92644 | 263 ;; Found a nonempty diary entry--make it visible and |
264 ;; add it to the list. | |
82083
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
265 (let ((entry-start (point)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
266 (date-start)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
267 (re-search-backward "\^M\\|\n\\|\\`") |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
268 (setq date-start (point)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
269 (re-search-forward "\^M\\|\n" nil t 2) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
270 (while (looking-at " \\|\^I") |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
271 (re-search-forward "\^M\\|\n" nil t)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
272 (backward-char 1) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
273 (subst-char-in-region date-start (point) ?\^M ?\n t) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
274 (add-to-diary-list |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
275 gdate |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
276 (buffer-substring-no-properties entry-start (point)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
277 (buffer-substring-no-properties |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
278 (1+ date-start) (1- entry-start)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
279 (copy-marker entry-start)))))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
280 (setq d (cdr d)))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
281 (setq gdate |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
282 (calendar-gregorian-from-absolute |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
283 (1+ (calendar-absolute-from-gregorian gdate))))) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
284 (set-buffer-modified-p diary-modified)) |
c2109b15d473
(list-islamic-diary-entries): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
285 (goto-char (point-min)))) |
13053 | 286 |
86490
238c9b141506
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
85502
diff
changeset
|
287 (declare-function diary-name-pattern "diary-lib" |
238c9b141506
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
85502
diff
changeset
|
288 (string-array &optional abbrev-array paren)) |
238c9b141506
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
85502
diff
changeset
|
289 |
238c9b141506
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
85502
diff
changeset
|
290 (declare-function mark-calendar-days-named "diary-lib" |
238c9b141506
(add-to-diary-list, diary-name-pattern)
Glenn Morris <rgm@gnu.org>
parents:
85502
diff
changeset
|
291 (dayname &optional color)) |
13053 | 292 |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
293 ;;;###diary-autoload |
13053 | 294 (defun mark-islamic-diary-entries () |
295 "Mark days in the calendar window that have Islamic date diary entries. | |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
296 Each entry in `diary-file' (or included files) visible in the calendar window |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
297 is marked. Islamic date entries are prefaced by `islamic-diary-entry-symbol' |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
298 \(normally an `I'). The same `diary-date-forms' govern the style of the Islamic |
13053 | 299 calendar entries, except that the Islamic month names must be spelled in full. |
300 The Islamic months are numbered from 1 to 12 with Muharram being 1 and 12 being | |
301 Dhu al-Hijjah. Islamic date diary entries that begin with a | |
92645
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
302 `diary-nonmarking-symbol' will not be marked in the calendar. This function is |
611e312d3f05
(islamic-calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
92644
diff
changeset
|
303 provided for use as part of the `nongregorian-diary-marking-hook'." |
13053 | 304 (let ((d diary-date-forms)) |
305 (while d | |
306 (let* | |
307 ((date-form (if (equal (car (car d)) 'backup) | |
308 (cdr (car d)) | |
92644 | 309 (car d))) ; ignore 'backup directive |
52119
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
310 (dayname (diary-name-pattern calendar-day-name-array |
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
311 calendar-day-abbrev-array)) |
13053 | 312 (monthname |
52119
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
313 (format "%s\\|\\*" |
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
314 (diary-name-pattern calendar-islamic-month-name-array))) |
13053 | 315 (month "[0-9]+\\|\\*") |
316 (day "[0-9]+\\|\\*") | |
317 (year "[0-9]+\\|\\*") | |
318 (l (length date-form)) | |
319 (d-name-pos (- l (length (memq 'dayname date-form)))) | |
320 (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos))) | |
321 (m-name-pos (- l (length (memq 'monthname date-form)))) | |
322 (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos))) | |
323 (d-pos (- l (length (memq 'day date-form)))) | |
324 (d-pos (if (/= l d-pos) (+ 2 d-pos))) | |
325 (m-pos (- l (length (memq 'month date-form)))) | |
326 (m-pos (if (/= l m-pos) (+ 2 m-pos))) | |
327 (y-pos (- l (length (memq 'year date-form)))) | |
328 (y-pos (if (/= l y-pos) (+ 2 y-pos))) | |
329 (regexp | |
330 (concat | |
331 "\\(\\`\\|\^M\\|\n\\)" | |
332 (regexp-quote islamic-diary-entry-symbol) | |
333 "\\(" | |
334 (mapconcat 'eval date-form "\\)\\(") | |
335 "\\)")) | |
336 (case-fold-search t)) | |
337 (goto-char (point-min)) | |
338 (while (re-search-forward regexp nil t) | |
339 (let* ((dd-name | |
340 (if d-name-pos | |
341 (buffer-substring | |
342 (match-beginning d-name-pos) | |
343 (match-end d-name-pos)))) | |
344 (mm-name | |
345 (if m-name-pos | |
346 (buffer-substring | |
347 (match-beginning m-name-pos) | |
348 (match-end m-name-pos)))) | |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
61148
diff
changeset
|
349 (mm (string-to-number |
13053 | 350 (if m-pos |
351 (buffer-substring | |
352 (match-beginning m-pos) | |
353 (match-end m-pos)) | |
354 ""))) | |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
61148
diff
changeset
|
355 (dd (string-to-number |
13053 | 356 (if d-pos |
357 (buffer-substring | |
358 (match-beginning d-pos) | |
359 (match-end d-pos)) | |
360 ""))) | |
361 (y-str (if y-pos | |
362 (buffer-substring | |
363 (match-beginning y-pos) | |
364 (match-end y-pos)))) | |
365 (yy (if (not y-str) | |
366 0 | |
367 (if (and (= (length y-str) 2) | |
368 abbreviated-calendar-year) | |
369 (let* ((current-y | |
370 (extract-calendar-year | |
371 (calendar-islamic-from-absolute | |
372 (calendar-absolute-from-gregorian | |
373 (calendar-current-date))))) | |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
61148
diff
changeset
|
374 (y (+ (string-to-number y-str) |
13053 | 375 (* 100 (/ current-y 100))))) |
376 (if (> (- y current-y) 50) | |
377 (- y 100) | |
378 (if (> (- current-y y) 50) | |
379 (+ y 100) | |
380 y))) | |
62402
a7e02ef1e3d6
Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents:
61148
diff
changeset
|
381 (string-to-number y-str))))) |
13053 | 382 (if dd-name |
383 (mark-calendar-days-named | |
54075
5c162955af7a
(calendar-goto-islamic-date, mark-islamic-diary-entries): Use
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
384 (cdr (assoc-string dd-name |
24184
5b4ebdd66a82
(calendar-goto-islamic-date)
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
385 (calendar-make-alist |
5b4ebdd66a82
(calendar-goto-islamic-date)
Richard M. Stallman <rms@gnu.org>
parents:
20462
diff
changeset
|
386 calendar-day-name-array |
54075
5c162955af7a
(calendar-goto-islamic-date, mark-islamic-diary-entries): Use
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
387 0 nil calendar-day-abbrev-array) t))) |
13053 | 388 (if mm-name |
52119
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
389 (setq mm (if (string-equal mm-name "*") 0 |
54075
5c162955af7a
(calendar-goto-islamic-date, mark-islamic-diary-entries): Use
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
390 (cdr (assoc-string |
52119
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
391 mm-name |
226327fe046f
(displayed-month, displayed-year): Define for compiler.
Glenn Morris <rgm@gnu.org>
parents:
49598
diff
changeset
|
392 (calendar-make-alist |
54075
5c162955af7a
(calendar-goto-islamic-date, mark-islamic-diary-entries): Use
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
393 calendar-islamic-month-name-array) t))))) |
13053 | 394 (mark-islamic-calendar-date-pattern mm dd yy))))) |
395 (setq d (cdr d))))) | |
396 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
397 ;;;###diary-autoload |
13053 | 398 (defun mark-islamic-calendar-date-pattern (month day year) |
399 "Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR. | |
400 A value of 0 in any position is a wildcard." | |
401 (save-excursion | |
402 (set-buffer calendar-buffer) | |
92610
6f4bd17c2adc
(mark-islamic-calendar-date-pattern): Use zerop.
Glenn Morris <rgm@gnu.org>
parents:
92585
diff
changeset
|
403 (if (and (not (zerop month)) (not (zerop day))) |
6f4bd17c2adc
(mark-islamic-calendar-date-pattern): Use zerop.
Glenn Morris <rgm@gnu.org>
parents:
92585
diff
changeset
|
404 (if (not (zerop year)) |
13053 | 405 ;; Fully specified Islamic date. |
406 (let ((date (calendar-gregorian-from-absolute | |
407 (calendar-absolute-from-islamic | |
408 (list month day year))))) | |
409 (if (calendar-date-is-visible-p date) | |
410 (mark-visible-calendar-date date))) | |
411 ;; Month and day in any year--this taken from the holiday stuff. | |
412 (let* ((islamic-date (calendar-islamic-from-absolute | |
413 (calendar-absolute-from-gregorian | |
414 (list displayed-month 15 displayed-year)))) | |
415 (m (extract-calendar-month islamic-date)) | |
416 (y (extract-calendar-year islamic-date)) | |
417 (date)) | |
418 (if (< m 1) | |
92644 | 419 nil ; Islamic calendar doesn't apply |
13053 | 420 (increment-calendar-month m y (- 10 month)) |
92644 | 421 (if (> m 7) ; Islamic date might be visible |
13053 | 422 (let ((date (calendar-gregorian-from-absolute |
423 (calendar-absolute-from-islamic | |
424 (list month day y))))) | |
425 (if (calendar-date-is-visible-p date) | |
426 (mark-visible-calendar-date date))))))) | |
427 ;; Not one of the simple cases--check all visible dates for match. | |
428 ;; Actually, the following code takes care of ALL of the cases, but | |
429 ;; it's much too slow to be used for the simple (common) cases. | |
430 (let ((m displayed-month) | |
431 (y displayed-year) | |
432 (first-date) | |
433 (last-date)) | |
434 (increment-calendar-month m y -1) | |
435 (setq first-date | |
436 (calendar-absolute-from-gregorian | |
437 (list m 1 y))) | |
438 (increment-calendar-month m y 2) | |
439 (setq last-date | |
440 (calendar-absolute-from-gregorian | |
441 (list m (calendar-last-day-of-month m y) y))) | |
442 (calendar-for-loop date from first-date to last-date do | |
443 (let* ((i-date (calendar-islamic-from-absolute date)) | |
444 (i-month (extract-calendar-month i-date)) | |
445 (i-day (extract-calendar-day i-date)) | |
446 (i-year (extract-calendar-year i-date))) | |
447 (and (or (zerop month) | |
448 (= month i-month)) | |
449 (or (zerop day) | |
450 (= day i-day)) | |
451 (or (zerop year) | |
452 (= year i-year)) | |
453 (mark-visible-calendar-date | |
454 (calendar-gregorian-from-absolute date))))))))) | |
455 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
456 ;;;###cal-autoload |
13053 | 457 (defun insert-islamic-diary-entry (arg) |
458 "Insert a diary entry. | |
459 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
|
460 Prefix argument ARG makes the entry nonmarking." |
13053 | 461 (interactive "P") |
462 (let* ((calendar-month-name-array calendar-islamic-month-name-array)) | |
463 (make-diary-entry | |
464 (concat | |
465 islamic-diary-entry-symbol | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
38449
diff
changeset
|
466 (calendar-date-string |
13053 | 467 (calendar-islamic-from-absolute |
468 (calendar-absolute-from-gregorian | |
469 (calendar-cursor-to-date t))) | |
470 nil t)) | |
471 arg))) | |
472 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
473 ;;;###cal-autoload |
13053 | 474 (defun insert-monthly-islamic-diary-entry (arg) |
475 "Insert a monthly diary entry. | |
476 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
|
477 Prefix argument ARG makes the entry nonmarking." |
13053 | 478 (interactive "P") |
479 (let* ((calendar-date-display-form | |
480 (if european-calendar-style '(day " * ") '("* " day ))) | |
481 (calendar-month-name-array calendar-islamic-month-name-array)) | |
482 (make-diary-entry | |
483 (concat | |
484 islamic-diary-entry-symbol | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
38449
diff
changeset
|
485 (calendar-date-string |
13053 | 486 (calendar-islamic-from-absolute |
487 (calendar-absolute-from-gregorian | |
488 (calendar-cursor-to-date t))))) | |
489 arg))) | |
490 | |
92832
0f2bf92fe13d
(generated-autoload-file): Don't set, instead use different values of
Glenn Morris <rgm@gnu.org>
parents:
92677
diff
changeset
|
491 ;;;###cal-autoload |
13053 | 492 (defun insert-yearly-islamic-diary-entry (arg) |
493 "Insert an annual diary entry. | |
494 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
|
495 Prefix argument ARG makes the entry nonmarking." |
13053 | 496 (interactive "P") |
497 (let* ((calendar-date-display-form | |
498 (if european-calendar-style | |
499 '(day " " monthname) | |
500 '(monthname " " day))) | |
501 (calendar-month-name-array calendar-islamic-month-name-array)) | |
502 (make-diary-entry | |
503 (concat | |
504 islamic-diary-entry-symbol | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
38449
diff
changeset
|
505 (calendar-date-string |
13053 | 506 (calendar-islamic-from-absolute |
507 (calendar-absolute-from-gregorian | |
508 (calendar-cursor-to-date t))))) | |
509 arg))) | |
510 | |
92677
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
511 (defvar date) |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
512 |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
513 ;; 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
|
514 ;;;###diary-autoload |
92677
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
515 (defun diary-islamic-date () |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
516 "Islamic calendar equivalent of date diary entry." |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
517 (let ((i (calendar-islamic-date-string date))) |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
518 (if (string-equal i "") |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
519 "Date is pre-Islamic" |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
520 (format "Islamic date (until sunset): %s" i)))) |
3f32c597cb6b
(diary-islamic-date): Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92645
diff
changeset
|
521 |
14684
66450c507ee4
Renamed from cal-islamic.el to avoid 14-character limitation.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
522 (provide 'cal-islam) |
13053 | 523 |
92585
c9eb56890fe0
Unquote lambda functions. Add autoload cookies to functions formerly
Glenn Morris <rgm@gnu.org>
parents:
87649
diff
changeset
|
524 ;; 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
|
525 ;;; cal-islam.el ends here |