(Fcall_interactively): Don't select an active minibuffer.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/callint.c b/src/callint.c
index fa3ab422f28..a489a8243d6 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -328,7 +328,13 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
 	      && XTYPE (event = XCONS (event)->cdr) == Lisp_Cons
 	      && XTYPE (event = XCONS (event)->car) == Lisp_Cons
 	      && XTYPE (event = XCONS (event)->car) == Lisp_Window)
-	    Fselect_window (event);
+	    {
+	      if (MINI_WINDOW_P (XWINDOW (window))
+		  && NILP (call1 (intern ("minibuffer-window-active-p"),
+				  window)))
+		error ("Attempt to select inactive minibuffer window");
+	      Fselect_window (event);
+	    }
 	  string++;
 	}
       else break;