[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: |
Mon, 31 Mar 2008 01:47:12 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/31 01:47:12
Index: cal-bahai.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-bahai.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- cal-bahai.el 29 Mar 2008 02:42:52 -0000 1.39
+++ cal-bahai.el 31 Mar 2008 01:47:11 -0000 1.40
@@ -126,8 +126,9 @@
(y (extract-calendar-year bahai-date))
(m (extract-calendar-month bahai-date))
(d (extract-calendar-day bahai-date))
- (monthname (if (and (= m 19)
- (<= d 0))
+ (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
@@ -195,6 +196,7 @@
(defvar displayed-month)
(defvar displayed-year)
+;; FIXME same as islamic.
;;;###holiday-autoload
(defun holiday-bahai (month day string)
"Holiday on MONTH, DAY (Bahá'Ã) called STRING.
@@ -208,6 +210,8 @@
(y (extract-calendar-year bahai-date))
date)
(unless (< m 1) ; Bahá'à calendar doesn't apply
+ ;; FIXME makes no sense (?), since there are not 12 months in a year.
+ ;; Suspect this was copied from cal-islam.
(increment-calendar-month m y (- 10 month))
(if (> m 7) ; Bahá'à date might be visible
(let ((date (calendar-gregorian-from-absolute
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-bahai.el,v, (continued)
- [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, 2008/03/20
- [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 <=
- [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