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
 <rudalics@gmx.at>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 915a53f7e6e83706089ea98a65c0eefee7b24a80..49ff8efc794bf58535ddc6066ac8eea8b8259d28 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2014-09-16  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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
+       <rudalics@gmx.at>.
+
 2014-09-16  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Always use matched specpdl entry to record call arguments (Bug#18473).

diff --git a/src/w32term.c b/src/w32term.c
index 2781fb63d6266fa1ffcd7bd92931444bb590c611..e4813e9e02f4466632cf0616cb352956a402fce0 100644 (file)
--- 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 7723f1af77fdc48c4ffa1fb24732014abaa518cc..f426755e401fa6c39b0423da69d58874804ceb0a 100644 (file)
--- 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;