# HG changeset patch
# User Edward M. Reingold <reingold@emr.cs.iit.edu>
# Date 896317938 0
# Node ID 0739384d43562619bc7c6276007112b3f2faaccd
# Parent  ca2d0846af6c133245ed65197e015eb56be317c4
Minor fixes of earlier updates.

diff -r ca2d0846af6c -r 0739384d4356 lisp/calendar/calendar.el
--- a/lisp/calendar/calendar.el	Thu May 28 00:46:54 1998 +0000
+++ b/lisp/calendar/calendar.el	Thu May 28 01:12:18 1998 +0000
@@ -2029,8 +2029,10 @@
   (setq buffer-read-only t)
   (setq indent-tabs-mode nil)
   (update-calendar-mode-line)
-  (make-local-hook 'activate-menubar-hook)
-  (add-hook 'activate-menubar-hook 'cal-menu-update nil t)
+  (if window-system
+      (progn
+        (make-local-hook 'activate-menubar-hook)
+        (add-hook 'activate-menubar-hook 'cal-menu-update nil t)))
   (make-local-variable 'calendar-mark-ring)
   (make-local-variable 'displayed-month);;  Month in middle of window.
   (make-local-variable 'displayed-year));;  Year in middle of window.
@@ -2084,7 +2086,8 @@
   "List of all calendar-related buffers."
   (let* ((diary-buffer (get-file-buffer diary-file))
          (buffers (list "*Yahrzeits*" lunar-phases-buffer holiday-buffer
-                        fancy-diary-buffer diary-buffer calendar-buffer))
+                        fancy-diary-buffer diary-buffer calendar-buffer
+                        other-calendars-buffer))
          (buffer-list nil)
          b)
     (while buffers