Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283

1 files changed, 1 insertions, 11 deletions

diff --git a/src/frame.c b/src/frame.c
index eecc6878c55..759e21c25c8 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -523,17 +523,7 @@ make_initial_frame (void)
   struct terminal *terminal;
   Lisp_Object frame;
 
-#ifdef MULTI_KBOARD
-  /* Create the initial keyboard. */
-  if (!initial_kboard)
-    {
-      initial_kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
-      init_kboard (initial_kboard);
-      /* Leave Vwindow_system at its `t' default for now.  */
-      initial_kboard->next_kboard = all_kboards;
-      all_kboards = initial_kboard;
-    }
-#endif
+  eassert (initial_kboard);
 
   /* The first call must initialize Vframe_list.  */
   if (! (NILP (Vframe_list) || CONSP (Vframe_list)))