diff options
| author | Glenn Morris <rgm@gnu.org> | 2003-08-03 14:00:03 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2003-08-03 14:00:03 +0000 |
| commit | 5bb7a2d5747389ef39a02ca04ac211a2e26f8782 (patch) | |
| tree | a1a9324ccb717108ad7dd80b42fd7a03e34477f3 /lisp/calendar | |
| parent | 2c8811d49bb3ee361884630438d13c660f1c12e5 (diff) | |
| download | emacs-5bb7a2d5747389ef39a02ca04ac211a2e26f8782.tar.gz | |
(displayed-month, displayed-year): Define for compiler.
(cal-menu-update): Adapt for new behaviour of `calendar-month-name' function.
Diffstat (limited to 'lisp/calendar')
| -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 @@ ;;; cal-menu.el --- calendar functions for menu bar and popup menu support -;; Copyright (C) 1994, 1995, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 2001, 2003 Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Lara Rios <lrios@coewl.cen.uiuc.edu> @@ -37,6 +37,9 @@ ;;; Code: +(defvar displayed-month) +(defvar displayed-year) + (eval-when-compile (require 'calendar)) (require 'easymenu) @@ -219,13 +222,13 @@ not available." (increment-calendar-month m2 y2 1) (if (= y1 y2) (format "%s-%s, %d" - (calendar-month-name m1 3) - (calendar-month-name m2 3) + (calendar-month-name m1 'abbrev) + (calendar-month-name m2 'abbrev) y2) (format "%s, %d-%s, %d" - (calendar-month-name m1 3) + (calendar-month-name m1 'abbrev) y1 - (calendar-month-name m2 3) + (calendar-month-name m2 'abbrev) y2))))) (define-key calendar-mode-map [menu-bar Holidays 3-month] `(,(format "For Window (%s)" title) |