From ff3d95733df693020bbbaa4d5acfc99cd4d4c08b Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Mon, 7 Aug 2000 10:34:08 +0000 Subject: [PATCH] (ensure_echo_area_buffers): If a buffer was killed and a new buffer is created, make sure make sure echo_area_buffer[] references the new buffer. --- lisp/ChangeLog | 5 +++++ src/ChangeLog | 6 ++++++ src/xdisp.c | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2b61e48dfe2..414b42a9037 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2000-08-07 Gerd Moellmann + + * files.el (shell-quote-wildcard-pattern): Make sure to return + PATTERN, in the Unix case. + 2000-08-07 Eli Zaretskii * play/zone.el (zone): Discard any pending input before running diff --git a/src/ChangeLog b/src/ChangeLog index cbc2caca52b..2ced3a81004 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2000-08-07 Gerd Moellmann + + * xdisp.c (ensure_echo_area_buffers): If a buffer was killed, and + a new buffer is created, make sure echo_area_buffer[] references + the new buffer. + 2000-08-07 Eli Zaretskii * msdos.c (Fmsdos_set_mouse_buttons): Add missing backslashes in diff --git a/src/xdisp.c b/src/xdisp.c index ba2ae579660..da189e5b48f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -5438,9 +5438,17 @@ ensure_echo_area_buffers () || NILP (XBUFFER (echo_buffer[i])->name)) { char name[30]; + Lisp_Object old_buffer; + int j; + + old_buffer = echo_buffer[i]; sprintf (name, " *Echo Area %d*", i); echo_buffer[i] = Fget_buffer_create (build_string (name)); XBUFFER (echo_buffer[i])->truncate_lines = Qnil; + + for (j = 0; j < 2; ++j) + if (EQ (old_buffer, echo_area_buffer[j])) + echo_area_buffer[j] = echo_buffer[i]; } } -- 2.39.2