diff options
| -rw-r--r-- | lisp/calendar/cal-menu.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el index b74eeed1a05..3b973586ca0 100644 --- a/lisp/calendar/cal-menu.el +++ b/lisp/calendar/cal-menu.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cal-menu.el --- calendar functions for menu bar and popup menu support | 1 | ;;; cal-menu.el --- calendar functions for menu bar and popup menu support |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994, 1995, 2001 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994, 1995, 2001, 2003 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> | 5 | ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> |
| 6 | ;; Lara Rios <lrios@coewl.cen.uiuc.edu> | 6 | ;; Lara Rios <lrios@coewl.cen.uiuc.edu> |
| @@ -37,6 +37,9 @@ | |||
| 37 | 37 | ||
| 38 | ;;; Code: | 38 | ;;; Code: |
| 39 | 39 | ||
| 40 | (defvar displayed-month) | ||
| 41 | (defvar displayed-year) | ||
| 42 | |||
| 40 | (eval-when-compile (require 'calendar)) | 43 | (eval-when-compile (require 'calendar)) |
| 41 | (require 'easymenu) | 44 | (require 'easymenu) |
| 42 | 45 | ||
| @@ -219,13 +222,13 @@ not available." | |||
| 219 | (increment-calendar-month m2 y2 1) | 222 | (increment-calendar-month m2 y2 1) |
| 220 | (if (= y1 y2) | 223 | (if (= y1 y2) |
| 221 | (format "%s-%s, %d" | 224 | (format "%s-%s, %d" |
| 222 | (calendar-month-name m1 3) | 225 | (calendar-month-name m1 'abbrev) |
| 223 | (calendar-month-name m2 3) | 226 | (calendar-month-name m2 'abbrev) |
| 224 | y2) | 227 | y2) |
| 225 | (format "%s, %d-%s, %d" | 228 | (format "%s, %d-%s, %d" |
| 226 | (calendar-month-name m1 3) | 229 | (calendar-month-name m1 'abbrev) |
| 227 | y1 | 230 | y1 |
| 228 | (calendar-month-name m2 3) | 231 | (calendar-month-name m2 'abbrev) |
| 229 | y2))))) | 232 | y2))))) |
| 230 | (define-key calendar-mode-map [menu-bar Holidays 3-month] | 233 | (define-key calendar-mode-map [menu-bar Holidays 3-month] |
| 231 | `(,(format "For Window (%s)" title) | 234 | `(,(format "For Window (%s)" title) |