From: Edward M. Reingold <reingold@emr.cs.iit.edu>
Date: Mon, 11 May 1998 17:18:04 +0000 (+0000)
Subject: Minor fix to earlier changes today.
X-Git-Tag: emacs-20.3~1046
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07342a647f620bc8846937d7a51db885fe98e4f2;p=emacs.git

Minor fix to earlier changes today.
---

diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index e6c58109eda..2dc354dd662 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -195,6 +195,10 @@
             (setq l (cons ["Mark Holidays" mark-calendar-holidays t]
                           (cons ["Unmark Calendar" calendar-unmark t] l)))
             (easy-menu-change nil "holidays" (nreverse l))
+            (define-key calendar-mode-map [menu-bar holidays today]
+                `(,(format "For Today (%s)"
+                           (calendar-date-string (calendar-current-date) t t))
+                  . cal-menu-today-holidays))
             (let ((title
                    (let ((m1 displayed-month)
                          (y1 displayed-year)
@@ -212,7 +216,7 @@
                                y1
                                (calendar-month-name m2 3)
                                y2)))))
-              (define-key  calendar-mode-map [menu-bar holidays 3-day]
+              (define-key  calendar-mode-map [menu-bar holidays 3-month]
                 `(,(format "For Current Window (%s)" title)
                   . list-calendar-holidays)))
             (let ((date (calendar-cursor-to-date)))
@@ -266,6 +270,13 @@ ERROR is t, otherwise just returns nil."
     (calendar-mouse-goto-date (calendar-event-to-date))
     (calendar-sunrise-sunset)))
 
+(defun cal-menu-today-holidays ()
+  "Show holidays for today's date."
+  (interactive)
+  (save-excursion
+    (calendar-cursor-to-date (calendar-current-date))
+    (calendar-cursor-holidays)))
+
 (defun calendar-mouse-holidays ()
   "Show holidays for mouse-selected date."
   (interactive)