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

1a1f8804 · Glenn Morris · 5d068609 · 9b4fdfd9 · 1a1f8804 · 1a1f8804
Commit 1a1f8804 authored Oct 17, 2014 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

src/ChangeLog src/ChangeLog +7 -0

src/xterm.c src/xterm.c +2 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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

--- 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);