aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2020-04-04 09:59:16 +0300
committerEli Zaretskii2020-04-04 09:59:16 +0300
commit05d365d3105371ec956f31f109a2de14c5cf67df (patch)
tree9eaa7509c9bad23189eb563484b41a3aefcb2c93
parentfd38c9c0afe2c5bbf04f565eec05daa52a16472b (diff)
downloademacs-05d365d3105371ec956f31f109a2de14c5cf67df.tar.gz
emacs-05d365d3105371ec956f31f109a2de14c5cf67df.zip
Fix face spec handling for 'default' "terminal class"
* lisp/faces.el (face-spec-choose): Reverse order of 'defaults' and 'result' when generating attribute list, so that the spec for 'default' "terminal class" is indeed overridden by the actual class's spec, per the documentation. (Bug#40336)
-rw-r--r--lisp/faces.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 9a49ea81042..e707f6f4b6e 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1560,7 +1560,7 @@ is given, in which case return its value instead."
1560 ;; return it to the caller. Since there will most definitely be something to 1560 ;; return it to the caller. Since there will most definitely be something to
1561 ;; return in this case, there's no need to know/check if a match was found. 1561 ;; return in this case, there's no need to know/check if a match was found.
1562 (if defaults 1562 (if defaults
1563 (append result defaults) 1563 (append defaults result)
1564 (if match-found 1564 (if match-found
1565 result 1565 result
1566 no-match-retval)))) 1566 no-match-retval))))