summaryrefslogtreecommitdiff
path: root/src/frame.h
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-07-25 21:14:46 +0000
committerRichard M. Stallman <rms@gnu.org>1995-07-25 21:14:46 +0000
commit785ee691c3a744048d7baa671a48e5a9aa428362 (patch)
tree569d2b0a5f72021b34612091ab39d4d055c04141 /src/frame.h
parent6c1bf12bb7a5bbe7bbed21fde8d80c36c4ad5222 (diff)
downloademacs-785ee691c3a744048d7baa671a48e5a9aa428362.tar.gz
(struct frame): Rename `display' member to `output_data'.
Use new data type name for output_data.x.
Diffstat (limited to 'src/frame.h')
-rw-r--r--src/frame.h6
1 files changed, 3 insertions, 3 deletions
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) \