Mercurial > emacs

comparison lisp/calendar/cal-menu.el @ 90228:fa0da9b57058

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 542-553) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 116-121) - Merge from emacs--cvs-trunk--0 - Update from CVS
author Miles Bader <miles@gnu.org>
date Mon, 19 Sep 2005 10:20:33 +0000
parents a3716f7538f2 24f7082aa7af
children aa89c814f853
comparison
equal deleted inserted replaced
90227:10fe5fadaf89 90228:fa0da9b57058
42 (defvar displayed-month) 42 (defvar displayed-month)
43 (defvar displayed-year) 43 (defvar displayed-year)
44 (defvar event) 44 (defvar event)
45 45
46 (eval-when-compile (require 'calendar)) 46 (eval-when-compile (require 'calendar))
47 (require 'easymenu)
48 47
49 (define-key calendar-mode-map [menu-bar edit] 'undefined) 48 (define-key calendar-mode-map [menu-bar edit] 'undefined)
50 (define-key calendar-mode-map [menu-bar search] 'undefined) 49 (define-key calendar-mode-map [menu-bar search] 'undefined)
51 50
52 (define-key calendar-mode-map [down-mouse-2] 'calendar-mouse-2-date-menu) 51 (define-key calendar-mode-map [down-mouse-2] 'calendar-mouse-2-date-menu)
321 (interactive) 320 (interactive)
322 (save-excursion 321 (save-excursion
323 (calendar-cursor-to-date (calendar-current-date)) 322 (calendar-cursor-to-date (calendar-current-date))
324 (calendar-cursor-holidays))) 323 (calendar-cursor-holidays)))
325 324
325 (autoload 'check-calendar-holidays "holidays")
326 (autoload 'diary-list-entries "diary-lib")
327
326 (defun calendar-mouse-holidays () 328 (defun calendar-mouse-holidays ()
327 "Pop up menu of holidays for mouse selected date." 329 "Pop up menu of holidays for mouse selected date."
328 (interactive) 330 (interactive)
329 (let* ((date (calendar-event-to-date)) 331 (let* ((date (calendar-event-to-date))
330 (l (mapcar '(lambda (x) (list x)) 332 (l (mapcar 'list (check-calendar-holidays date)))
331 (check-calendar-holidays date)))
332 (selection 333 (selection
333 (cal-menu-x-popup-menu 334 (cal-menu-x-popup-menu
334 event 335 event
335 (list 336 (list
336 (format "Holidays for %s" (calendar-date-string date)) 337 (format "Holidays for %s" (calendar-date-string date))
348 (let* ((date (if date date (calendar-event-to-date))) 349 (let* ((date (if date date (calendar-event-to-date)))
349 (diary-file (if diary diary diary-file)) 350 (diary-file (if diary diary diary-file))
350 (diary-list-include-blanks nil) 351 (diary-list-include-blanks nil)
351 (diary-display-hook 'ignore) 352 (diary-display-hook 'ignore)
352 (diary-entries 353 (diary-entries
353 (mapcar '(lambda (x) (split-string (car (cdr x)) "\^M\\|\n")) 354 (mapcar (lambda (x) (split-string (car (cdr x)) "\^M\\|\n"))
354 (list-diary-entries date 1))) 355 (diary-list-entries date 1)))
355 (holidays (if holidays-in-diary-buffer 356 (holidays (if holidays-in-diary-buffer
356 (mapcar '(lambda (x) (list x)) 357 (check-calendar-holidays date)))
357 (check-calendar-holidays date))))
358 (title (concat "Diary entries " 358 (title (concat "Diary entries "
359 (if diary (format "from %s " diary) "") 359 (if diary (format "from %s " diary) "")
360 "for " 360 "for "
361 (calendar-date-string date))) 361 (calendar-date-string date)))
362 (selection 362 (selection
363 (cal-menu-x-popup-menu 363 (cal-menu-x-popup-menu
364 event 364 event
365 (list title 365 (list title
366 (append 366 (append
367 (list title) 367 (list title)
368 (if holidays 368 (mapcar (lambda (x) (list (concat " " x))) holidays)
369 (mapcar '(lambda (x) (list (concat " " (car x))))
370 holidays))
371 (if holidays 369 (if holidays
372 (list "--shadow-etched-in" "--shadow-etched-in")) 370 (list "--shadow-etched-in" "--shadow-etched-in"))
373 (if diary-entries 371 (if diary-entries
374 (mapcar 'list (calendar-flatten diary-entries)) 372 (mapcar 'list (calendar-flatten diary-entries))
375 '("None"))))))) 373 '("None")))))))