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

diff --git a/src/callint.c b/src/callint.c
index fa3ab422f283da4f857b40605cb68934c3184f29..a489a8243d6ecb17d26058275c7251bd480f2b4d 100644 (file)
--- 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;