Commit 9b6c7da9 authored by Glenn Morris's avatar Glenn Morris

(calendar-bahai-prompt-for-date, calendar-bahai-mark-date-pattern):

Use zerop.
parent d7af270b
...@@ -2,14 +2,30 @@ ...@@ -2,14 +2,30 @@
* calendar/appt.el (appt): Move custom group here from calendar.el. * 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/cal-china.el (chinese-calendar): Move custom group here from
calendar.el. calendar.el.
(chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch): (chinese-calendar-celestial-stem, chinese-calendar-terrestrial-branch):
Make constants. 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/cal-tex.el (calendar-tex): Move custom group here from
calendar.el. 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-loaddefs.el: New file.
* calendar/cal-bahai.el, calendar/cal-china.el, calendar/cal-coptic.el: * calendar/cal-bahai.el, calendar/cal-china.el, calendar/cal-coptic.el:
......
...@@ -165,7 +165,7 @@ Echo Bahá'í date unless NOECHO is t." ...@@ -165,7 +165,7 @@ Echo Bahá'í date unless NOECHO is t."
(let* ((today (calendar-current-date)) (let* ((today (calendar-current-date))
(year (calendar-read (year (calendar-read
"Bahá'í calendar year (not 0): " "Bahá'í calendar year (not 0): "
(lambda (x) (/= x 0)) (lambda (x) (not (zerop x)))
(int-to-string (int-to-string
(extract-calendar-year (extract-calendar-year
(calendar-bahai-from-absolute (calendar-bahai-from-absolute
...@@ -418,8 +418,8 @@ nongregorian-diary-marking-hook." ...@@ -418,8 +418,8 @@ nongregorian-diary-marking-hook."
A value of 0 in any position is a wildcard." A value of 0 in any position is a wildcard."
(save-excursion (save-excursion
(set-buffer calendar-buffer) (set-buffer calendar-buffer)
(if (and (/= 0 month) (/= 0 day)) (if (and (not (zerop month)) (not (zerop day)))
(if (/= 0 year) (if (not (zerop year))
;; Fully specified Bahá'í date. ;; Fully specified Bahá'í date.
(let ((date (calendar-gregorian-from-absolute (let ((date (calendar-gregorian-from-absolute
(calendar-absolute-from-bahai (calendar-absolute-from-bahai
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment