diff options
| author | Edward M. Reingold | 1998-05-11 17:18:04 +0000 |
|---|---|---|
| committer | Edward M. Reingold | 1998-05-11 17:18:04 +0000 |
| commit | 07342a647f620bc8846937d7a51db885fe98e4f2 (patch) | |
| tree | 214171120f1c446c3cc1ef614f743a6933cbfd24 /lisp | |
| parent | 09cacf9c793d9094b1891e325682ffc6252a978d (diff) | |
| download | emacs-07342a647f620bc8846937d7a51db885fe98e4f2.tar.gz emacs-07342a647f620bc8846937d7a51db885fe98e4f2.zip | |
Minor fix to earlier changes today.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/calendar/cal-menu.el | 13 |
1 files changed, 12 insertions, 1 deletions
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 @@ | |||
| 195 | (setq l (cons ["Mark Holidays" mark-calendar-holidays t] | 195 | (setq l (cons ["Mark Holidays" mark-calendar-holidays t] |
| 196 | (cons ["Unmark Calendar" calendar-unmark t] l))) | 196 | (cons ["Unmark Calendar" calendar-unmark t] l))) |
| 197 | (easy-menu-change nil "holidays" (nreverse l)) | 197 | (easy-menu-change nil "holidays" (nreverse l)) |
| 198 | (define-key calendar-mode-map [menu-bar holidays today] | ||
| 199 | `(,(format "For Today (%s)" | ||
| 200 | (calendar-date-string (calendar-current-date) t t)) | ||
| 201 | . cal-menu-today-holidays)) | ||
| 198 | (let ((title | 202 | (let ((title |
| 199 | (let ((m1 displayed-month) | 203 | (let ((m1 displayed-month) |
| 200 | (y1 displayed-year) | 204 | (y1 displayed-year) |
| @@ -212,7 +216,7 @@ | |||
| 212 | y1 | 216 | y1 |
| 213 | (calendar-month-name m2 3) | 217 | (calendar-month-name m2 3) |
| 214 | y2))))) | 218 | y2))))) |
| 215 | (define-key calendar-mode-map [menu-bar holidays 3-day] | 219 | (define-key calendar-mode-map [menu-bar holidays 3-month] |
| 216 | `(,(format "For Current Window (%s)" title) | 220 | `(,(format "For Current Window (%s)" title) |
| 217 | . list-calendar-holidays))) | 221 | . list-calendar-holidays))) |
| 218 | (let ((date (calendar-cursor-to-date))) | 222 | (let ((date (calendar-cursor-to-date))) |
| @@ -266,6 +270,13 @@ ERROR is t, otherwise just returns nil." | |||
| 266 | (calendar-mouse-goto-date (calendar-event-to-date)) | 270 | (calendar-mouse-goto-date (calendar-event-to-date)) |
| 267 | (calendar-sunrise-sunset))) | 271 | (calendar-sunrise-sunset))) |
| 268 | 272 | ||
| 273 | (defun cal-menu-today-holidays () | ||
| 274 | "Show holidays for today's date." | ||
| 275 | (interactive) | ||
| 276 | (save-excursion | ||
| 277 | (calendar-cursor-to-date (calendar-current-date)) | ||
| 278 | (calendar-cursor-holidays))) | ||
| 279 | |||
| 269 | (defun calendar-mouse-holidays () | 280 | (defun calendar-mouse-holidays () |
| 270 | "Show holidays for mouse-selected date." | 281 | "Show holidays for mouse-selected date." |
| 271 | (interactive) | 282 | (interactive) |