(displayed-month, displayed-year): Define for compiler.

(cal-menu-update): Adapt for new behaviour of `calendar-month-name' function.

diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index b74eeed1a05ff10d58faca73cad7e8be5b0870f4..3b973586ca03acc7e9606c438a6370afaa46136a 100644 (file)
--- 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)