Mercurial > emacs
changeset 34585:1e66e14d9695
(read-face-attribute): If there's no entry for the user's input in
VALID, just use it as-is (this will often result in an error, but it may
be OK for e.g. colors using hexadecimal notation, and at least will
yield a better error message).
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 15 Dec 2000 03:10:44 +0000 |
| parents | a94a01759d0b |
| children | 4bca67840cc8 |
| files | lisp/faces.el |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Fri Dec 15 02:04:31 2000 +0000 +++ b/lisp/faces.el Fri Dec 15 03:10:44 2000 +0000 @@ -923,13 +923,14 @@ ;; Terminal frames can support colors that don't appear ;; explicitly in VALID, using color approximation code ;; in tty-colors.el. - (if (and (memq attribute '(:foreground :background)) - (not (memq window-system '(x w32 mac))) - (not (member new-value - '("unspecified" - "unspecified-fg" "unspecified-bg")))) + (when (and (memq attribute '(:foreground :background)) + (not (memq window-system '(x w32 mac))) + (not (member new-value + '("unspecified" + "unspecified-fg" "unspecified-bg")))) (setq new-value (car (tty-color-desc new-value frame)))) - (setq new-value (cdr (assoc new-value valid)))))) + (when (assoc new-value valid) + (setq new-value (cdr (assoc new-value valid))))))) ((eq valid 'integerp) (setq new-value (face-read-integer face old-value attribute-name))) (t (error "Internal error")))