(cal-menu-sunmoon-menu): Rename from cal-menu-moon-menu. Add

calendar-sunrise-sunset-month.
(cal-menu-global-mouse-menu): Add calendar-sunrise-sunset-month.

(cal-menu-goto-menu): Tweak menu name.

diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 704c49a650147df4863de502cb494ed73b8c428d..e78a89f3386b46599992b6a8e3fbfcd9842acc22 100644 (file)
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -32,11 +32,12 @@
 
 (require 'calendar)
 
-(defconst cal-menu-moon-menu
-  '("Moon"
+(defconst cal-menu-sunmoon-menu
+  '("Sun/Moon"
     ["Lunar Phases" calendar-phases-of-moon]
-    ["Sunrise/sunset for cursor date" calendar-sunrise-sunset])
-  "Key map for \"Moon\" menu in the calendar.")
+    ["Sunrise/sunset for cursor date" calendar-sunrise-sunset]
+    ["Sunrise/sunset for cursor month" calendar-sunrise-sunset-month])
+  "Key map for \"Sun/Moon\" menu in the calendar.")
 
 (defconst cal-menu-diary-menu
   '("Diary"
@@ -111,7 +112,7 @@
   "Key map for \"Holidays\" menu in the calendar.")
 
 (defconst cal-menu-goto-menu
-  '("Go To"
+  '("Goto"
     ["Today" calendar-goto-today]
     ["Beginning of Week" calendar-beginning-of-week]
     ["End of Week" calendar-end-of-week]
@@ -140,7 +141,7 @@
      ["Next Round" calendar-mayan-next-round-date]
      ["Previous Round" calendar-mayan-previous-round-date])
     ["French Date" calendar-french-goto-date])
-  "Key map for \"Go To\" menu in the calendar.")
+  "Key map for \"Goto\" menu in the calendar.")
 
 (defconst cal-menu-scroll-menu
   '("Scroll"
@@ -246,6 +247,7 @@ is non-nil."
     ["Mark holidays" calendar-mark-holidays]
     ["Unmark" calendar-unmark]
     ["Lunar phases" calendar-phases-of-moon]
+    ["Sunrise times for month" calendar-sunrise-sunset-month]
     ["Show diary" diary-show-all-entries]
     ["Exit calendar" calendar-exit]))