Merge from emacs--devo--0

[gnu-emacs] / src / termchar.h

diff --git a/src/termchar.h b/src/termchar.h
index 87072136317888eecfb1d8026bf16a8b868c4847..381210fd6582cdbced9586af8c1959faf74f96f6 100644 (file)
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -1,12 +1,12 @@
 /* Flags and parameters describing terminal's characteristics.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -58,9 +58,9 @@ struct tty_display_info
 
   int reference_count;          /* Number of frames that are on this display. */
 
-  struct device *device;        /* Points back to the generic display device
+  struct terminal *terminal;    /* Points back to the generic terminal
                                    structure.  This is sometimes handy. */
-  
+
   /* Info on cursor positioning.  */
   struct cm *Wcm;
 
@@ -68,8 +68,8 @@ struct tty_display_info
 
   Lisp_Object top_frame;        /* The topmost frame on this tty. */
   
-  /* The previous terminal frame we displayed on this tty.  */
-  struct frame *previous_terminal_frame;
+  /* The previous frame we displayed on this tty.  */
+  struct frame *previous_frame;
 
   /* Strings, numbers and flags taken from the termcap entry.  */
 
@@ -194,7 +194,7 @@ extern struct tty_display_info *tty_list;
 
 #define FRAME_TTY(f)                            \
   ((f)->output_method == output_termcap         \
-   ? (f)->device->display_info.tty              \
+   ? (f)->terminal->display_info.tty            \
    : (abort(), (struct tty_display_info *) 0))
 
 #define CURTTY() FRAME_TTY (SELECTED_FRAME())