Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)

[bpt/emacs.git] / src / termchar.h

diff --git a/src/termchar.h b/src/termchar.h
index 3053061..5502ca2 100644 (file)
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -1,5 +1,5 @@
 /* Flags and parameters describing terminal's characteristics.
-   Copyright (C) 1985, 1986, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -70,6 +70,11 @@ struct tty_display_info
   /* The previous terminal frame we displayed on this tty.  */
   struct frame *previous_terminal_frame;
 
+#ifdef MULTI_KBOARD
+  /* The terminal's keyboard object. */
+  struct kboard *kboard;
+#endif  
+
   /* Strings, numbers and flags taken from the termcap entry.  */
 
   char *TS_ins_line;           /* "al" */
@@ -185,10 +190,6 @@ struct tty_display_info
   /* Nonzero means use ^S/^Q for flow control.  */
   int flow_control;
 
-#ifdef MULTI_KBOARD
-  /* The terminal's keyboard object. */
-  struct kboard *kboard;
-#endif  
 };
 
 /* A chain of structures for all tty devices currently in use. */