2 files changed, 19 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2845beacdef..a80295f3613 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,14 +2,30 @@
 
         * calendar/appt.el (appt): Move custom group here from calendar.el.
 
+        * calendar/cal-bahai.el (calendar-bahai-prompt-for-date)
+        (calendar-bahai-mark-date-pattern):
+        * calendar/cal-hebrew.el (mark-hebrew-calendar-date-pattern):
+        * calendar/cal-islam.el (mark-islamic-calendar-date-pattern):
+        * calendar/cal-julian.el (calendar-absolute-from-julian):
+        * calendar/cal-persia.el (persian-prompt-for-date): Use zerop.
+
         * calendar/cal-china.el (chinese-calendar): Move custom group here from
         calendar.el.
         (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
         Make constants.
 
+        * calendar/cal-coptic.el (coptic-name): Add doc string.
+
+        * calendar/cal-persia.el (persian-calendar-month-name-array)
+        (persian-calendar-epoch): Make constants.
+
         * calendar/cal-tex.el (calendar-tex): Move custom group here from
         calendar.el.
 
+        * calendar/cal-x.el (diary-frame-parameters)
+        (calendar-frame-parameters, calendar-and-diary-frame-parameters)
+        (calendar-after-frame-setup-hooks): Make defcustoms.
+
         * calendar/cal-loaddefs.el: New file.
 
         * calendar/cal-bahai.el, calendar/cal-china.el, calendar/cal-coptic.el:
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index f18b88528e9..15688e9e834 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -165,7 +165,7 @@ Echo Bahá'í date unless NOECHO is t."
   (let* ((today (calendar-current-date))
          (year (calendar-read
                 "Bahá'í calendar year (not 0): "
-                (lambda (x) (/= x 0))
+                (lambda (x) (not (zerop x)))
                 (int-to-string
                  (extract-calendar-year
                   (calendar-bahai-from-absolute
@@ -418,8 +418,8 @@ nongregorian-diary-marking-hook."
 A value of 0 in any position is a wildcard."
   (save-excursion
     (set-buffer calendar-buffer)
-    (if (and (/= 0 month) (/= 0 day))
-        (if (/= 0 year)
+    (if (and (not (zerop month)) (not (zerop day)))
+        (if (not (zerop year))
             ;; Fully specified Bahá'í date.
             (let ((date (calendar-gregorian-from-absolute
                          (calendar-absolute-from-bahai