(face-spec-choose): Change syntax so that the list of attribute-value

pairs is now the cdr of each clause, not the cadr.  Detect old-style
entries, and handle them.  Use pop.

diff --git a/lisp/faces.el b/lisp/faces.el
index 8252d273f85b0fcd2b53b1024d6647e2a9017a8d..60e8e1a49c2b1fc09c1d0021dba8e533f1a477f9 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1157,12 +1157,16 @@ If SPEC is nil, return nil."
   (let ((tail spec)
        result)
     (while tail
-      (let* ((entry (car tail))
-            (display (nth 0 entry))
-            (attrs (nth 1 entry)))
-       (setq tail (cdr tail))
+      (let* ((entry (pop tail))
+            (display (car entry))
+            (attrs (cdr entry)))
        (when (face-spec-set-match-display display frame)
-         (setq result attrs tail nil))))
+         (setq result (if (listp (car attrs))
+                          ;; Old-style entry, the attribute list is the
+                          ;; first element.
+                          (car attrs)
+                        attrs)
+               tail nil))))
     result))