(make_frame): Initialize kboard member.

(make_terminal_frame): Create initial_kboard if not already set.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/frame.c b/src/frame.c
index 8f564d103cb..3dc70c4d30c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -179,6 +179,9 @@ make_frame (mini_p)
   f->menu_bar_vector = Qnil;
   f->menu_bar_items_used = 0;
   f->buffer_predicate = Qnil;
+#ifdef MULTI_KBOARD
+  f->kboard = initial_kboard;
+#endif
 
   root_window = make_window ();
   if (mini_p)
@@ -332,6 +335,14 @@ make_terminal_frame ()
   Lisp_Object frame;
   char name[20];
 
+#ifdef MULTI_KBOARD
+  if (!initial_kboard)
+    {
+      initial_kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
+      init_kboard (initial_kboard);
+    }
+#endif
+
   /* The first call must initialize Vframe_list.  */
   if (! (NILP (Vframe_list) || CONSP (Vframe_list)))
     Vframe_list = Qnil;