Commit 1a1f8804 authored by Glenn Morris's avatar Glenn Morris

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

parents 5d068609 9b4fdfd9
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
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment