[Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el

[Glenn Morris]

Index: emacs/lisp/calendar/cal-menu.el
diff -c emacs/lisp/calendar/cal-menu.el:1.50 
emacs/lisp/calendar/cal-menu.el:1.51
*** emacs/lisp/calendar/cal-menu.el:1.50        Sun Apr  6 16:21:26 2003
--- emacs/lisp/calendar/cal-menu.el     Sun Aug  3 10:00:03 2003
***************
*** 1,6 ****
  ;;; cal-menu.el --- calendar functions for menu bar and popup menu support
  
! ;; Copyright (C) 1994, 1995, 2001 Free Software Foundation, Inc.
  
  ;; Author: Edward M. Reingold <address@hidden>
  ;;    Lara Rios <address@hidden>
--- 1,6 ----
  ;;; cal-menu.el --- calendar functions for menu bar and popup menu support
  
! ;; Copyright (C) 1994, 1995, 2001, 2003 Free Software Foundation, Inc.
  
  ;; Author: Edward M. Reingold <address@hidden>
  ;;    Lara Rios <address@hidden>
***************
*** 37,42 ****
--- 37,45 ----
  
  ;;; Code:
  
+ (defvar displayed-month)
+ (defvar displayed-year)
+ 
  (eval-when-compile (require 'calendar))
  (require 'easymenu)
  
***************
*** 219,231 ****
                       (increment-calendar-month m2 y2 1)
                       (if (= y1 y2)
                           (format "%s-%s, %d"
!                                  (calendar-month-name m1 3)
!                                  (calendar-month-name m2 3)
                                   y2)
                         (format "%s, %d-%s, %d"
!                                (calendar-month-name m1 3)
                                 y1
!                                (calendar-month-name m2 3)
                                 y2)))))
                (define-key  calendar-mode-map [menu-bar Holidays 3-month]
                  `(,(format "For Window (%s)" title)
--- 222,234 ----
                       (increment-calendar-month m2 y2 1)
                       (if (= y1 y2)
                           (format "%s-%s, %d"
!                                  (calendar-month-name m1 'abbrev)
!                                  (calendar-month-name m2 'abbrev)
                                   y2)
                         (format "%s, %d-%s, %d"
!                                (calendar-month-name m1 'abbrev)
                                 y1
!                                (calendar-month-name m2 'abbrev)
                                 y2)))))
                (define-key  calendar-mode-map [menu-bar Holidays 3-month]
                  `(,(format "For Window (%s)" title)