changeset 39520:199991f52caf

(display_line): Set row's ends_in_newline_from_string_p. (try_window_id): Skip back over lines ending in a newline from a string.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 01 Oct 2001 10:52:55 +0000
parents 865d22a5dca3
children 477edfe737e3
files src/xdisp.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Mon Oct 01 09:32:09 2001 +0000
+++ b/src/xdisp.c	Mon Oct 01 10:52:55 2001 +0000
@@ -11495,7 +11495,8 @@
 	 for instance.  This is easier than to set up the iterator
 	 exactly, and it's not a frequent case, so the additional
 	 effort wouldn't really pay off.  */
-      while (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row)
+      while ((MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row)
+	      || last_unchanged_at_beg_row->ends_in_newline_from_string_p)
 	     && last_unchanged_at_beg_row > w->current_matrix->rows)
 	--last_unchanged_at_beg_row;
 
@@ -13004,6 +13005,8 @@
 	{
 	  int used_before = row->used[TEXT_AREA];
 
+	  row->ends_in_newline_from_string_p = STRINGP (it->object);
+
 	  /* Add a space at the end of the line that is used to
 	     display the cursor there.  */
 	  append_space (it, 0);