# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 988035753 0
# Node ID db1fc2ae7eac6bbe3a85c65d0efb8128a05dbf3b
# Parent  bd1a8b1c88d7c1691befd34a815269ff6d6b93b0
*** empty log message ***

diff -r bd1a8b1c88d7 -r db1fc2ae7eac lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 23 14:20:55 2001 +0000
+++ b/lisp/ChangeLog	Mon Apr 23 14:22:33 2001 +0000
@@ -1,3 +1,17 @@
+2001-04-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* calendar/calendar.el (diary-entry-marker)
+	(calendar-today-marker, calendar-holiday-marker): Use
+	display-color-p instead of window-system.
+	(calendar-mode-map, calendar-mode): Use display-popup-menus-p
+	instead of window-system.
+	(calendar-hide-window): Use display-multi-frame-p instead of
+	window-system.
+
+	* calendar/cal-x.el (calendar-two-frame-setup)
+	(calendar-only-one-frame-setup, calendar-one-frame-setup): Use
+	display-multi-frame-p instead of window-system.
+
 2001-04-23  Gerd Moellmann  <gerd@gnu.org>
 
 	* play/fortune.el (fortune-from-region): Use `eq' instead of `eql'.