Removed %T in mode-line-format. Trivial documentation changes.

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

diff --git a/src/termchar.h b/src/termchar.h
index 5b90829..e9efbc2 100644 (file)
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA.  */
 /* Each termcap frame points to its own struct tty_output object in
    the output_data.tty field.  The tty_output structure contains the
    information that is specific to termcap frames. */
+
 struct tty_output
 {
   /* The Emacs structure for the tty device this frame is on. */
@@ -30,6 +31,7 @@ struct tty_output
 };
 
 /* Parameters that are shared between frames on the same tty device. */
+
 struct tty_display_info
 {
   struct tty_display_info *next; /* Chain of all tty devices. */
@@ -52,6 +54,9 @@ struct tty_display_info
 
 
   int reference_count;          /* Number of frames that are on this display. */
+
+  struct display *display;      /* Points back to the generic display
+                                   structure.  This is sometimes handy. */
   
   /* Info on cursor positioning.  */
   struct cm *Wcm;
@@ -179,10 +184,6 @@ struct tty_display_info
   /* Nonzero means use ^S/^Q for flow control.  */
   int flow_control;
 
-  /* This is a copy of struct frame's display_method value; needed for
-     freeing up memory when deleting the tty. */
-  struct display_method *display_method;
-
 #ifdef MULTI_KBOARD
   /* The terminal's keyboard object. */
   struct kboard *kboard;
@@ -195,7 +196,7 @@ extern struct tty_display_info *tty_list;
 
 #define FRAME_TTY(f)                            \
   ((f)->output_method == output_termcap         \
-   ? (f)->output_data.tty->display_info         \
+   ? (f)->display->display_info.tty             \
    : (abort(), (struct tty_display_info *) 0))
 
 #define CURTTY() FRAME_TTY (SELECTED_FRAME())