Fix bs-show when the right fringe is off.

 src/xdisp.c (move_it_in_display_line_to): On GUI terminals, allow
 cursor overflow into the last glyph on display line when the right
 fringe is off.  (Bug#11832)

2 files changed, 15 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0ce8839c405..3c74343a708 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_in_display_line_to): On GUI terminals, allow
+        cursor overflow into the last glyph on display line when the right
+        fringe is off.  (Bug#11832)
+
 2012-07-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xdisp.c (produce_special_glyphs): Now static.
diff --git a/src/xdisp.c b/src/xdisp.c
index 4fa3c375ea7..4d77b56ad55 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8381,10 +8381,15 @@ move_it_in_display_line_to (struct it *it,
                           /* On graphical terminals, newlines may
                              "overflow" into the fringe if
                              overflow-newline-into-fringe is non-nil.
-                             On text terminals, newlines may overflow
-                             into the last glyph on the display
-                             line.*/
+                             On text terminals, and on graphical
+                             terminals with no right margin, newlines
+                             may overflow into the last glyph on the
+                             display line.*/
                           if (!FRAME_WINDOW_P (it->f)
+                              || ((it->bidi_p
+                                   && it->bidi_it.paragraph_dir == R2L)
+                                  ? WINDOW_LEFT_FRINGE_WIDTH (it->w)
+                                  : WINDOW_RIGHT_FRINGE_WIDTH (it->w)) == 0
                               || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
                             {
                               if (!get_next_display_element (it))
@@ -8518,7 +8523,7 @@ move_it_in_display_line_to (struct it *it,
           if (!FRAME_WINDOW_P (it->f)
               || ((it->bidi_p && it->bidi_it.paragraph_dir == R2L)
                   ? WINDOW_LEFT_FRINGE_WIDTH (it->w)
-                  : WINDOW_RIGHT_FRINGE_WIDTH (it->w))
+                  : WINDOW_RIGHT_FRINGE_WIDTH (it->w)) == 0
               || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
             {
               int at_eob_p = 0;