From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 7 Jun 2009 21:37:10 +0000 (+0000)
Subject: * xdisp.c (move_it_in_display_line_to): On text-only terminals,
X-Git-Tag: emacs-pretest-23.0.95~124
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6756cd1d7cef185befd4b6565d45fbb6a088207c;p=emacs.git

* xdisp.c (move_it_in_display_line_to): On text-only terminals,
account for the overflowing of newlines into the last glyph on the
display line (Bug#3482).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index fe60195e5e7..57f4af904c5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-07  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xdisp.c (move_it_in_display_line_to): On text-only terminals,
+	account for the overflowing of newlines into the last glyph on the
+	display line (Bug#3482).
+
 2009-06-05  David Reitter  <david.reitter@gmail.com>
 
 	* nsselect.m (Fx_own_selection_internal, Fx_selection_exists_p,
diff --git a/src/xdisp.c b/src/xdisp.c
index 125e05f0086..01b16dba539 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6918,7 +6918,14 @@ move_it_in_display_line_to (struct it *it,
 
 			  set_iterator_to_next (it, 1);
 #ifdef HAVE_WINDOW_SYSTEM
-			  if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
+			  /* One graphical terminals, newlines may
+			     "overflow" into the fringe if
+			     overflow-newline-into-fringe is non-nil.
+			     On text-only terminals, newlines may
+			     overflow into the last glyph on the
+			     display line.*/
+			  if (!FRAME_WINDOW_P (it->f)
+			      || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
 			    {
 			      if (!get_next_display_element (it))
 				{
@@ -7015,7 +7022,8 @@ move_it_in_display_line_to (struct it *it,
 	  && it->current_x >= it->last_visible_x)
 	{
 #ifdef HAVE_WINDOW_SYSTEM
-	  if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
+	  if (!FRAME_WINDOW_P (it->f)
+	      || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
 	    {
 	      if (!get_next_display_element (it)
 		  || BUFFER_POS_REACHED_P ())