From c20b4c2de5a8c5ef4ac0655d74dd28c002b7aad3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 16 Sep 2014 18:44:51 +0300 Subject: [PATCH] Fix block cursor display in R2L lines. src/xterm.c (x_draw_stretch_glyph_string): src/w32term.c (x_draw_stretch_glyph_string): Fix a thinko that caused the block cursor to disappear on a TAB in R2L lines in every window except the leftmost one. Reported by Martin Rudalics . --- src/ChangeLog | 8 ++++++++ src/w32term.c | 2 +- src/xterm.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 915a53f7e6e..49ff8efc794 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2014-09-16 Eli Zaretskii + + * xterm.c (x_draw_stretch_glyph_string): + * w32term.c (x_draw_stretch_glyph_string): Fix a thinko that + caused the block cursor to disappear on a TAB in R2L lines in + every window except the leftmost one. Reported by Martin Rudalics + . + 2014-09-16 Dmitry Antipov Always use matched specpdl entry to record call arguments (Bug#18473). diff --git a/src/w32term.c b/src/w32term.c index 2781fb63d62..e4813e9e02f 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -2227,7 +2227,7 @@ x_draw_stretch_glyph_string (struct glyph_string *s) { /* In R2L rows, draw the cursor on the right edge of the stretch glyph. */ - int right_x = window_box_right_offset (s->w, TEXT_AREA); + int right_x = window_box_right (s->w, TEXT_AREA); if (x + background_width > right_x) background_width -= x - right_x; diff --git a/src/xterm.c b/src/xterm.c index 7723f1af77f..f426755e401 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -2475,7 +2475,7 @@ x_draw_stretch_glyph_string (struct glyph_string *s) { /* In R2L rows, draw the cursor on the right edge of the stretch glyph. */ - int right_x = window_box_right_offset (s->w, TEXT_AREA); + int right_x = window_box_right (s->w, TEXT_AREA); if (x + background_width > right_x) background_width -= x - right_x; -- 2.39.2