(x_term_init): If the previous kboard was the dummy one,

switch to the new one immediately.

diff --git a/src/xterm.c b/src/xterm.c
index cf05dcc0b6c15a88f56b1283445955241f4bfebe..bfead8cc96a9a2114a11be240ccfa2b022d0672e 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5626,6 +5626,11 @@ x_term_init (display_name, xrm_option, resource_name)
        init_kboard (dpyinfo->kboard);
        dpyinfo->kboard->next_kboard = all_kboards;
        all_kboards = dpyinfo->kboard;
+       /* Don't let the initial kboard remain current longer than necessary.
+          That would cause problems if a file loaded on startup tries to
+          prompt in the minibuffer.  */
+       if (current_kboard == initial_kboard)
+         current_kboard = dpyinfo->kboard;
       }
     dpyinfo->kboard->reference_count++;
   }