; 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
This commit is contained in:
Glenn Morris 2020-08-13 07:51:03 -07:00
commit 7b63844bca

Diff content is not available