[Emacs-diffs] Changes to emacs/lisp/calendar/cal-menu.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/calendar/cal-menu.el
diff -c emacs/lisp/calendar/cal-menu.el:1.51.2.1 
emacs/lisp/calendar/cal-menu.el:1.51.2.2
*** emacs/lisp/calendar/cal-menu.el:1.51.2.1    Fri Apr 16 12:50:12 2004
--- emacs/lisp/calendar/cal-menu.el     Mon Jun 28 07:29:40 2004
***************
*** 66,71 ****
--- 66,73 ----
    '("Insert Hebrew" . calendar-mouse-insert-hebrew-diary-entry))
  (define-key calendar-mode-map [menu-bar diary isl]
    '("Insert Islamic" . calendar-mouse-insert-islamic-diary-entry))
+ (define-key calendar-mode-map [menu-bar diary baha]
+   '("Insert Baha'i" . calendar-mouse-insert-bahai-diary-entry))
  (define-key calendar-mode-map [menu-bar diary cyc]
    '("Insert Cyclic" . insert-cyclic-diary-entry))
  (define-key calendar-mode-map [menu-bar diary blk]
***************
*** 110,115 ****
--- 112,119 ----
  (define-key calendar-mode-map [menu-bar goto islamic]
    '("Islamic Date" . calendar-goto-islamic-date))
  (define-key calendar-mode-map [menu-bar goto persian]
+   '("Baha'i Date" . calendar-goto-bahai-date))
+ (define-key calendar-mode-map [menu-bar goto persian]
    '("Persian Date" . calendar-goto-persian-date))
  (define-key calendar-mode-map [menu-bar goto hebrew]
    '("Hebrew Date" . calendar-goto-hebrew-date))
***************
*** 288,293 ****
--- 292,310 ----
                        '("Yearly" . insert-yearly-islamic-diary-entry))))))
      (and islamic-selection (call-interactively islamic-selection))))
  
+ (defun calendar-mouse-insert-bahai-diary-entry (event)
+   "Pop up menu to insert an Baha'i-date diary entry."
+   (interactive "e")
+   (let ((bahai-selection
+          (x-popup-menu
+           event
+           (list "Baha'i insert menu"
+                 (list (calendar-bahai-date-string (calendar-cursor-to-date))
+                       '("One time" . insert-bahai-diary-entry)
+                       '("Monthly" . insert-monthly-bahai-diary-entry)
+                       '("Yearly" . insert-yearly-bahai-diary-entry))))))
+     (and bahai-selection (call-interactively bahai-selection))))
+ 
  (defun calendar-mouse-sunrise/sunset ()
    "Show sunrise/sunset times for mouse-selected date."
    (interactive)
***************
*** 496,502 ****
               (list (format "Hebrew date (before sunset): %s"
                             (calendar-hebrew-date-string date)))
               (list (format "Persian date: %s"
!                            (calendar-persian-date-string date))))
              (let ((i (calendar-islamic-date-string date)))
                (if (not (string-equal i ""))
                    (list (list (format "Islamic date (before sunset): %s" 
i)))))
--- 513,521 ----
               (list (format "Hebrew date (before sunset): %s"
                             (calendar-hebrew-date-string date)))
               (list (format "Persian date: %s"
!                            (calendar-persian-date-string date)))
!              (list (format "Baha'i date (before sunset): %s"
!                            (calendar-bahai-date-string date))))
              (let ((i (calendar-islamic-date-string date)))
                (if (not (string-equal i ""))
                    (list (list (format "Islamic date (before sunset): %s" 
i)))))