emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 05d365d: Fix face spec handling for 'default' "terminal class"


From: Eli Zaretskii
Subject: master 05d365d: Fix face spec handling for 'default' "terminal class"
Date: Sat, 4 Apr 2020 03:00:27 -0400 (EDT)

branch: master
commit 05d365d3105371ec956f31f109a2de14c5cf67df
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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 9a49ea8..e707f6f 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))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]