diff options
author | Eli Zaretskii <eliz@gnu.org> | 2019-12-16 17:43:30 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2019-12-16 17:43:30 +0200 |
commit | 1e240a0ecdcf0eb4653ba57f8daa138ba2a2aab6 (patch) | |
tree | c341768ed90e8e40889fe4cde143e0ff28a396c6 /lisp/emacs-lisp/lisp-mode.el | |
parent | 5aab1e83f55ccbf7affc25272f6b1107aa17598c (diff) | |
download | emacs-1e240a0ecdcf0eb4653ba57f8daa138ba2a2aab6.tar.gz emacs-1e240a0ecdcf0eb4653ba57f8daa138ba2a2aab6.tar.bz2 emacs-1e240a0ecdcf0eb4653ba57f8daa138ba2a2aab6.zip |
Fix face merging for display strings broken by a recent commit
* src/xfaces.c (face_at_string_position): Revert the last
change, as it cannot possibly solve bug#38563.
* src/xdisp.c (face_at_pos): Fix a typo made during last
change here, which broke face merging for display strings.
(Bug#38633)
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
0 files changed, 0 insertions, 0 deletions