Mercurial > emacs
comparison lisp/calendar/cal-islam.el @ 91204:53108e6cea98
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 06 Dec 2007 09:51:45 +0000 |
| parents | f55f9811f5d7 238c9b141506 |
| children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
| 91203:db40129142b2 | 91204:53108e6cea98 |
|---|---|
| 192 (if (> m 7);; Islamic date might be visible | 192 (if (> m 7);; Islamic date might be visible |
| 193 (let ((date (calendar-gregorian-from-absolute | 193 (let ((date (calendar-gregorian-from-absolute |
| 194 (calendar-absolute-from-islamic (list month day y))))) | 194 (calendar-absolute-from-islamic (list month day y))))) |
| 195 (if (calendar-date-is-visible-p date) | 195 (if (calendar-date-is-visible-p date) |
| 196 (list (list date string)))))))) | 196 (list (list date string)))))))) |
| 197 | |
| 198 ;; l-i-d-e should be called from diary code. | |
| 199 (declare-function add-to-diary-list "diary-lib" | |
| 200 (date string specifier &optional marker globcolor literal)) | |
| 197 | 201 |
| 198 (defun list-islamic-diary-entries () | 202 (defun list-islamic-diary-entries () |
| 199 "Add any Islamic date entries from the diary file to `diary-entries-list'. | 203 "Add any Islamic date entries from the diary file to `diary-entries-list'. |
| 200 Islamic date diary entries must be prefaced by an `islamic-diary-entry-symbol' | 204 Islamic date diary entries must be prefaced by an `islamic-diary-entry-symbol' |
| 201 \(normally an `I'). The same diary date forms govern the style of the Islamic | 205 \(normally an `I'). The same diary date forms govern the style of the Islamic |
| 278 (setq gdate | 282 (setq gdate |
| 279 (calendar-gregorian-from-absolute | 283 (calendar-gregorian-from-absolute |
| 280 (1+ (calendar-absolute-from-gregorian gdate))))) | 284 (1+ (calendar-absolute-from-gregorian gdate))))) |
| 281 (set-buffer-modified-p diary-modified)) | 285 (set-buffer-modified-p diary-modified)) |
| 282 (goto-char (point-min)))) | 286 (goto-char (point-min)))) |
| 287 | |
| 288 (declare-function diary-name-pattern "diary-lib" | |
| 289 (string-array &optional abbrev-array paren)) | |
| 290 | |
| 291 (declare-function mark-calendar-days-named "diary-lib" | |
| 292 (dayname &optional color)) | |
| 283 | 293 |
| 284 (defun mark-islamic-diary-entries () | 294 (defun mark-islamic-diary-entries () |
| 285 "Mark days in the calendar window that have Islamic date diary entries. | 295 "Mark days in the calendar window that have Islamic date diary entries. |
| 286 Each entry in diary-file (or included files) visible in the calendar window | 296 Each entry in diary-file (or included files) visible in the calendar window |
| 287 is marked. Islamic date entries are prefaced by a islamic-diary-entry-symbol | 297 is marked. Islamic date entries are prefaced by a islamic-diary-entry-symbol |