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

1 files changed, 8 insertions, 0 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index ba2ae57966..da189e5b48 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];
       }
 }