# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 842639117 0
# Node ID 9b0180c495ff03babcbc83bfdf32bd7d2fa52987
# Parent  7f8ce4d3e9556da4a110622aa47902c861f80cfa
(read_minibuf): If not in minibuffer window,
cancel the active minibuffer.

diff -r 7f8ce4d3e955 -r 9b0180c495ff src/minibuf.c
--- a/src/minibuf.c	Fri Sep 13 17:03:29 1996 +0000
+++ b/src/minibuf.c	Fri Sep 13 18:25:17 1996 +0000
@@ -191,9 +191,15 @@
     prompt = build_string ("");
 
   if (!enable_recursive_minibuffers
-      && minibuf_level > 0
-      && (EQ (selected_window, minibuf_window)))
-    error ("Command attempted to use minibuffer while in minibuffer");
+      && minibuf_level > 0)
+    {
+      if (EQ (selected_window, minibuf_window))
+	error ("Command attempted to use minibuffer while in minibuffer");
+      else
+	/* If we're in another window, cancel the minibuffer that's active.  */
+	Fthrow (Qexit,
+		build_string ("Command attempted to use minibuffer while in minibuffer"));
+    }
 
   /* Choose the minibuffer window and frame, and take action on them.  */