[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, 28 Mar 2008 02:45:40 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/28 02:45:40
Index: cal-menu.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-menu.el,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- cal-menu.el 26 Mar 2008 03:11:38 -0000 1.90
+++ cal-menu.el 28 Mar 2008 02:45:39 -0000 1.91
@@ -102,8 +102,7 @@
(push (vector (format "hol-year-%d" i)
`(lambda ()
(interactive)
- (holiday-list (+ displayed-year ,(- i 5))
- (+ displayed-year ,(- i 5))))
+ (holiday-list (+ displayed-year ,(- i 5))))
:label `(format "For Year %d"
(+ displayed-year ,(- i 5))))
l))
@@ -162,20 +161,17 @@
(defun cal-menu-list-holidays-year ()
"Display a list of the holidays of the selected date's year."
(interactive)
- (let ((year (extract-calendar-year (calendar-cursor-to-date))))
- (holiday-list year year)))
+ (holiday-list (extract-calendar-year (calendar-cursor-to-date))))
(defun cal-menu-list-holidays-following-year ()
"Display a list of the holidays of the following year."
(interactive)
- (let ((year (1+ (extract-calendar-year (calendar-cursor-to-date)))))
- (holiday-list year year)))
+ (holiday-list (1+ (extract-calendar-year (calendar-cursor-to-date)))))
(defun cal-menu-list-holidays-previous-year ()
"Display a list of the holidays of the previous year."
(interactive)
- (let ((year (1- (extract-calendar-year (calendar-cursor-to-date)))))
- (holiday-list year year)))
+ (holiday-list (1- (extract-calendar-year (calendar-cursor-to-date)))))
(defun calendar-event-to-date (&optional error)
"Date of last event.
@@ -206,22 +202,23 @@
(calendar-cursor-holidays)))
(autoload 'calendar-check-holidays "holidays")
-(autoload 'diary-list-entries "diary-lib")
(defun calendar-mouse-holidays (&optional event)
"Pop up menu of holidays for mouse selected date.
EVENT is the event that invoked this command."
(interactive "e")
(let* ((date (calendar-event-to-date))
- (l (mapcar 'list (calendar-check-holidays date)))
(title (format "Holidays for %s" (calendar-date-string date)))
(selection
(cal-menu-x-popup-menu
event
(list title
- (append (list title) (or l '("None")))))))
+ (append (list title)
+ (or (mapcar 'list (calendar-check-holidays date))
+ '("None")))))))
(and selection (call-interactively selection))))
+(autoload 'diary-list-entries "diary-lib")
(defvar holidays-in-diary-buffer) ; only called from calendar.el
(defun calendar-mouse-view-diary-entries (&optional date diary event)
- [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, 2008/03/13
- [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 <=
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,v, Glenn Morris, 2008/03/31