From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 17 Jan 2001 16:54:20 +0000 (+0000)
Subject: (direct_output_for_insert): If char_ins_del_ok is
X-Git-Tag: emacs-pretest-21.0.96~237
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3ffc2c358644fa8d7efe15c6cd9738a605c0cde;p=emacs.git

(direct_output_for_insert): If char_ins_del_ok is
zero, use this method only at the end of a line.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 107cba684d3..40404210f87 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-17  Gerd Moellmann  <gerd@gnu.org>
 
+	* dispnew.c (direct_output_for_insert): If char_ins_del_ok is
+	zero, use this method only at the end of a line.
+
 	* xfaces.c (x_face_list_fonts): Don't BLOCK_INPUT around the 
 	call to x_list_fonts.  Call x_list_fonts with SIZE -1 only
 	if SCALABLE_FONTS_P is set.
diff --git a/src/dispnew.c b/src/dispnew.c
index f9d9fb2d856..c18838df2bf 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3417,6 +3417,12 @@ direct_output_for_insert (g)
       || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w)))
     return 0;
 
+  /* If we can't insert glyphs, we can use this method only
+     at the end of a line.  */
+  if (!char_ins_del_ok)
+    if (PT != ZV && FETCH_BYTE (PT_BYTE) != '\n')
+      return 0;
+
   /* Set up a display iterator structure for W.  Glyphs will be
      produced in scratch_glyph_row.  Current position is W's cursor
      position.  */