Mercurial > emacs
diff src/frame.c @ 85839:f32c70475c8e
* keyboard.c (syms_of_keyboard): Initialize the initial_kboard.
(init_keyboard): Set current_kboard's window-system to nil.
(tty_read_avail_input): Typo.
* frame.c (make_initial_frame): Don't initialize the initial_kboard.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 31 Oct 2007 19:25:32 +0000 |
parents | b210bba3f477 |
children | 107ccd98fa12 880960b70474 |
line wrap: on
line diff
--- a/src/frame.c Wed Oct 31 16:16:12 2007 +0000 +++ b/src/frame.c Wed Oct 31 19:25:32 2007 +0000 @@ -513,17 +513,7 @@ 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)))