(makefile-insert-special-target,

[gnu-emacs] / lisp / calendar / cal-menu.el

diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 4b00d3e9bd397f204cbc4cc8aaefcda3b90fb281..3baaa376323d9be1c81e047bf3b71aecb31de91e 100644 (file)
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -37,6 +37,7 @@
 ;;; Code:
 
 (define-key calendar-mode-map [menu-bar edit] 'undefined)
+(define-key calendar-mode-map [menu-bar search] 'undefined)
 
 (define-key calendar-mode-map [down-mouse-2] 'calendar-mouse-2-date-menu)
 (define-key calendar-mode-map [mouse-2] 'ignore)
@@ -197,10 +198,11 @@
 (put 'cal-tex-cursor-day 'menu-enable '(calendar-cursor-to-date))
 (put 'cal-tex-cursor-week 'menu-enable '(calendar-cursor-to-date))
 (put 'cal-tex-cursor-week2 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week3 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week4 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week5 'menu-enable '(calendar-cursor-to-date))
-(put 'cal-tex-cursor-week6 'menu-enable '(calendar-cursor-to-date))
+(put 'cal-tex-cursor-week-iso 'menu-enable '(calendar-cursor-to-date))
+(put 'cal-tex-cursor-week-monday 'menu-enable '(calendar-cursor-to-date))
+(put 'cal-tex-cursor-filofax-2week
+     'menu-enable '(calendar-cursor-to-date))
+(put 'cal-tex-cursor-filofax-week 'menu-enable '(calendar-cursor-to-date))
 (put 'cal-tex-cursor-month 'menu-enable '(calendar-cursor-to-date))
 (put 'cal-tex-cursor-month-landscape 'menu-enable '(calendar-cursor-to-date))
 (put 'cal-tex-cursor-year 'menu-enable '(calendar-cursor-to-date))
@@ -306,34 +308,34 @@ The printed output will be on two pages."
     (calendar-goto-date (calendar-event-to-date))
     (cal-tex-cursor-week2 nil)))
 
-(defun cal-tex-mouse-week3 ()
+(defun cal-tex-mouse-week-iso ()
   "One page calendar for week indicated by cursor.
 Holidays are included if `cal-tex-holidays' is t."
   (interactive)
   (save-excursion
     (calendar-goto-date (calendar-event-to-date))
-    (cal-tex-cursor-week3 nil)))
+    (cal-tex-cursor-week-iso nil)))
 
-(defun cal-tex-mouse-week4 ()
+(defun cal-tex-mouse-week-monday ()
   "One page calendar for week indicated by cursor."
   (interactive)
   (save-excursion
     (calendar-goto-date (calendar-event-to-date))
-    (cal-tex-cursor-week4 nil)))
+    (cal-tex-cursor-week-monday nil)))
 
-(defun cal-tex-mouse-week5 ()
+(defun cal-tex-mouse-filofax-2week ()
   "One page Filofax calendar for week indicated by cursor."
   (interactive)
   (save-excursion
     (calendar-goto-date (calendar-event-to-date))
-    (cal-tex-cursor-week5 nil)))
+    (cal-tex-cursor-filofax-2week nil)))
 
-(defun cal-tex-mouse-week6 ()
+(defun cal-tex-mouse-filofax-week ()
   "Two page Filofax calendar for week indicated by cursor."
   (interactive)
   (save-excursion
     (calendar-goto-date (calendar-event-to-date))
-    (cal-tex-cursor-week6 nil)))
+    (cal-tex-cursor-filofax-week nil)))
 
 (defun cal-tex-mouse-month ()
   "Make a buffer with LaTeX commands for the month cursor is on.
@@ -380,7 +382,7 @@ The output is in landscape format, one month to a page."
          (x-popup-menu
           event
           (list
-           "Date Menu"
+           (concat (calendar-date-string date) " (Gregorian)")
            (append
             (list
              (concat (calendar-date-string date) " (Gregorian)")
@@ -396,12 +398,11 @@ The output is in landscape format, one month to a page."
             (let ((i (calendar-islamic-date-string date)))
               (if (not (string-equal i ""))
                   (list (list (format "Islamic date (before sunset): %s" i)))))
-;      too slow to leave this in all the time!
-;       (list
-;        (list (format "Chinese date: %s" (calendar-chinese-date-string date))))
-;       so instead,
-            (list '("Chinese date (select to echo Chinese date)"
-                    . calendar-mouse-chinese-date))
+            (list
+             (list (format "Chinese date: %s"
+                           (calendar-chinese-date-string 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)))))
@@ -431,9 +432,9 @@ The output is in landscape format, one month to a page."
          (selection
           (x-popup-menu
            event
-           (list "Menu"
+           (list (calendar-date-string date t nil)
                  (list
-                  (calendar-date-string date t nil)
+                  ""
                   '("Holidays" . calendar-mouse-holidays)
                   '("Mark date" . calendar-mouse-set-mark)
                   '("Sunrise/sunset" . calendar-mouse-sunrise/sunset)
@@ -452,14 +453,15 @@ The output is in landscape format, one month to a page."
   (let* ((selection
           (x-popup-menu
            event
-           (list "Menu"
+           (list (calendar-date-string date t nil)
                  (list
-                  (calendar-date-string date t nil)
+                  ""
                   '("Daily (1 page)" . cal-tex-mouse-day)
                   '("Weekly (1 page)" . cal-tex-mouse-week)
                   '("Weekly (2 pages)" . cal-tex-mouse-week2)
-                  '("Weekly (other style; 1 page)" . cal-tex-mouse-week3)
-                  '("Weekly (yet another style; 1 page)" . cal-tex-mouse-week4)
+                  '("Weekly (other style; 1 page)" . cal-tex-mouse-week-iso)
+                  '("Weekly (yet another style; 1 page)" .
+                    cal-tex-mouse-week-monday)
                   '("Monthly" . cal-tex-mouse-month)
                   '("Monthly (landscape)" . cal-tex-mouse-month-landscape)
                   '("Yearly" . cal-tex-mouse-year)
@@ -474,11 +476,13 @@ The output is in landscape format, one month to a page."
   (let* ((selection
           (x-popup-menu
            event
-           (list "Menu"
+           (list (calendar-date-string date t nil)
                  (list
-                  (calendar-date-string date t nil)
-                  '("Filofax Weekly (1 page)" . cal-tex-mouse-week5)
-                  '("Filofax Weekly (2 pages)" . cal-tex-mouse-week6)
+                  ""
+                  '("Filofax Weekly (2-weeks-at-a-glance)" .
+                    cal-tex-mouse-filofax-2week)
+                  '("Filofax Weekly (week-at-a-glance)" .
+                    cal-tex-mouse-filofax-week)
                   '("Filofax Yearly" . cal-tex-mouse-filofax-year)
                   )))))
     (and selection (call-interactively selection))))