aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-02-22 11:46:14 +0000
committerGerd Moellmann2001-02-22 11:46:14 +0000
commitc224f70be54de9209dd98bf0fdd7030e7414a756 (patch)
tree00c0d1cd9fb6ae0389cdb3cfc7fb06fc65677d1e /src
parentd7618b6028c0616415b448a25ff7c0a3c602f749 (diff)
downloademacs-c224f70be54de9209dd98bf0fdd7030e7414a756.tar.gz
emacs-c224f70be54de9209dd98bf0fdd7030e7414a756.zip
(direct_output_for_insert): Give up if we are showing
a message or just cleared the message because we might need to resize the echo area window or display an empty echo area.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/dispnew.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6345e0d7c4e..ae5187457d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12001-02-22 Gerd Moellmann <gerd@gnu.org>
2
3 * dispnew.c (direct_output_for_insert): Give up if we are showing
4 a message or just cleared the message because we might need to
5 resize the echo area window or display an empty echo area.
6
12001-02-21 Gerd Moellmann <gerd@gnu.org> 72001-02-21 Gerd Moellmann <gerd@gnu.org>
2 8
3 * xdisp.c (redisplay_internal): Do the 9 * xdisp.c (redisplay_internal): Do the
diff --git a/src/dispnew.c b/src/dispnew.c
index 337e3c9264a..2823b79c7b2 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3416,6 +3416,10 @@ direct_output_for_insert (g)
3416 || g == '\r' 3416 || g == '\r'
3417 /* Give up if unable to display the cursor in the window. */ 3417 /* Give up if unable to display the cursor in the window. */
3418 || w->cursor.vpos < 0 3418 || w->cursor.vpos < 0
3419 /* Give up if we are showing a message or just cleared the message
3420 because we might need to resize the echo area window. */
3421 || !NILP (echo_area_buffer[0])
3422 || !NILP (echo_area_buffer[1])
3419 || (glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos), 3423 || (glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos),
3420 /* Can't do it in a continued line because continuation 3424 /* Can't do it in a continued line because continuation
3421 lines would change. */ 3425 lines would change. */