diff options
| author | Richard M. Stallman | 1995-07-25 21:14:46 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-07-25 21:14:46 +0000 |
| commit | 785ee691c3a744048d7baa671a48e5a9aa428362 (patch) | |
| tree | 569d2b0a5f72021b34612091ab39d4d055c04141 /src | |
| parent | 6c1bf12bb7a5bbe7bbed21fde8d80c36c4ad5222 (diff) | |
| download | emacs-785ee691c3a744048d7baa671a48e5a9aa428362.tar.gz emacs-785ee691c3a744048d7baa671a48e5a9aa428362.zip | |
(struct frame): Rename `display' member to `output_data'.
Use new data type name for output_data.x.
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.h | 6 |
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 | |||
| 171 | enum output_method output_method; | 171 | enum output_method output_method; |
| 172 | 172 | ||
| 173 | /* A structure of auxiliary data used for displaying the contents. | 173 | /* A structure of auxiliary data used for displaying the contents. |
| 174 | struct x_display is used for X window frames; | 174 | struct x_output is used for X window frames; |
| 175 | it is defined in xterm.h. */ | 175 | it is defined in xterm.h. */ |
| 176 | union display { struct x_display *x; int nothing; } display; | 176 | union output_data { struct x_output *x; int nothing; } output_data; |
| 177 | 177 | ||
| 178 | #ifdef MULTI_KBOARD | 178 | #ifdef MULTI_KBOARD |
| 179 | /* A pointer to the kboard structure associated with this frame. | 179 | /* A pointer to the kboard structure associated with this frame. |
| @@ -300,7 +300,7 @@ typedef struct frame *FRAME_PTR; | |||
| 300 | 300 | ||
| 301 | #define WINDOW_FRAME(w) (w)->frame | 301 | #define WINDOW_FRAME(w) (w)->frame |
| 302 | 302 | ||
| 303 | #define FRAME_LIVE_P(f) ((f)->display.nothing != 0) | 303 | #define FRAME_LIVE_P(f) ((f)->output_data.nothing != 0) |
| 304 | #define FRAME_TERMCAP_P(f) ((f)->output_method == output_termcap) | 304 | #define FRAME_TERMCAP_P(f) ((f)->output_method == output_termcap) |
| 305 | #define FRAME_X_P(f) ((f)->output_method == output_x_window) | 305 | #define FRAME_X_P(f) ((f)->output_method == output_x_window) |
| 306 | #define FRAME_MINIBUF_ONLY_P(f) \ | 306 | #define FRAME_MINIBUF_ONLY_P(f) \ |