Mercurial > emacs

diff src/term.c @ 97141:840bd675fd85 before-remove-vms

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Dan Nicolaescu <dann@ics.uci.edu>
date Thu, 31 Jul 2008 02:47:32 +0000
parents 9592c50233ab
children c3512b2085a0
line wrap: on
line diff
--- a/src/term.c	Thu Jul 31 01:37:35 2008 +0000
+++ b/src/term.c	Thu Jul 31 02:47:32 2008 +0000
@@ -3571,7 +3571,6 @@
   tty->TF_teleray = tgetflag ("xt");
 
 #endif /* !WINDOWSNT  */
-#ifdef MULTI_KBOARD
   terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
   init_kboard (terminal->kboard);
   terminal->kboard->Vwindow_system = Qnil;
@@ -3585,10 +3584,7 @@
     current_kboard = terminal->kboard;
 #ifndef WINDOWSNT
   term_get_fkeys (address, terminal->kboard);
-#endif
-#endif
-
-#ifndef WINDOWSNT
+
   /* Get frame size from system, or else from termcap.  */
   {
     int height, width;