From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 22 Jul 2002 16:15:53 +0000 (+0000)
Subject: (display_line): Replace an unconditional abort with an assertion.
X-Git-Tag: ttn-vms-21-2-B4~13915
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=72b8c43455d5603ad8270b8a320e85e3472ed82f;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index dd4dc158938..c375831f1ea 100644
--- 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 4e52d39c908..cf538ed9241 100644
--- 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);
 		}
 	    }