changeset 9712:275845a98fa8

Use new form of calendar-read-date.
author Edward M. Reingold <reingold@emr.cs.iit.edu>
date Wed, 26 Oct 1994 15:31:27 +0000
parents be6a59921f85
children d62e29b1d7a2
files lisp/calendar/holidays.el
diffstat 1 files changed, 5 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calendar/holidays.el	Wed Oct 26 15:30:34 1994 +0000
+++ b/lisp/calendar/holidays.el	Wed Oct 26 15:31:27 1994 +0000
@@ -61,25 +61,11 @@
   (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)