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

switch to the new one immediately.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/xterm.c b/src/xterm.c
index cf05dcc0b6c..bfead8cc96a 100644
--- 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++;
   }