(solar-sunrises-buffer): New constant.

(calendar-mode-map): Use cal-menu-sunmoon-menu.
(calendar-buffer-list): Add solar-sunrises-buffer.

2 files changed, 19 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eaf44357690..38ad5a243fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2008-06-26  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/solar.el (solar-sunrise-sunset-string): Add optional
+        argument `nolocation'.
+        (calendar-sunrise-sunset-month): New function.
+        * calendar/cal-menu.el (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.
+        * calendar/calendar.el (solar-sunrises-buffer): New constant.
+        (calendar-mode-map): Use cal-menu-sunmoon-menu.
+        (calendar-buffer-list): Add solar-sunrises-buffer.
+
+        * calendar/cal-menu.el (cal-menu-goto-menu): Tweak menu name.
+
 2008-06-26  Chong Yidong  <cyd@stupidchicken.com>
 
         * cus-start.el: Add customization types for word-wrap and
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 284937f3017..c4885d476ff 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1018,6 +1018,9 @@ calendar."
 (defconst lunar-phases-buffer "*Phases of Moon*"
   "Name of the buffer used for the lunar phases.")
 
+(defconst solar-sunrises-buffer "*Sunrise/Sunset Times"
+  "Name of buffer used for sunrise/sunset times.")
+
 (defconst calendar-hebrew-yahrzeit-buffer "*Yahrzeits*"
   "Name of the buffer used by `list-yahrzeit-dates'.")
 
@@ -1565,7 +1568,7 @@ line."
     (define-key map [menu-bar edit] 'undefined)
     (define-key map [menu-bar search] 'undefined)
 
-    (easy-menu-define nil map nil cal-menu-moon-menu)
+    (easy-menu-define nil map nil cal-menu-sunmoon-menu)
     (easy-menu-define nil map nil cal-menu-diary-menu)
     (easy-menu-define nil map nil cal-menu-holidays-menu)
     (easy-menu-define nil map nil cal-menu-goto-menu)
@@ -1722,7 +1725,7 @@ the STRINGS are just concatenated and the result truncated."
   "List of all calendar-related buffers (as buffers, not strings)."
   (let (buffs)
     (dolist (b (list calendar-hebrew-yahrzeit-buffer lunar-phases-buffer
-                     holiday-buffer diary-fancy-buffer
+                     holiday-buffer diary-fancy-buffer solar-sunrises-buffer
                      (get-file-buffer diary-file)
                      calendar-buffer calendar-other-calendars-buffer))
       (and b (setq b (get-buffer b))