[Emacs-diffs] trunk r118141: Merge from emacs-24; up to r117592

[Glenn Morris]

------------------------------------------------------------
revno: 118141 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-10-17 09:14:37 -0700
message:
  Merge from emacs-24; up to r117592
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-16 06:55:34 +0000
+++ b/src/ChangeLog     2014-10-17 16:14:37 +0000
@@ -1,3 +1,10 @@
+2014-10-17  Eli Zaretskii  <address@hidden>
+
+       * xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on
+       1-pixel R2L characters.
+       Reported by Dmitry Antipov <address@hidden>, see
+       http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00518.html.
+
 2014-10-16  Eli Zaretskii  <address@hidden>
 
        * bidi.c (bidi_find_bracket_pairs): Avoid a loop that does nothing

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-10-12 06:09:50 +0000
+++ b/src/xterm.c       2014-10-17 16:14:37 +0000
@@ -7984,7 +7984,8 @@
       && 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);