(Fkill_buffer): Notice if the buffer to kill is the

sole visible buffer when we're currently in the mini-buffer, and
give up if so.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2ba12b23655984b88e91412a8d635abd9ad1d83e..5e31398d2333c7f0e9d4a3b00ed2fb2551f8c83d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-21  Gerd Moellmann  <gerd@gnu.org>
+
+       * buffer.c (Fkill_buffer): Notice if the buffer to kill is the
+       sole visible buffer when we're currently in the mini-buffer, and
+       give up if so.
+       
 2000-11-21  Jason Rumney  <jasonr@gnu.org>
 
        * w32select.c (Fw32_set_clipboard_data): Save a copy of what is

diff --git a/src/buffer.c b/src/buffer.c
index 8c2deeb5bacbcb91d0fa9dd07e7c32112c471733..99815cb2d7d4178ad19fca271f2f01f9fb1a47ee 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1236,6 +1236,17 @@ with SIGHUP.")
        return Qnil;
     }
 
+  /* Notice if the buffer to kill is the sole visible buffer
+     when we're currently in the mini-buffer, and give up if so.  */
+  XSETBUFFER (tem, current_buffer);
+  if (EQ (tem, XWINDOW (minibuf_window)->buffer))
+    {
+      tem = Fother_buffer (buf, Qnil, Qnil);
+      Fset_buffer (tem);
+      if (EQ (buf, tem))
+       return Qnil;
+    }
+
   /* Now there is no question: we can kill the buffer.  */
 
 #ifdef CLASH_DETECTION