summaryrefslogtreecommitdiff
path: root/src/terminal.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-07-31 02:47:32 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-07-31 02:47:32 +0000
commit69ab3201ca6f6ef1414d678fd9cb13dd4d6f6b95 (patch)
tree00ab60bc1db392c982034d7ae88f619ac340c48c /src/terminal.c
parenta36abf0ef31eb9d684cb18b475d40be9122dc0f5 (diff)
downloademacs-69ab3201ca6f6ef1414d678fd9cb13dd4d6f6b95.tar.gz
* s/ms-w32.h (MULTI_KBOARD): Remove.
* xterm.c: * xselect.c: * xfns.c: * window.c: * w32term.c: * w32fns.c: * terminal.c: * termhooks.h: * term.c: * sysdep.c: * keyboard.h: * keyboard.c: * frame.h: * frame.c: * frame.c: Remove references to MULTI_KBOARD, it is now the default. * config.in: Regenerate. * config.nt (MULTI_KBOARD): Remove. * configure.in (MULTI_KBOARD): Remove.
Diffstat (limited to 'src/terminal.c')
-rw-r--r--src/terminal.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 9ec14ca3c1f..6b6edf14316 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -284,13 +284,11 @@ delete_terminal (struct terminal *terminal)
xfree (terminal->terminal_coding);
terminal->terminal_coding = NULL;
-#ifdef MULTI_KBOARD
if (terminal->kboard && --terminal->kboard->reference_count == 0)
{
delete_kboard (terminal->kboard);
terminal->kboard = NULL;
}
-#endif
}
Lisp_Object Qrun_hook_with_args;
@@ -535,9 +533,7 @@ init_initial_terminal (void)
initial_terminal = create_terminal ();
initial_terminal->type = output_initial;
initial_terminal->name = xstrdup ("initial_terminal");
-#ifdef MULTI_KBOARD
initial_terminal->kboard = initial_kboard;
-#endif
initial_terminal->delete_terminal_hook = &delete_initial_terminal;
/* All other hooks are NULL. */