diff options
author | Glenn Morris <rgm@gnu.org> | 2020-08-13 07:51:03 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2020-08-13 07:51:03 -0700 |
commit | 7b63844bca87e20be8b456b16b2e3577241743a4 (patch) | |
tree | e58aaabf3048cb684f664cd25e588730fac69b0e /test/lisp/emacs-lisp/hierarchy-tests.el | |
parent | a1f9e7beea337b5b7c5accb7780101f5e0cdd357 (diff) | |
parent | c9a739408d286b52782c9005dcac97304c13d273 (diff) | |
download | emacs-7b63844bca87e20be8b456b16b2e3577241743a4.tar.gz emacs-7b63844bca87e20be8b456b16b2e3577241743a4.tar.bz2 emacs-7b63844bca87e20be8b456b16b2e3577241743a4.zip |
; 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
Diffstat (limited to 'test/lisp/emacs-lisp/hierarchy-tests.el')
0 files changed, 0 insertions, 0 deletions