(diary-face, calendar-today-face, holiday-face):

  Remove dependency on `window-system'.

2 files changed, 32 insertions, 28 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e11116f87dc..a8a1ffd790e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-02  Miles Bader  <miles@gnu.org>
+
+	* calendar/calendar.el (diary-face, calendar-today-face) 
+	(holiday-face): Remove dependency on `window-system'.
+
 2000-11-02  Ken Raeburn  <raeburn@gnu.org>
 
 	* Makefile.in (emacs): Set EMACSLOADPATH always.
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 4eb08e16265..8773cc8746b 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -204,34 +204,33 @@ If nil, make an icon of the frame.  If non-nil, delete the frame."
   :type 'boolean
   :group 'view)
 
-(when window-system
-  (add-to-list 'facemenu-unlisted-faces 'diary-face)
-  (defface diary-face
-    '((((class color) (background light))
-       :foreground "red")
-      (((class color) (background dark))
-       :foreground "yellow")
-      (t
-       :bold t))
-    "Face for highlighting diary entries."
-    :group 'diary)
-
-  (add-to-list 'facemenu-unlisted-faces 'calendar-today-face)
-  (defface calendar-today-face
-    '((t (:underline t)))
-    "Face for indicating today's date."
-    :group 'diary)
-
-  (add-to-list 'facemenu-unlisted-faces 'holiday-face)
-  (defface holiday-face
-    '((((class color) (background light))
-       :background "pink")
-      (((class color) (background dark))
-       :background "chocolate4")
-      (t
-       :inverse-video t))
-    "Face for indicating dates that have holidays."
-    :group 'diary))
+(add-to-list 'facemenu-unlisted-faces 'diary-face)
+(defface diary-face
+  '((((class color) (background light))
+     :foreground "red")
+    (((class color) (background dark))
+     :foreground "yellow")
+    (t
+     :bold t))
+  "Face for highlighting diary entries."
+  :group 'diary)
+
+(add-to-list 'facemenu-unlisted-faces 'calendar-today-face)
+(defface calendar-today-face
+  '((t (:underline t)))
+  "Face for indicating today's date."
+  :group 'diary)
+
+(add-to-list 'facemenu-unlisted-faces 'holiday-face)
+(defface holiday-face
+  '((((class color) (background light))
+     :background "pink")
+    (((class color) (background dark))
+     :background "chocolate4")
+    (t
+     :inverse-video t))
+  "Face for indicating dates that have holidays."
+  :group 'diary)
 
 (defcustom diary-entry-marker
   (if (not window-system)