From: Richard M. Stallman Date: Tue, 25 Jul 1995 21:14:46 +0000 (+0000) Subject: (struct frame): Rename `display' member to `output_data'. X-Git-Tag: emacs-19.34~3194 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=785ee691c3a744048d7baa671a48e5a9aa428362;p=emacs.git (struct frame): Rename `display' member to `output_data'. Use new data type name for output_data.x. --- diff --git a/src/frame.h b/src/frame.h index 51672995b30..509e0d142bb 100644 --- a/src/frame.h +++ b/src/frame.h @@ -171,9 +171,9 @@ struct frame enum output_method output_method; /* A structure of auxiliary data used for displaying the contents. - struct x_display is used for X window frames; + struct x_output is used for X window frames; it is defined in xterm.h. */ - union display { struct x_display *x; int nothing; } display; + union output_data { struct x_output *x; int nothing; } output_data; #ifdef MULTI_KBOARD /* A pointer to the kboard structure associated with this frame. @@ -300,7 +300,7 @@ typedef struct frame *FRAME_PTR; #define WINDOW_FRAME(w) (w)->frame -#define FRAME_LIVE_P(f) ((f)->display.nothing != 0) +#define FRAME_LIVE_P(f) ((f)->output_data.nothing != 0) #define FRAME_TERMCAP_P(f) ((f)->output_method == output_termcap) #define FRAME_X_P(f) ((f)->output_method == output_x_window) #define FRAME_MINIBUF_ONLY_P(f) \