/[emacs]/emacs/lisp/calendar/cal-menu.el
ViewVC logotype

Diff of /emacs/lisp/calendar/cal-menu.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.62 by gm, Sat Oct 8 04:49:27 2005 UTC revision 1.63 by monnier, Tue Nov 1 19:55:19 2005 UTC
# Line 38  Line 38 
38    
39  ;;; Code:  ;;; Code:
40    
 (defvar date)  
41  (defvar displayed-month)  (defvar displayed-month)
42  (defvar displayed-year)  (defvar displayed-year)
 (defvar event)  
43    
44  (eval-when-compile (require 'calendar))  (eval-when-compile (require 'calendar))
45    
# Line 325  ERROR is t, otherwise just returns nil." Line 323  ERROR is t, otherwise just returns nil."
323  (autoload 'check-calendar-holidays "holidays")  (autoload 'check-calendar-holidays "holidays")
324  (autoload 'diary-list-entries "diary-lib")  (autoload 'diary-list-entries "diary-lib")
325    
326  (defun calendar-mouse-holidays ()  (defun calendar-mouse-holidays (&optional event)
327    "Pop up menu of holidays for mouse selected date."    "Pop up menu of holidays for mouse selected date."
328    (interactive)    (interactive "e")
329    (let* ((date (calendar-event-to-date))    (let* ((date (calendar-event-to-date))
330           (l (mapcar 'list (check-calendar-holidays date)))           (l (mapcar 'list (check-calendar-holidays date)))
331           (selection           (selection
# Line 340  ERROR is t, otherwise just returns nil." Line 338  ERROR is t, otherwise just returns nil."
338               (if l l '("None")))))))               (if l l '("None")))))))
339      (and selection (call-interactively selection))))      (and selection (call-interactively selection))))
340    
341  (defun calendar-mouse-view-diary-entries (&optional date diary)  (defun calendar-mouse-view-diary-entries (&optional date diary event)
342    "Pop up menu of diary entries for mouse-selected date.    "Pop up menu of diary entries for mouse-selected date.
343  Use optional DATE and alternative file DIARY.  Use optional DATE and alternative file DIARY.
344    
345  Any holidays are shown if `holidays-in-diary-buffer' is t."  Any holidays are shown if `holidays-in-diary-buffer' is t."
346    (interactive)    (interactive "i\ni\ne")
347    (let* ((date (if date date (calendar-event-to-date)))    (let* ((date (if date date (calendar-event-to-date)))
348           (diary-file (if diary diary diary-file))           (diary-file (if diary diary diary-file))
349           (diary-list-include-blanks nil)           (diary-list-include-blanks nil)
# Line 490  The output is in landscape format, one m Line 488  The output is in landscape format, one m
488      (calendar-mouse-goto-date (calendar-event-to-date))      (calendar-mouse-goto-date (calendar-event-to-date))
489      (cal-tex-cursor-year-landscape nil)))      (cal-tex-cursor-year-landscape nil)))
490    
491  (defun calendar-mouse-print-dates ()  (defun calendar-mouse-print-dates (&optional event)
492    "Pop up menu of equivalent dates to mouse selected date."    "Pop up menu of equivalent dates to mouse selected date."
493    (interactive)    (interactive "e")
494    (let ((date (calendar-event-to-date))    (let* ((date (calendar-event-to-date))
495          (selection          (selection
496           (cal-menu-x-popup-menu           (cal-menu-x-popup-menu
497            event            event
# Line 524  The output is in landscape format, one m Line 522  The output is in landscape format, one m
522              (list              (list
523               (list (format "Chinese date: %s"               (list (format "Chinese date: %s"
524                             (calendar-chinese-date-string date))))                             (calendar-chinese-date-string date))))
525  ;            (list '("Chinese date (select to echo Chinese date)"              ;; (list '("Chinese date (select to echo Chinese date)"
526  ;                    . calendar-mouse-chinese-date))              ;;         . calendar-mouse-chinese-date))
527              (let ((c (calendar-coptic-date-string date)))              (let ((c (calendar-coptic-date-string date)))
528                (if (not (string-equal c ""))                (if (not (string-equal c ""))
529                    (list (list (format "Coptic date: %s" c)))))                    (list (list (format "Coptic date: %s" c)))))
# Line 580  The output is in landscape format, one m Line 578  The output is in landscape format, one m
578    (let* ((selection    (let* ((selection
579            (cal-menu-x-popup-menu            (cal-menu-x-popup-menu
580             event             event
581             (list (calendar-date-string date t nil)             (list (calendar-date-string (calendar-event-to-date t) t nil)
582                   (list                   (list
583                    ""                    ""
584                    '("Daily (1 page)" . cal-tex-mouse-day)                    '("Daily (1 page)" . cal-tex-mouse-day)
# Line 603  The output is in landscape format, one m Line 601  The output is in landscape format, one m
601    (let* ((selection    (let* ((selection
602            (cal-menu-x-popup-menu            (cal-menu-x-popup-menu
603             event             event
604             (list (calendar-date-string date t nil)             (list (calendar-date-string (calendar-event-to-date t) t nil)
605                   (list                   (list
606                    ""                    ""
607                    '("Filofax Daily (one-day-per-page)" .                    '("Filofax Daily (one-day-per-page)" .
# Line 639  The output is in landscape format, one m Line 637  The output is in landscape format, one m
637    
638  (provide 'cal-menu)  (provide 'cal-menu)
639    
640  ;;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9  ;; arch-tag: aa81cf73-ce89-48a4-97ec-9ef861e87fe9
641  ;;; cal-menu.el ends here  ;;; cal-menu.el ends here

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.63

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26