Merge from emacs-24; up to 2014-07-28T02:47:29Z!fgallina@gnu.org

2 files changed, 9 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index af53b77a622..a5c68d77bb1 100644
--- 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-16  Eli Zaretskii  <eliz@gnu.org>
 
         * bidi.c (bidi_find_bracket_pairs): Avoid a loop that does nothing
diff --git a/src/xterm.c b/src/xterm.c
index f32aea031f9..334eafcd3fe 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7984,7 +7984,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);