aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-01-17 16:54:20 +0000
committerGerd Moellmann2001-01-17 16:54:20 +0000
commitf3ffc2c358644fa8d7efe15c6cd9738a605c0cde (patch)
treeefd52c00b48817c7810a0ca7ade177fe2bd8137d /src
parentd51ffa0ebe086994903f6ff18628b9897bc09028 (diff)
downloademacs-f3ffc2c358644fa8d7efe15c6cd9738a605c0cde.tar.gz
emacs-f3ffc2c358644fa8d7efe15c6cd9738a605c0cde.zip
(direct_output_for_insert): If char_ins_del_ok is
zero, use this method only at the end of a line.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/dispnew.c6
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 107cba684d3..40404210f87 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12001-01-17 Gerd Moellmann <gerd@gnu.org> 12001-01-17 Gerd Moellmann <gerd@gnu.org>
2 2
3 * dispnew.c (direct_output_for_insert): If char_ins_del_ok is
4 zero, use this method only at the end of a line.
5
3 * xfaces.c (x_face_list_fonts): Don't BLOCK_INPUT around the 6 * xfaces.c (x_face_list_fonts): Don't BLOCK_INPUT around the
4 call to x_list_fonts. Call x_list_fonts with SIZE -1 only 7 call to x_list_fonts. Call x_list_fonts with SIZE -1 only
5 if SCALABLE_FONTS_P is set. 8 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)
3417 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w))) 3417 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w)))
3418 return 0; 3418 return 0;
3419 3419
3420 /* If we can't insert glyphs, we can use this method only
3421 at the end of a line. */
3422 if (!char_ins_del_ok)
3423 if (PT != ZV && FETCH_BYTE (PT_BYTE) != '\n')
3424 return 0;
3425
3420 /* Set up a display iterator structure for W. Glyphs will be 3426 /* Set up a display iterator structure for W. Glyphs will be
3421 produced in scratch_glyph_row. Current position is W's cursor 3427 produced in scratch_glyph_row. Current position is W's cursor
3422 position. */ 3428 position. */