# HG changeset patch # User Miles Bader # Date 976849844 0 # Node ID 1e66e14d969509161adc5d01896dd72e9d6e949e # Parent a94a01759d0beb7c3becf8c3d9af63b7df71ca84 (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). diff -r a94a01759d0b -r 1e66e14d9695 lisp/faces.el --- 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")))