Mercurial > emacs
changeset 93456:dc103c655cd1
(calendar-bahai-date-string): Make previous change more explicit.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 31 Mar 2008 07:51:16 +0000 |
| parents | 6fdb4c1fec8e |
| children | 4d3eb46a3b84 |
| files | lisp/calendar/cal-bahai.el |
| diffstat | 1 files changed, 17 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/cal-bahai.el Mon Mar 31 07:41:01 2008 +0000 +++ b/lisp/calendar/cal-bahai.el Mon Mar 31 07:51:16 2008 +0000 @@ -123,25 +123,24 @@ (let* ((bahai-date (calendar-bahai-from-absolute (calendar-absolute-from-gregorian (or date (calendar-current-date))))) - (y (extract-calendar-year bahai-date)) - (m (extract-calendar-month bahai-date)) - (d (extract-calendar-day bahai-date)) - (monthname (if (or (< m 1) ; pre-Bahai, avoid aref error - (and (= m 19) - (<= d 0))) - "Ayyám-i-Há" - (aref calendar-bahai-month-name-array (1- m)))) - (day (int-to-string - (if (<= d 0) - (+ d (if (calendar-bahai-leap-year-p y) 5 4)) - d))) - (year (int-to-string y)) - (month (int-to-string m)) - dayname) + (y (extract-calendar-year bahai-date))) (if (< y 1) - "" - ;; Can't call calendar-date-string because of monthname oddity. - (mapconcat 'eval calendar-date-display-form "")))) + "" ; pre-Bahai + (let* ((m (extract-calendar-month bahai-date)) + (d (extract-calendar-day bahai-date)) + (monthname (if (and (= m 19) + (<= d 0)) + "Ayyám-i-Há" + (aref calendar-bahai-month-name-array (1- m)))) + (day (int-to-string + (if (<= d 0) + (+ d (if (calendar-bahai-leap-year-p y) 5 4)) + d))) + (year (int-to-string y)) + (month (int-to-string m)) + dayname) + ;; Can't call calendar-date-string because of monthname oddity. + (mapconcat 'eval calendar-date-display-form ""))))) ;;;###cal-autoload (defun calendar-bahai-print-date ()