(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 107cba684d349835005c5382c07cae7f69df3047..40404210f87b93f516dd885a3c674d901a98f325 100644 (file)
--- 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 f9d9fb2d8566b186adf188875c435b11be30b0b6..c18838df2bf27d43b53f9fd45eef15157fd1aa03 100644 (file)
--- 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.  */