]> git.eshelyaron.com Git - emacs.git/commit
Fix display of composed text with :box face attribute
authorEli Zaretskii <eliz@gnu.org>
Thu, 23 Apr 2020 15:40:42 +0000 (18:40 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 23 Apr 2020 15:40:42 +0000 (18:40 +0300)
commit5ab80286f6f765ba41004030ea8cc19be7c1c098
treee4923b8c1c20da115eb5a4423b36e6034b6ce0b7
parent7b15cc3ebb45e50ac5faf3bbc2a813afffdaa418
Fix display of composed text with :box face attribute

* src/xdisp.c (get_next_display_element): For a composition on a
display or overlay string, set the end_of_box_run_p flag if the
string ends at the last character included in the composition.
(fill_gstring_glyph_string): Fix the way the width of a gstring
glyph string is calculated: use the values calculated in
gui_produce_glyphs, since the latter adjusts the width due to the
face's ':box' attribute.
* src/xterm.c (x_draw_glyph_string_box):
* src/w32term.c (w32_draw_glyph_string_box):
* src/nsterm.m (ns_dumpglyphs_box_or_relief): Support automatic
compositions, which have the right_box_line_p flag set on the last
glyph produced from the composition.  (Bug#40687)

* src/w32term.c (w32_compute_glyph_string_overhangs): Update to be
consistent with xterm.c in its support of automatic composition
glyph strings.
* src/dispextern.h (enum glyph_type): More accurate commentary.
* src/.gdbinit (pgx): Display slice.img members only for image
glyphs.
src/.gdbinit
src/dispextern.h
src/nsterm.m
src/w32term.c
src/xdisp.c
src/xterm.c