Changeset 3894 for trunk/lisp/calendar/cal-menu.el

Timestamp:

10/02/05 09:47:43 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/calendar/cal-menu.el (modified) (4 diffs)

trunk/lisp/calendar/cal-menu.el

@@ -45 +45 @@
-
-(eval-when-compile (require 'calendar))
-(require 'easymenu)
-
-(define-key calendar-mode-map [menu-bar edit] 'undefined)
@@ -324 +323 @@
-    (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))
-
-
+
-         (selection
-          (cal-menu-x-popup-menu
@@ -351 +352 @@
-         (diary-display-hook 'ignore)
-         (diary-entries
-'
-list-diary
+
+diary-list
-         (holidays (if holidays-in-diary-buffer
-
-
+
-         (title (concat "Diary entries "
-                        (if diary (format "from %s " diary) "")
@@ -366 +366 @@
-                 (append
-                  (list title)
-
-
-
+
-                  (if holidays
-                      (list "--shadow-etched-in" "--shadow-etched-in"))