# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1244410630 0
# Node ID 75791aa3ab8e5dc42f7d3d89dbb4912347f9f8c1
# Parent  363ad3cbabd091b0ea4f289b7abacc1ede5439ac
* 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 -r 363ad3cbabd0 -r 75791aa3ab8e src/ChangeLog
--- a/src/ChangeLog	Sun Jun 07 20:45:49 2009 +0000
+++ b/src/ChangeLog	Sun Jun 07 21:37:10 2009 +0000
@@ -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 -r 363ad3cbabd0 -r 75791aa3ab8e src/xdisp.c
--- a/src/xdisp.c	Sun Jun 07 20:45:49 2009 +0000
+++ b/src/xdisp.c	Sun Jun 07 21:37:10 2009 +0000
@@ -6918,7 +6918,14 @@
 
 			  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 @@
 	  && 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 ())