(zone, zone-pgm-stress): Don't use window-system.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf2444094b6d8085c3c6b8f4385f6b220d946790..504f1477670d3c9a38b3b984f19f4571ea5aed6f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2000-08-04  Eli Zaretskii  <eliz@is.elta.co.il>
 
+       * play/zone.el (zone, zone-pgm-stress): Don't use window-system.
+
        * hi-lock.el (hi-lock-unface-buffer): If a menu of regexps is
        popped up, but the user clicks outside the menu, return an empty
        regexp (that causes unhighlight-regexp to have no effect).

diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index 9ecdaa44acb9182c8f707391a0f132d0c7e3226a..6f2340d0485d8f4c962ffd825ace66396511bfe3 100644 (file)
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -84,7 +84,7 @@
   (interactive)
   (and (timerp zone-timer) (cancel-timer zone-timer))
   (setq zone-timer nil)
-  (let ((f (and window-system (selected-frame)))
+  (let ((f (selected-frame))
         (outbuf (get-buffer-create "*zone*"))
        (text (buffer-substring (window-start) (window-end)))
        (wp (1+ (- (window-point (selected-window))
@@ -530,7 +530,7 @@ If t, zone won't zone out.")
         (forward-line 1)
         (setq lines (cons (buffer-substring p (point)) lines))))
     (sit-for 5)
-    (when window-system
+    (when (display-color-p)
       (setq bg (frame-parameter (selected-frame) 'background-color)
             m-fg (face-foreground 'modeline)
             m-bg (face-background 'modeline))
@@ -550,7 +550,7 @@ If t, zone won't zone out.")
         (insert (nth (random (length lines)) lines)))
       (message (concat (make-string (random (- (frame-width) 5)) ? ) "grrr"))
       (sit-for 0.1))
-    (when window-system
+    (when (display-color-p)
       (set-face-foreground 'modeline m-fg)
       (set-face-background 'modeline m-bg))))