(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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43d2d2a..9a803c2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2000-12-15  Miles Bader  <miles@gnu.org>
 
+       * faces.el (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).
+
        * window.el (mode-line-window-height-fudge): Function removed.
        (height-affecting-face-attributes, mode-line-window-height-fudge): 
        Variables removed.

diff --git a/lisp/faces.el b/lisp/faces.el
index 9821be0..36bc0a4 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -923,13 +923,14 @@ of a global face.  Value is the new attribute value."
               ;; 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")))