Fix display on X of 1-pixel R2L characters.

 src/xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on
 1-pixel R2L characters.
 Reported by Dmitry Antipov <dmantipov@yandex.ru>, see
 http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00518.html.

diff --git a/src/ChangeLog b/src/ChangeLog
index 19c553ff7a1ccbc508c764581524cbd2a3a99af9..1572c6a2132ea7dd15da28a96dcfc88c148560d0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-17  Eli Zaretskii  <eliz@gnu.org>
+
+       * xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on
+       1-pixel R2L characters.
+       Reported by Dmitry Antipov <dmantipov@yandex.ru>, see
+       http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00518.html.
+
 2014-10-10  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666).

diff --git a/src/xterm.c b/src/xterm.c
index 717df452569b07de2f75531f2d185bf2e8c21458..b6430ad11b014c69fbfc4d1e02edfb18b5fde01c 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7133,7 +7133,8 @@ x_draw_hollow_cursor (struct window *w, struct glyph_row *row)
       && cursor_glyph->pixel_width > w->phys_cursor_width)
     {
       x += cursor_glyph->pixel_width - w->phys_cursor_width;
-      wd -= 1;
+      if (wd > 0)
+       wd -= 1;
     }
   /* Set clipping, draw the rectangle, and reset clipping again.  */
   x_clip_to_row (w, row, TEXT_AREA, gc);