/[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.51.2.1 by handa, Fri Apr 16 12:50:12 2004 UTC revision 1.51.2.2 by miles, Mon Jun 28 07:29:40 2004 UTC
# Line 66  Line 66 
66    '("Insert Hebrew" . calendar-mouse-insert-hebrew-diary-entry))    '("Insert Hebrew" . calendar-mouse-insert-hebrew-diary-entry))
67  (define-key calendar-mode-map [menu-bar diary isl]  (define-key calendar-mode-map [menu-bar diary isl]
68    '("Insert Islamic" . calendar-mouse-insert-islamic-diary-entry))    '("Insert Islamic" . calendar-mouse-insert-islamic-diary-entry))
69    (define-key calendar-mode-map [menu-bar diary baha]
70      '("Insert Baha'i" . calendar-mouse-insert-bahai-diary-entry))
71  (define-key calendar-mode-map [menu-bar diary cyc]  (define-key calendar-mode-map [menu-bar diary cyc]
72    '("Insert Cyclic" . insert-cyclic-diary-entry))    '("Insert Cyclic" . insert-cyclic-diary-entry))
73  (define-key calendar-mode-map [menu-bar diary blk]  (define-key calendar-mode-map [menu-bar diary blk]
# Line 110  Line 112 
112  (define-key calendar-mode-map [menu-bar goto islamic]  (define-key calendar-mode-map [menu-bar goto islamic]
113    '("Islamic Date" . calendar-goto-islamic-date))    '("Islamic Date" . calendar-goto-islamic-date))
114  (define-key calendar-mode-map [menu-bar goto persian]  (define-key calendar-mode-map [menu-bar goto persian]
115      '("Baha'i Date" . calendar-goto-bahai-date))
116    (define-key calendar-mode-map [menu-bar goto persian]
117    '("Persian Date" . calendar-goto-persian-date))    '("Persian Date" . calendar-goto-persian-date))
118  (define-key calendar-mode-map [menu-bar goto hebrew]  (define-key calendar-mode-map [menu-bar goto hebrew]
119    '("Hebrew Date" . calendar-goto-hebrew-date))    '("Hebrew Date" . calendar-goto-hebrew-date))
# Line 288  ERROR is t, otherwise just returns nil." Line 292  ERROR is t, otherwise just returns nil."
292                        '("Yearly" . insert-yearly-islamic-diary-entry))))))                        '("Yearly" . insert-yearly-islamic-diary-entry))))))
293      (and islamic-selection (call-interactively islamic-selection))))      (and islamic-selection (call-interactively islamic-selection))))
294    
295    (defun calendar-mouse-insert-bahai-diary-entry (event)
296      "Pop up menu to insert an Baha'i-date diary entry."
297      (interactive "e")
298      (let ((bahai-selection
299             (x-popup-menu
300              event
301              (list "Baha'i insert menu"
302                    (list (calendar-bahai-date-string (calendar-cursor-to-date))
303                          '("One time" . insert-bahai-diary-entry)
304                          '("Monthly" . insert-monthly-bahai-diary-entry)
305                          '("Yearly" . insert-yearly-bahai-diary-entry))))))
306        (and bahai-selection (call-interactively bahai-selection))))
307    
308  (defun calendar-mouse-sunrise/sunset ()  (defun calendar-mouse-sunrise/sunset ()
309    "Show sunrise/sunset times for mouse-selected date."    "Show sunrise/sunset times for mouse-selected date."
310    (interactive)    (interactive)
# Line 496  The output is in landscape format, one m Line 513  The output is in landscape format, one m
513               (list (format "Hebrew date (before sunset): %s"               (list (format "Hebrew date (before sunset): %s"
514                             (calendar-hebrew-date-string date)))                             (calendar-hebrew-date-string date)))
515               (list (format "Persian date: %s"               (list (format "Persian date: %s"
516                             (calendar-persian-date-string date))))                             (calendar-persian-date-string date)))
517                 (list (format "Baha'i date (before sunset): %s"
518                               (calendar-bahai-date-string date))))
519              (let ((i (calendar-islamic-date-string date)))              (let ((i (calendar-islamic-date-string date)))
520                (if (not (string-equal i ""))                (if (not (string-equal i ""))
521                    (list (list (format "Islamic date (before sunset): %s" i)))))                    (list (list (format "Islamic date (before sunset): %s" i)))))

Legend:
Removed from v.1.51.2.1  
changed lines
  Added in v.1.51.2.2

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