From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 3 Oct 1995 09:13:55 +0000 (+0000)
Subject: (get_display_line): Don't abort if there's text
X-Git-Tag: emacs-19.34~2755
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c78509be74ec16a9c04cb64e466af5028664cf9;p=emacs.git

(get_display_line): Don't abort if there's text
in the line to the right beyond HPOS.
(quit_error_check): Make this a no-op.
---

diff --git a/src/dispnew.c b/src/dispnew.c
index 72e7c80f334..ae1798681ad 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -534,9 +534,6 @@ get_display_line (frame, vpos, hpos)
   if (vpos < 0)
     abort ();
 
-  if ((desired_glyphs->enable[vpos]) && desired_glyphs->used[vpos] > hpos)
-    abort ();
-
   if (! desired_glyphs->enable[vpos])
     {
       desired_glyphs->used[vpos] = 0;
@@ -1400,12 +1397,14 @@ update_frame (f, force, inhibit_hairy_id)
 void
 quit_error_check ()
 {
+#if 0
   if (FRAME_DESIRED_GLYPHS (selected_frame) == 0)
     return;
   if (FRAME_DESIRED_GLYPHS (selected_frame)->enable[0])
     abort ();
   if (FRAME_DESIRED_GLYPHS (selected_frame)->enable[FRAME_HEIGHT (selected_frame) - 1])
     abort ();
+#endif
 }
 
 /* Decide what insert/delete line to do, and do it */