[Emacs-diffs] Changes to emacs/lisp/play/mpuz.el

[Miles Bader]

Index: emacs/lisp/play/mpuz.el
diff -c emacs/lisp/play/mpuz.el:1.27 emacs/lisp/play/mpuz.el:1.28
*** emacs/lisp/play/mpuz.el:1.27        Thu May 26 15:26:09 2005
--- emacs/lisp/play/mpuz.el     Fri Jun 10 11:38:27 2005
***************
*** 57,84 ****
    :type 'boolean
    :group 'mpuz)
  
! (defface mpuz-unsolved-face
    '((((class color)) (:foreground "red1" :bold t))
      (t (:bold t)))
    "*Face to use for letters to be solved."
    :group 'mpuz)
  
! (defface mpuz-solved-face
    '((((class color)) (:foreground "green1" :bold t))
      (t (:bold t)))
    "*Face to use for solved digits."
    :group 'mpuz)
  
! (defface mpuz-trivial-face
    '((((class color)) (:foreground "blue" :bold t))
      (t (:bold t)))
    "*Face to use for trivial digits solved for you."
    :group 'mpuz)
  
! (defface mpuz-text-face
    '((t (:inherit variable-pitch)))
    "*Face to use for text on right."
    :group 'mpuz)
  
  
  ;; Mpuz mode and keymaps
--- 57,92 ----
    :type 'boolean
    :group 'mpuz)
  
! (defface mpuz-unsolved
    '((((class color)) (:foreground "red1" :bold t))
      (t (:bold t)))
    "*Face to use for letters to be solved."
    :group 'mpuz)
+ ;; backward-compatibility alias
+ (put 'mpuz-unsolved-face 'face-alias 'mpuz-unsolved)
  
! (defface mpuz-solved
    '((((class color)) (:foreground "green1" :bold t))
      (t (:bold t)))
    "*Face to use for solved digits."
    :group 'mpuz)
+ ;; backward-compatibility alias
+ (put 'mpuz-solved-face 'face-alias 'mpuz-solved)
  
! (defface mpuz-trivial
    '((((class color)) (:foreground "blue" :bold t))
      (t (:bold t)))
    "*Face to use for trivial digits solved for you."
    :group 'mpuz)
+ ;; backward-compatibility alias
+ (put 'mpuz-trivial-face 'face-alias 'mpuz-trivial)
  
! (defface mpuz-text
    '((t (:inherit variable-pitch)))
    "*Face to use for text on right."
    :group 'mpuz)
+ ;; backward-compatibility alias
+ (put 'mpuz-text-face 'face-alias 'mpuz-text)
  
  
  ;; Mpuz mode and keymaps
***************
*** 296,302 ****
  (defun mpuz-create-buffer ()
    "Create (or recreate) the puzzle buffer. Return it."
    (let ((buf (get-buffer-create "*Mult Puzzle*"))
!       (face '(face mpuz-text-face))
        buffer-read-only)
      (save-excursion
        (set-buffer buf)
--- 304,310 ----
  (defun mpuz-create-buffer ()
    "Create (or recreate) the puzzle buffer. Return it."
    (let ((buf (get-buffer-create "*Mult Puzzle*"))
!       (face '(face mpuz-text))
        buffer-read-only)
      (save-excursion
        (set-buffer buf)
***************
*** 347,355 ****
                  (+ 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))))
        buffer-read-only)
      (mapc (lambda (square)
            (goto-line (car square))    ; line before column!
--- 355,363 ----
                  (+ digit ?0)
                (+ (mpuz-to-letter digit) ?A)))
        (face `(face
!               ,(cond ((aref mpuz-trivial-digits digit) 'mpuz-trivial)
!                      ((aref mpuz-found-digits digit) 'mpuz-solved)
!                      ('mpuz-unsolved))))
        buffer-read-only)
      (mapc (lambda (square)
            (goto-line (car square))    ; line before column!