From 05d365d3105371ec956f31f109a2de14c5cf67df Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Apr 2020 09:59:16 +0300 Subject: [PATCH] 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) --- lisp/faces.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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." ;; return it to the caller. Since there will most definitely be something to ;; return in this case, there's no need to know/check if a match was found. (if defaults - (append result defaults) + (append defaults result) (if match-found result no-match-retval)))) -- 2.39.2