From: Edward M. Reingold <reingold@emr.cs.iit.edu>
Date: Thu, 28 May 1998 01:12:18 +0000 (+0000)
Subject: Minor fixes of earlier updates.
X-Git-Tag: emacs-20.3~807
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c73a356b0d0bc12ac1cc5eaec07a830afbf640d;p=emacs.git

Minor fixes of earlier updates.
---

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 3ea400a28af..68e41307390 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2029,8 +2029,10 @@ For a complete description, type \
   (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 @@ the STRINGS are just concatenated and the result truncated."
   "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