]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5aab1e8) | patch
Fix face merging for display strings broken by a recent commit
authorEli Zaretskii <eliz@gnu.org>
Mon, 16 Dec 2019 15:43:30 +0000 (17:43 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 16 Dec 2019 15:43:30 +0000 (17:43 +0200)
commit1e240a0ecdcf0eb4653ba57f8daa138ba2a2aab6
treec341768ed90e8e40889fe4cde143e0ff28a396c6tree | snapshot
parent5aab1e83f55ccbf7affc25272f6b1107aa17598ccommit | diff
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)
src/xdisp.c diff | blob | history
src/xfaces.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.