[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v |
Date: |
Thu, 20 Mar 2008 04:38:28 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/20 04:38:28
Index: cal-bahai.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-bahai.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- cal-bahai.el 16 Mar 2008 01:23:55 -0000 1.34
+++ cal-bahai.el 20 Mar 2008 04:38:27 -0000 1.35
@@ -67,12 +67,13 @@
"Absolute date of start of Bahá'à calendar = March 19, 622 AD (Julian).")
(defun calendar-bahai-leap-year-p (year)
- "True if YEAR is a leap year on the Bahá'à calendar."
+ "True if Bahá'à YEAR is a leap year in the Bahá'à calendar."
(calendar-leap-year-p (+ year 1844)))
(defconst calendar-bahai-leap-base
(+ (/ 1844 4) (- (/ 1844 100)) (/ 1844 400))
- "Used by `calendar-absolute-from-bahai'.")
+ "Number of leap years between 1 and 1844 AD, inclusive.
+Used by `calendar-absolute-from-bahai'.")
(defun calendar-absolute-from-bahai (date)
"Compute absolute date from Bahá'à date DATE.
@@ -90,24 +91,25 @@
(* 365 (1- year)) ; days in prior years
leap-days
(calendar-sum m 1 (< m month) 19)
- (if (= month 19) 4 0)
+ (if (= month 19)
+ (if (calendar-bahai-leap-year-p year) 5 4)
+ 0)
day))) ; days so far this month
(defun calendar-bahai-from-absolute (date)
- "Bahá'à year corresponding to the absolute DATE."
+ "Bahá'à date (month day year) corresponding to the absolute DATE."
(if (< date calendar-bahai-epoch)
(list 0 0 0) ; pre-Bahá'à date
(let* ((greg (calendar-gregorian-from-absolute date))
+ (gmonth (extract-calendar-month greg))
(year (+ (- (extract-calendar-year greg) 1844)
- (if (or (> (extract-calendar-month greg) 3)
- (and (= (extract-calendar-month greg) 3)
+ (if (or (> gmonth 3)
+ (and (= gmonth 3)
(>= (extract-calendar-day greg) 21)))
1 0)))
(month ; search forward from Baha
(1+ (calendar-sum m 1
- (> date
- (calendar-absolute-from-bahai
- (list m 19 year)))
+ (> date (calendar-absolute-from-bahai (list m 19 year)))
1)))
(day ; calculate the day by subtraction
(- date
@@ -130,21 +132,24 @@
(aref calendar-bahai-month-name-array (1- m))))
(day (int-to-string
(if (<= d 0)
- (if (calendar-bahai-leap-year-p y)
- (+ d 5)
- (+ d 4))
+ (+ d (if (calendar-bahai-leap-year-p y) 5 4))
d)))
(year (int-to-string y))
(month (int-to-string m))
dayname)
- (mapconcat 'eval calendar-date-display-form "")))
+ (if (< y 1)
+ ""
+ ;; Can't call calendar-date-string because of monthname oddity.
+ (mapconcat 'eval calendar-date-display-form ""))))
;;;###cal-autoload
(defun calendar-bahai-print-date ()
"Show the Bahá'à calendar equivalent of the selected date."
(interactive)
- (message "Bahá'à date: %s"
- (calendar-bahai-date-string (calendar-cursor-to-date t))))
+ (let ((s (calendar-bahai-date-string (calendar-cursor-to-date t))))
+ (if (string-equal s "")
+ (message "Date is pre-Bahá'Ã")
+ (message "Bahá'à date: %s" s))))
(define-obsolete-function-alias
'calendar-print-bahai-date 'calendar-bahai-print-date "23.1")
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/07
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/14
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/15
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/24
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/25
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/26
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/28
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/30
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/31
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, Glenn Morris, 2008/03/31