procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2014-10-17 09:14:37 -07:00
commit 1a1f8804c8
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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

3
src/xterm.c
View file

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