(gomoku-font-lock-O-face, gomoku-font-lock-X-face)

(gomoku-plot-square, gomoku-init-display): Don't use window-system.

diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 90fe1623f0be73ef3e39885af1f626c65e89d513..59ef472834c60aa8bf8e5e5ad5dd483394583439 100644 (file)
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -143,14 +143,14 @@ One useful value to include is `turn-on-font-lock' to highlight the pieces."
   "For making font-lock use the winner's face for the line.")
 
 (defcustom gomoku-font-lock-O-face
-  (if window-system
+  (if (display-color-p)
       (list (facemenu-get-face 'fg:red) 'bold))
   "*Face to use for Emacs' O."
   :type '(repeat face)
   :group 'gomoku)
 
 (defcustom gomoku-font-lock-X-face
-  (if window-system
+  (if (display-color-p)
       (list (facemenu-get-face 'fg:green) 'bold))
   "*Face to use for your X."
   :type '(repeat face)
@@ -987,8 +987,7 @@ If the game is finished, this command requests for another game."
     (insert-and-inherit (cond ((= value 1) ?X)
                              ((= value 6) ?O)
                              (?.)))
-    (and window-system
-        (zerop value)
+    (and (zerop value)
         (put-text-property (1- (point)) (point) 'mouse-face 'highlight))
     (delete-char 1)
     (backward-char 1))
@@ -1028,9 +1027,8 @@ If the game is finished, this command requests for another game."
                      (goto-char (point-max))))
               (setq point (point))
               (insert ?.)
-              (if window-system
-                  (put-text-property point (point)
-                                     'mouse-face 'highlight)))
+              (put-text-property point (point)
+                                 'mouse-face 'highlight))
             (> (setq i (1- i)) 0))
       (if (= i (1- m))
          (setq opoint point))