(calendar-bahai-date-string): Avoid an error for pre-Bahai dates.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a163467b809..0ca01a7c8f4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-31  Glenn Morris  <rgm@gnu.org>
 
+        * calendar/cal-bahai.el (calendar-bahai-date-string): Avoid an error for
+        pre-Bahai dates.
+
         * calendar/holidays.el (holiday-filter-visible-calendar): Return result
         from dolist.
 
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index 21978cacbf4..0bf97dd8a93 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -126,8 +126,9 @@ Defaults to today's date if DATE is not given."
          (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 @@ Reads a year, month and day."
 (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 @@ nil if it is not visible in the current calendar window."
          (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