[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v |
Date: |
Fri, 14 Mar 2008 03:18:01 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/14 03:18:00
Index: cal-menu.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-menu.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- cal-menu.el 13 Mar 2008 06:24:25 -0000 1.86
+++ cal-menu.el 14 Mar 2008 03:18:00 -0000 1.87
@@ -80,8 +80,6 @@
(declare-function calendar-print-chinese-date "cal-china" nil)
(declare-function calendar-goto-date "cal-move" (date))
-(defvar displayed-year)
-
(defconst cal-menu-moon-menu
'("Moon"
["Lunar Phases" calendar-phases-of-moon]))
@@ -130,6 +128,8 @@
(calendar-month-name (car my2) 'abbrev)
(cdr my2)))))
+(defvar displayed-year) ; from generate-calendar
+
(defconst cal-menu-holidays-menu
`("Holidays"
["For Cursor Date -" calendar-cursor-holidays
@@ -228,12 +228,17 @@
(defun calendar-event-to-date (&optional error)
"Date of last event.
If event is not on a specific date, signals an error if optional parameter
-ERROR is t, otherwise just returns nil."
+ERROR is non-nil, otherwise just returns nil."
(with-current-buffer
(window-buffer (posn-window (event-start last-input-event)))
(goto-char (posn-point (event-start last-input-event)))
(calendar-cursor-to-date error)))
+(defun calendar-mouse-goto-date (date)
+ "Goto DATE in the buffer specified by `last-input-event'."
+ (set-buffer (window-buffer (posn-window (event-start last-input-event))))
+ (calendar-goto-date date))
+
(defun calendar-mouse-sunrise/sunset ()
"Show sunrise/sunset times for mouse-selected date."
(interactive)
@@ -332,7 +337,7 @@
(defun cal-tex-mouse-week ()
"One page calendar for week indicated by cursor.
-Holidays are included if `cal-tex-holidays' is t."
+Holidays are included if `cal-tex-holidays' is non-nil."
(interactive)
(save-excursion
(calendar-mouse-goto-date (calendar-event-to-date))
@@ -348,7 +353,7 @@
(defun cal-tex-mouse-week-iso ()
"One page calendar for week indicated by cursor.
-Holidays are included if `cal-tex-holidays' is t."
+Holidays are included if `cal-tex-holidays' is non-nil."
(interactive)
(save-excursion
(calendar-mouse-goto-date (calendar-event-to-date))
@@ -478,11 +483,6 @@
(calendar-mouse-goto-date (calendar-event-to-date))
(calendar-print-chinese-date)))
-(defun calendar-mouse-goto-date (date)
- "Goto DATE in the buffer specified by `last-input-event'."
- (set-buffer (window-buffer (posn-window (event-start last-input-event))))
- (calendar-goto-date date))
-
(defun cal-menu-set-date-title (menu)
"Convert date of last event to title suitable for MENU."
(easy-menu-filter-return
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v, Glenn Morris, 2008/03/06
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v, Glenn Morris, 2008/03/08
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v, Glenn Morris, 2008/03/13
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v, Glenn Morris, 2008/03/14
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v, Glenn Morris, 2008/03/20
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v, Glenn Morris, 2008/03/25
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v, Glenn Morris, 2008/03/27
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v, Glenn Morris, 2008/03/31