(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b61e48dfe2ea1c4dd74b05326e8879f7b4d7ae0..414b42a9037d695b87ec2784c0b7e9aaa3fb8e88 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-07  Gerd Moellmann  <gerd@gnu.org>
+
+       * files.el (shell-quote-wildcard-pattern): Make sure to return
+       PATTERN, in the Unix case.
+
 2000-08-07  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * play/zone.el (zone): Discard any pending input before running

diff --git a/src/ChangeLog b/src/ChangeLog
index cbc2caca52bf01c7e567a86597f8f6f116fe1bf7..2ced3a810041fd758170511c6cdce6f6cc884880 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-07  Gerd Moellmann  <gerd@gnu.org>
+
+       * 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  <eliz@is.elta.co.il>
 
        * msdos.c (Fmsdos_set_mouse_buttons): Add missing backslashes in

diff --git a/src/xdisp.c b/src/xdisp.c
index ba2ae579660c8524f2e7fd696d47fafa3f58394d..da189e5b48f8e72c7c72fb324fbc61329bdbd4d4 100644 (file)
--- 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];
       }
 }