[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
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el |
Date: |
Wed, 14 Sep 2005 12:01:59 -0400 |
Index: emacs/lisp/calendar/cal-menu.el
diff -c emacs/lisp/calendar/cal-menu.el:1.59
emacs/lisp/calendar/cal-menu.el:1.60
*** emacs/lisp/calendar/cal-menu.el:1.59 Fri Aug 26 11:21:57 2005
--- emacs/lisp/calendar/cal-menu.el Wed Sep 14 16:01:57 2005
***************
*** 44,50 ****
(defvar event)
(eval-when-compile (require 'calendar))
- (require 'easymenu)
(define-key calendar-mode-map [menu-bar edit] 'undefined)
(define-key calendar-mode-map [menu-bar search] 'undefined)
--- 44,49 ----
***************
*** 323,334 ****
(calendar-cursor-to-date (calendar-current-date))
(calendar-cursor-holidays)))
(defun calendar-mouse-holidays ()
"Pop up menu of holidays for mouse selected date."
(interactive)
(let* ((date (calendar-event-to-date))
! (l (mapcar '(lambda (x) (list x))
! (check-calendar-holidays date)))
(selection
(cal-menu-x-popup-menu
event
--- 322,335 ----
(calendar-cursor-to-date (calendar-current-date))
(calendar-cursor-holidays)))
+ (autoload 'check-calendar-holidays "holidays")
+ (autoload 'diary-list-entries "diary-lib")
+
(defun calendar-mouse-holidays ()
"Pop up menu of holidays for mouse selected date."
(interactive)
(let* ((date (calendar-event-to-date))
! (l (mapcar 'list (check-calendar-holidays date)))
(selection
(cal-menu-x-popup-menu
event
***************
*** 350,360 ****
(diary-list-include-blanks nil)
(diary-display-hook 'ignore)
(diary-entries
! (mapcar '(lambda (x) (split-string (car (cdr x)) "\^M\\|\n"))
! (list-diary-entries date 1)))
(holidays (if holidays-in-diary-buffer
! (mapcar '(lambda (x) (list x))
! (check-calendar-holidays date))))
(title (concat "Diary entries "
(if diary (format "from %s " diary) "")
"for "
--- 351,360 ----
(diary-list-include-blanks nil)
(diary-display-hook 'ignore)
(diary-entries
! (mapcar (lambda (x) (split-string (car (cdr x)) "\^M\\|\n"))
! (diary-list-entries date 1)))
(holidays (if holidays-in-diary-buffer
! (check-calendar-holidays date)))
(title (concat "Diary entries "
(if diary (format "from %s " diary) "")
"for "
***************
*** 365,373 ****
(list title
(append
(list title)
! (if holidays
! (mapcar '(lambda (x) (list (concat " " (car x))))
! holidays))
(if holidays
(list "--shadow-etched-in" "--shadow-etched-in"))
(if diary-entries
--- 365,371 ----
(list title
(append
(list title)
! (mapcar (lambda (x) (list (concat " " x))) holidays)
(if holidays
(list "--shadow-etched-in" "--shadow-etched-in"))
(if diary-entries
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el,
Stefan Monnier <=