Mercurial > emacs
changeset 52116:3132ffb5a7ab
(displayed-month, displayed-year): Define for compiler.
(cal-menu-update): Adapt for new behaviour of `calendar-month-name' function.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 03 Aug 2003 14:00:03 +0000 |
| parents | 60ffdeba6e0e |
| children | e8a77526768b |
| files | lisp/calendar/cal-menu.el |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/cal-menu.el Sun Aug 03 13:59:13 2003 +0000 +++ b/lisp/calendar/cal-menu.el Sun Aug 03 14:00:03 2003 +0000 @@ -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 @@ (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)