diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-10 10:48:42 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-10 10:48:42 +0400 |
| commit | 1afcba638a6ecf9fe6db1e52594024b323d4145e (patch) | |
| tree | f43c87166dc7ca92b95294029ff23cf71295a8fe /src/xterm.c | |
| parent | 20832de03e2f5f7a98f97e3f1ae5f03f26d00b77 (diff) | |
| download | emacs-1afcba638a6ecf9fe6db1e52594024b323d4145e.tar.gz | |
* keyboard.c (init_kboard): Now static. Add arg
to denote window system. Adjust comment.
(init_keyboard): Adjust user.
(allocate_kboard): New function.
(syms_of_keyboard):
* nsterm.m (ns_term_init):
* term.c (init_tty):
* w32term.c (w32_create_terminal):
* xterm.c (x_term_init): Use it.
* keyboard.h (init_kboard): Remove prototype.
(allocate_kboard): Add prototype.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/xterm.c b/src/xterm.c index 1ccc1ae649b..3299255461f 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -9905,15 +9905,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) terminal->kboard = share->terminal->kboard; else { - terminal->kboard = xmalloc (sizeof *terminal->kboard); - init_kboard (terminal->kboard); - kset_window_system (terminal->kboard, Qx); - - /* Add the keyboard to the list before running Lisp code (via - Qvendor_specific_keysyms below), since these are not traced - via terminals but only through all_kboards. */ - terminal->kboard->next_kboard = all_kboards; - all_kboards = terminal->kboard; + terminal->kboard = allocate_kboard (Qx); if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound)) { |