From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 4 Apr 2020 06:59:16 +0000 (+0300)
Subject: Fix face spec handling for 'default' "terminal class"
X-Git-Tag: emacs-28.0.90~7659
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=05d365d3105371ec956f31f109a2de14c5cf67df;p=emacs.git

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)
---

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))))