Mercurial > hg > xemacs-beta
diff lisp/w3/font.el @ 116:9f59509498e1 r20-1b10
Import from CVS: tag r20-1b10
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:23:06 +0200 |
| parents | 8619ce7e4c50 |
| children | 7d55a9ba150c |
line wrap: on
line diff
--- a/lisp/w3/font.el Mon Aug 13 09:21:56 2007 +0200 +++ b/lisp/w3/font.el Mon Aug 13 09:23:06 2007 +0200 @@ -1,7 +1,7 @@ ;;; font.el --- New font model ;; Author: wmperry -;; Created: 1997/03/19 18:28:10 -;; Version: 1.38 +;; Created: 1997/03/26 20:08:55 +;; Version: 1.40 ;; Keywords: faces ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -979,8 +979,7 @@ (defsubst font-rgb-color-p (obj) (or (and (vectorp obj) (= (length obj) 4) - (eq (aref obj 0) 'rgb)) - (string-match "^#[0-9a-fA-F]+$" obj))) + (eq (aref obj 0) 'rgb)))) (defsubst font-rgb-color-red (obj) (aref obj 1)) (defsubst font-rgb-color-green (obj) (aref obj 2)) @@ -1093,7 +1092,8 @@ (interactive) (condition-case nil (cond - ((font-rgb-color-p color) + ((or (font-rgb-color-p color) + (string-match "^#[0-9a-fA-F]+$" color)) (apply 'set-face-background face (font-normalize-color color) args)) (t @@ -1104,7 +1104,8 @@ (interactive) (condition-case nil (cond - ((font-rgb-color-p color) + ((or (font-rgb-color-p color) + (string-match "^#[0-9a-fA-F]+$" color)) (apply 'set-face-foreground face (font-normalize-color color) args)) (t (apply 'set-face-foreground face color args)))