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

Fix bug #7417 with cursor positioning on empty lines.

Browse source 
xdisp.c (set_cursor_from_row): Fix cursor positioning in empty
 lines on text-mode terminals.
This commit is contained in:
Eli Zaretskii 2010-11-17 21:15:24 +02:00
parent fad0d56519
commit 146d267b8b
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-11-17 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (set_cursor_from_row): Fix cursor positioning in empty
lines on text-mode terminals. (bug#7417)
2010-11-17 Stefan Monnier <monnier@iro.umontreal.ca>
* xterm.c (get_current_wm_state): Rename from get_current_vm_state.

10
src/xdisp.c
View file

@ -12839,6 +12839,15 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
&& BUFFERP (glyph->object) && glyph->charpos == pt_old)
&& bpos_covered < pt_old)
{
/* An empty line has a single glyph whose OBJECT is zero and
whose CHARPOS is the position of a newline on that line.
Note that on a TTY, there are more glyphs after that, which
were produced by extend_face_to_end_of_line, but their
CHARPOS is zero or negative. */
int empty_line_p =
(row->reversed_p ? glyph > glyphs_end : glyph < glyphs_end)
&& INTEGERP (glyph->object) && glyph->charpos > 0;
if (row->ends_in_ellipsis_p && pos_after == last_pos)
{
EMACS_INT ellipsis_pos;
@ -12875,6 +12884,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
|| (row->truncated_on_right_p && pt_old > bpos_max)
/* Zero-width characters produce no glyphs. */
|| (!string_seen
&& !empty_line_p
&& (row->reversed_p
? glyph_after > glyphs_end
: glyph_after < glyphs_end)))