(display_line): Replace an unconditional abort with an assertion.

diff --git a/src/ChangeLog b/src/ChangeLog
index dd4dc15..c375831 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-22  Gerd Moellmann  <gerd.moellmann@t-online.de>
+
+       * xdisp.c (display_line): Replace an abort with xassert.
+
 2002-07-21  Richard M. Stallman  <rms@gnu.org>
 
        * xdisp.c (redisplay_window): Don't test BEG_UNCHANGED

diff --git a/src/xdisp.c b/src/xdisp.c
index 4e52d39..cf538ed 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13229,9 +13229,10 @@ display_line (it)
                {
                  /* Glyph is completely off the left margin of the
                     window.  This should not happen because of the
-                    move_it_in_display_line at the start of
-                    this function.  */
-                 abort ();
+                    move_it_in_display_line at the start of this
+                    function, unless the text display area of the
+                    window is empty.  */
+                 xassert (it->first_visible_x <= it->last_visible_x);
                }
            }