Mercurial > emacs
diff lisp/calendar/cal-menu.el @ 90261:7beb78bc1f8e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 616-696)
- Add lisp/mh-e/.arch-inventory
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
- lisp/gnus/ChangeLog: Remove duplicate entry
* gnus--rel--5.10 (patch 147-181)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- Update from CVS: lisp/mml.el (mml-preview): Doc fix.
- Update from CVS: texi/message.texi: Fix default values.
- Update from CVS: texi/gnus.texi (RSS): Addition.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 16 Jan 2006 08:37:27 +0000 |
| parents | 5e2d3828e89f 757a5ae466cd |
| children | 5b7d410e31f9 |
line wrap: on
line diff
--- a/lisp/calendar/cal-menu.el Mon Jan 16 06:59:21 2006 +0000 +++ b/lisp/calendar/cal-menu.el Mon Jan 16 08:37:27 2006 +0000 @@ -1,6 +1,7 @@ ;;; cal-menu.el --- calendar functions for menu bar and popup menu support -;; Copyright (C) 1994, 1995, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> ;; Lara Rios <lrios@coewl.cen.uiuc.edu> @@ -38,10 +39,8 @@ ;;; Code: -(defvar date) (defvar displayed-month) (defvar displayed-year) -(defvar event) (eval-when-compile (require 'calendar)) @@ -325,9 +324,9 @@ (autoload 'check-calendar-holidays "holidays") (autoload 'diary-list-entries "diary-lib") -(defun calendar-mouse-holidays () +(defun calendar-mouse-holidays (&optional event) "Pop up menu of holidays for mouse selected date." - (interactive) + (interactive "e") (let* ((date (calendar-event-to-date)) (l (mapcar 'list (check-calendar-holidays date))) (selection @@ -340,12 +339,12 @@ (if l l '("None"))))))) (and selection (call-interactively selection)))) -(defun calendar-mouse-view-diary-entries (&optional date diary) +(defun calendar-mouse-view-diary-entries (&optional date diary event) "Pop up menu of diary entries for mouse-selected date. Use optional DATE and alternative file DIARY. Any holidays are shown if `holidays-in-diary-buffer' is t." - (interactive) + (interactive "i\ni\ne") (let* ((date (if date date (calendar-event-to-date))) (diary-file (if diary diary diary-file)) (diary-list-include-blanks nil) @@ -490,10 +489,10 @@ (calendar-mouse-goto-date (calendar-event-to-date)) (cal-tex-cursor-year-landscape nil))) -(defun calendar-mouse-print-dates () +(defun calendar-mouse-print-dates (&optional event) "Pop up menu of equivalent dates to mouse selected date." - (interactive) - (let ((date (calendar-event-to-date)) + (interactive "e") + (let* ((date (calendar-event-to-date)) (selection (cal-menu-x-popup-menu event @@ -524,8 +523,8 @@ (list (list (format "Chinese date: %s" (calendar-chinese-date-string date)))) -; (list '("Chinese date (select to echo Chinese date)" -; . calendar-mouse-chinese-date)) + ;; (list '("Chinese date (select to echo Chinese date)" + ;; . calendar-mouse-chinese-date)) (let ((c (calendar-coptic-date-string date))) (if (not (string-equal c "")) (list (list (format "Coptic date: %s" c))))) @@ -580,7 +579,7 @@ (let* ((selection (cal-menu-x-popup-menu event - (list (calendar-date-string date t nil) + (list (calendar-date-string (calendar-event-to-date t) t nil) (list "" '("Daily (1 page)" . cal-tex-mouse-day) @@ -603,7 +602,7 @@ (let* ((selection (cal-menu-x-popup-menu event - (list (calendar-date-string date t nil) + (list (calendar-date-string (calendar-event-to-date t) t nil) (list "" '("Filofax Daily (one-day-per-page)" . @@ -639,5 +638,5 @@ (provide 'cal-menu) -;;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9 +;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9 ;;; cal-menu.el ends here