From 6e71749d98c98d2a4f51d1f01e5aa22a352e55e4 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 22 Mar 2002 09:44:45 +0000 Subject: [PATCH] (gomoku-font-lock-O-face): Convert to use `defface'. (gomoku-font-lock-X-face): Likewise. (gomoku-font-lock-keywords): Use faces instead of variables. --- lisp/ChangeLog | 6 ++++++ lisp/play/gomoku.el | 24 ++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f0a34fbe4b0..1970a8b135c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2002-03-22 Juanma Barranquero + + * play/gomoku.el (gomoku-font-lock-O-face): Convert to use `defface'. + (gomoku-font-lock-X-face): Likewise. + (gomoku-font-lock-keywords): Use faces instead of variables. + 2002-03-21 Stefan Monnier * Makefile.in (bootstrap): Make sure subdirs.el is ready. diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el index 9096d4be790..888dfe34ba0 100644 --- a/lisp/play/gomoku.el +++ b/lisp/play/gomoku.el @@ -163,26 +163,22 @@ One useful value to include is `turn-on-font-lock' to highlight the pieces." (defvar gomoku-emacs-won () "For making font-lock use the winner's face for the line.") -(defcustom gomoku-font-lock-O-face - (if (display-color-p) - (list (facemenu-get-face 'fg:red) 'bold)) - "*Face to use for Emacs' O." - :type '(repeat face) +(defface gomoku-font-lock-O-face + '((((class color)) (:foreground "red" :weight bold))) + "Face to use for Emacs' O." :group 'gomoku) -(defcustom gomoku-font-lock-X-face - (if (display-color-p) - (list (facemenu-get-face 'fg:green) 'bold)) - "*Face to use for your X." - :type '(repeat face) +(defface gomoku-font-lock-X-face + '((((class color)) (:foreground "green" :weight bold))) + "Face to use for your X." :group 'gomoku) (defvar gomoku-font-lock-keywords - '(("O" . gomoku-font-lock-O-face) - ("X" . gomoku-font-lock-X-face) + '(("O" . 'gomoku-font-lock-O-face) + ("X" . 'gomoku-font-lock-X-face) ("[-|/\\]" 0 (if gomoku-emacs-won - gomoku-font-lock-O-face - gomoku-font-lock-X-face))) + 'gomoku-font-lock-O-face + 'gomoku-font-lock-X-face))) "*Font lock rules for Gomoku.") (put 'gomoku-mode 'front-sticky -- 2.39.2