[Emacs-diffs] emacs/src ChangeLog xdisp.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/06/07 21:37:13

Modified files:
        src            : ChangeLog xdisp.c 

Log message:
        * 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).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7558&r2=1.7559
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1281&r2=1.1282

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7558
retrieving revision 1.7559
diff -u -b -r1.7558 -r1.7559
--- ChangeLog   5 Jun 2009 14:08:16 -0000       1.7558
+++ ChangeLog   7 Jun 2009 21:37:10 -0000       1.7559
@@ -1,3 +1,9 @@
+2009-06-07  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsselect.m (Fx_own_selection_internal, Fx_selection_exists_p,

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -b -r1.1281 -r1.1282
--- xdisp.c     30 Apr 2009 05:02:04 -0000      1.1281
+++ xdisp.c     7 Jun 2009 21:37:12 -0000       1.1282
@@ -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 ())