summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward M. Reingold <reingold@emr.cs.iit.edu>1994-10-26 15:31:27 +0000
committerEdward M. Reingold <reingold@emr.cs.iit.edu>1994-10-26 15:31:27 +0000
commitc99d4526f029c0c227487c09661d7f31159d8f57 (patch)
treef36e0108bc45eb5e2d57545af34d96c8d5c38b6b
parente77ed0d12482e37af1588ee7ab4d68ddd12a73c4 (diff)
downloademacs-c99d4526f029c0c227487c09661d7f31159d8f57.tar.gz
Use new form of calendar-read-date.
-rw-r--r--lisp/calendar/holidays.el24
1 files changed, 5 insertions, 19 deletions
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 2500b60787f..a933b77bea2 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -61,25 +61,11 @@ This function is suitable for execution in a .emacs file."
(interactive "P")
(save-excursion
(let* ((completion-ignore-case t)
- (date (calendar-current-date))
- (displayed-month
- (if arg
- (cdr (assoc
- (capitalize
- (completing-read
- "Month name: "
- (mapcar 'list (append calendar-month-name-array nil))
- nil t))
- (calendar-make-alist calendar-month-name-array)))
- (extract-calendar-month date)))
- (displayed-year
- (if arg
- (calendar-read
- "Year (>0): "
- '(lambda (x) (> x 0))
- (int-to-string
- (extract-calendar-year (calendar-current-date))))
- (extract-calendar-year date))))
+ (date (if arg
+ (calendar-read-date t)
+ (calendar-current-date)))
+ (displayed-month (extract-calendar-month date))
+ (displayed-year (extract-calendar-year date)))
(list-calendar-holidays))))
(defun check-calendar-holidays (date)