]> git.eshelyaron.com Git - emacs.git/commit
Fix face merging at EOL when inherited face specifies :extend
authorEli Zaretskii <eliz@gnu.org>
Tue, 11 Aug 2020 14:39:35 +0000 (17:39 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 13 Aug 2020 13:39:12 +0000 (16:39 +0300)
commitc9a739408d286b52782c9005dcac97304c13d273
tree56392f67df7a2ded54806d397e6e694b5e7a70a9
parentf946e48bf5bfe051e77eee4c3c19633cbbb6e8c2
Fix face merging at EOL when inherited face specifies :extend

* src/xfaces.c (merge_face_ref): Handle correctly faces that
inherit from another, and in addition specify :extend.
(Bug#42552)

(cherry picked from commit 39c90f8dfabe158ad7ac9243aa9b9dedb9409e19)
src/xfaces.c