Mercurial > emacs

comparison lisp/calendar/cal-menu.el @ 96304:b56931e7df3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(calendar-mouse-holidays): Remove function. (cal-menu-context-mouse-menu): Use calendar-cursor-holidays.
author Glenn Morris <rgm@gnu.org>
date Thu, 26 Jun 2008 04:54:12 +0000
parents 7653ed8392c5
children fd9cd4ce5935
comparison
equal deleted inserted replaced
96303:ddedcecb18ef 96304:b56931e7df3b
159 `(if (display-popup-menus-p) 159 `(if (display-popup-menus-p)
160 (x-popup-menu ,event (list ,title (append (list ,title) ,@body))) 160 (x-popup-menu ,event (list ,title (append (list ,title) ,@body)))
161 (error "Popup menus are not available on this system"))) 161 (error "Popup menus are not available on this system")))
162 162
163 (autoload 'calendar-check-holidays "holidays") 163 (autoload 'calendar-check-holidays "holidays")
164
165 (defun calendar-mouse-holidays (&optional event)
166 "Pop up menu of holidays for mouse selected date.
167 EVENT is the event that invoked this command."
168 (interactive "e")
169 (let* ((date (calendar-cursor-to-date nil event))
170 (title (format "Holidays for %s" (calendar-date-string date)))
171 (selection (cal-menu-x-popup-menu event title
172 (or (mapcar 'list (calendar-check-holidays date))
173 '("None")))))
174 (and selection (call-interactively selection))))
175
176 (autoload 'diary-list-entries "diary-lib") 164 (autoload 'diary-list-entries "diary-lib")
177 (defvar diary-show-holidays-flag) ; only called from calendar.el 165 (defvar diary-show-holidays-flag) ; only called from calendar.el
178 166
179 (defun calendar-mouse-view-diary-entries (&optional date diary event) 167 (defun calendar-mouse-view-diary-entries (&optional date diary event)
180 "Pop up menu of diary entries for mouse-selected date. 168 "Pop up menu of diary entries for mouse-selected date.
217 205
218 (easy-menu-define cal-menu-context-mouse-menu nil 206 (easy-menu-define cal-menu-context-mouse-menu nil
219 "Pop up menu for Mouse-2 for selected date in the calendar window." 207 "Pop up menu for Mouse-2 for selected date in the calendar window."
220 '("cal-menu-mouse2" :filter cal-menu-set-date-title 208 '("cal-menu-mouse2" :filter cal-menu-set-date-title
221 "--" 209 "--"
222 ["Holidays" calendar-mouse-holidays] 210 ["Holidays" calendar-cursor-holidays]
223 ["Mark date" calendar-set-mark] 211 ["Mark date" calendar-set-mark]
224 ["Sunrise/sunset" calendar-sunrise-sunset] 212 ["Sunrise/sunset" calendar-sunrise-sunset]
225 ["Other calendars" calendar-print-other-dates] 213 ["Other calendars" calendar-print-other-dates]
226 ;; FIXME there is a bug with last-nonmenu-event and submenus. 214 ;; FIXME there is a bug (#447) with last-nonmenu-event and submenus.
227 ;; These currently don't work if called without calendar window selected. 215 ;; These currently don't work if called without calendar window selected.
228 ("Prepare LaTeX buffer" 216 ("Prepare LaTeX buffer"
229 ["Daily (1 page)" cal-tex-cursor-day] 217 ["Daily (1 page)" cal-tex-cursor-day]
230 ["Weekly (1 page)" cal-tex-cursor-week] 218 ["Weekly (1 page)" cal-tex-cursor-week]
231 ["Weekly (2 pages)" cal-tex-cursor-week2] 219 ["Weekly (2 pages)" cal-tex-cursor-week2]