From: Eli Zaretskii Date: Wed, 17 Nov 2010 19:15:24 +0000 (+0200) Subject: Fix bug #7417 with cursor positioning on empty lines. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~210 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=146d267b8b8ef2c1823d54eb8a056bb6c443a22d;p=emacs.git Fix bug #7417 with cursor positioning on empty lines. xdisp.c (set_cursor_from_row): Fix cursor positioning in empty lines on text-mode terminals. --- diff --git a/src/ChangeLog b/src/ChangeLog index 240155181c4..43a38c6a728 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-11-17 Eli Zaretskii + + * xdisp.c (set_cursor_from_row): Fix cursor positioning in empty + lines on text-mode terminals. (bug#7417) + 2010-11-17 Stefan Monnier * xterm.c (get_current_wm_state): Rename from get_current_vm_state. diff --git a/src/xdisp.c b/src/xdisp.c index d3ebc1a4a8a..e02abf6a5b5 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -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)))