Mercurial > emacs

changeset 43825:5f6458644514

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use defface instead of facemenu-get-face.
author Eli Zaretskii <eliz@gnu.org>
date Sun, 10 Mar 2002 17:27:48 +0000
parents 0f0939983d10
children a7e0faaa30c2
files lisp/play/mpuz.el
diffstat 1 files changed, 15 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/play/mpuz.el	Sun Mar 10 16:37:56 2002 +0000
+++ b/lisp/play/mpuz.el	Sun Mar 10 17:27:48 2002 +0000
@@ -57,28 +57,27 @@
   :type 'boolean
   :group 'mpuz)
 
-(defcustom mpuz-unsolved-face
-  `(,(facemenu-get-face 'fg:red) bold)
+(defface mpuz-unsolved-face
+  '((((class color)) (:foreground "red1" :bold t))
+    (t (:bold t)))
   "*Face to use for letters to be solved."
-  :type '(repeat face)
   :group 'mpuz)
 
-(defcustom mpuz-solved-face
-  `(,(facemenu-get-face 'fg:green) bold)
+(defface mpuz-solved-face
+  '((((class color)) (:foreground "green1" :bold t))
+    (t (:bold t)))
   "*Face to use for solved digits."
-  :type '(repeat face)
   :group 'mpuz)
 
-(defcustom mpuz-trivial-face
-  `(,(facemenu-get-face 'fg:blue) bold)
+(defface mpuz-trivial-face
+  '((((class color)) (:foreground "blue" :bold t))
+    (t (:bold t)))
   "*Face to use for trivial digits solved for you."
-  :type '(repeat face)
   :group 'mpuz)
 
-(defcustom mpuz-text-face
-  '(variable-pitch)
+(defface mpuz-text-face
+  '((t (:inherit variable-pitch)))
   "*Face to use for text on right."
-  :type '(repeat face)
   :group 'mpuz)
 
 
@@ -296,7 +295,7 @@
 (defun mpuz-create-buffer ()
   "Create (or recreate) the puzzle buffer. Return it."
   (let ((buf (get-buffer-create "*Mult Puzzle*"))
-	(face `(face ,mpuz-text-face))
+	(face '(face mpuz-text-face))
 	buffer-read-only)
     (save-excursion
       (set-buffer buf)
@@ -347,9 +346,9 @@
 		  (+ digit ?0)
 		(+ (mpuz-to-letter digit) ?A)))
 	(face `(face
-		,(cond ((aref mpuz-trivial-digits digit) mpuz-trivial-face)
-		       ((aref mpuz-found-digits digit) mpuz-solved-face)
-		       (mpuz-unsolved-face))))
+		,(cond ((aref mpuz-trivial-digits digit) 'mpuz-trivial-face)
+		       ((aref mpuz-found-digits digit) 'mpuz-solved-face)
+		       ('mpuz-unsolved-face))))
 	buffer-read-only)
     (mapc (lambda (square)
 	    (goto-line (car square))	; line before column!