From: Glenn Morris <rgm@gnu.org>
Date: Thu, 13 Aug 2020 14:51:03 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~6604
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7b63844bca87e20be8b456b16b2e3577241743a4;p=emacs.git

; Merge from origin/emacs-27

The following commits were skipped:

c9a739408d Fix face merging at EOL when inherited face specifies :extend
f946e48bf5 Fix face extension past EOL in overlay strings
---

7b63844bca87e20be8b456b16b2e3577241743a4