Rename `struct device' to `struct terminal'. Rename some terminal-related functions...

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

diff --git a/src/termchar.h b/src/termchar.h
index 8707213..f4b58f1 100644 (file)
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -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;
 
@@ -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())