Mercurial > emacs
changeset 32940:80681aca0859
(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.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 27 Oct 2000 01:46:13 +0000 |
| parents | c8119677d63e |
| children | 7a425cdcc3b2 |
| files | lisp/faces.el |
| diffstat | 1 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Fri Oct 27 01:36:40 2000 +0000 +++ b/lisp/faces.el Fri Oct 27 01:46:13 2000 +0000 @@ -1157,12 +1157,16 @@ (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))