Mercurial > emacs
comparison lisp/calendar/cal-coptic.el @ 92622:a7f58647496a
Fix previous change.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 08 Mar 2008 19:50:37 +0000 |
| parents | 28583a8ab749 |
| children | 73ee52037e9a |
comparison
equal
deleted
inserted
replaced
| 92621:f32191b4080d | 92622:a7f58647496a |
|---|---|
| 165 (day (calendar-read | 165 (day (calendar-read |
| 166 (format "%s calendar day (1-%d): " coptic-name last) | 166 (format "%s calendar day (1-%d): " coptic-name last) |
| 167 (lambda (x) (and (< 0 x) (<= x last)))))) | 167 (lambda (x) (and (< 0 x) (<= x last)))))) |
| 168 (list (list month day year)))) | 168 (list (list month day year)))) |
| 169 | 169 |
| 170 (defvar date) | |
| 171 | |
| 172 ;; To be called from list-sexp-diary-entries, where DATE is bound. | |
| 170 (defun diary-coptic-date () | 173 (defun diary-coptic-date () |
| 171 "Coptic calendar equivalent of date diary entry." | 174 "Coptic calendar equivalent of date diary entry." |
| 172 (let ((f (calendar-coptic-date-string date))) | 175 (let ((f (calendar-coptic-date-string date))) |
| 173 (if (string-equal f "") | 176 (if (string-equal f "") |
| 174 (format "Date is pre-%s calendar" coptic-name) | 177 (format "Date is pre-%s calendar" coptic-name) |
| 228 (coptic-prompt-for-date))) | 231 (coptic-prompt-for-date))) |
| 229 (calendar-goto-date (calendar-gregorian-from-absolute | 232 (calendar-goto-date (calendar-gregorian-from-absolute |
| 230 (calendar-absolute-from-ethiopic date))) | 233 (calendar-absolute-from-ethiopic date))) |
| 231 (or noecho (calendar-print-ethiopic-date))) | 234 (or noecho (calendar-print-ethiopic-date))) |
| 232 | 235 |
| 233 (defvar date) | |
| 234 | |
| 235 ;; To be called from list-sexp-diary-entries, where DATE is bound. | 236 ;; To be called from list-sexp-diary-entries, where DATE is bound. |
| 236 (defun diary-ethiopic-date () | 237 (defun diary-ethiopic-date () |
| 237 "Ethiopic calendar equivalent of date diary entry." | 238 "Ethiopic calendar equivalent of date diary entry." |
| 238 (let ((coptic-calendar-epoch ethiopic-calendar-epoch) | 239 (let ((coptic-calendar-epoch ethiopic-calendar-epoch) |
| 239 (coptic-name ethiopic-name) | 240 (coptic-name ethiopic-name) |