diff options
| author | Paul Eggert | 2019-12-14 14:13:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2019-12-14 14:22:35 -0800 |
| commit | bb42f6ef10cb250a9263b17a8794e950a563d5d0 (patch) | |
| tree | 9db1aead15c3e08e640f9342de6c15e5d9eabf7c | |
| parent | a01a7222829682962a229e26688a4d44829b6d5f (diff) | |
| download | emacs-bb42f6ef10cb250a9263b17a8794e950a563d5d0.tar.gz emacs-bb42f6ef10cb250a9263b17a8794e950a563d5d0.zip | |
Remove nothing from union output_data
* src/frame.h (union output_data): Remove ‘nothing’ member.
It has had no effect for quite some time.
All uses removed.
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/frame.h | 1 | ||||
| -rw-r--r-- | src/xterm.c | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/src/frame.c b/src/frame.c index 5468920c357..df4c98c6145 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1115,7 +1115,6 @@ make_initial_frame (void) | |||
| 1115 | f->output_method = terminal->type; | 1115 | f->output_method = terminal->type; |
| 1116 | f->terminal = terminal; | 1116 | f->terminal = terminal; |
| 1117 | f->terminal->reference_count++; | 1117 | f->terminal->reference_count++; |
| 1118 | f->output_data.nothing = 0; | ||
| 1119 | 1118 | ||
| 1120 | FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; | 1119 | FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR; |
| 1121 | FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; | 1120 | FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR; |
| @@ -2136,7 +2135,6 @@ delete_frame (Lisp_Object frame, Lisp_Object force) | |||
| 2136 | if (FRAME_TERMINAL (f)->delete_frame_hook) | 2135 | if (FRAME_TERMINAL (f)->delete_frame_hook) |
| 2137 | (*FRAME_TERMINAL (f)->delete_frame_hook) (f); | 2136 | (*FRAME_TERMINAL (f)->delete_frame_hook) (f); |
| 2138 | terminal = FRAME_TERMINAL (f); | 2137 | terminal = FRAME_TERMINAL (f); |
| 2139 | f->output_data.nothing = 0; | ||
| 2140 | f->terminal = 0; /* Now the frame is dead. */ | 2138 | f->terminal = 0; /* Now the frame is dead. */ |
| 2141 | unblock_input (); | 2139 | unblock_input (); |
| 2142 | 2140 | ||
diff --git a/src/frame.h b/src/frame.h index f408f12394a..7331ea04437 100644 --- a/src/frame.h +++ b/src/frame.h | |||
| @@ -573,7 +573,6 @@ struct frame | |||
| 573 | struct x_output *x; /* From xterm.h. */ | 573 | struct x_output *x; /* From xterm.h. */ |
| 574 | struct w32_output *w32; /* From w32term.h. */ | 574 | struct w32_output *w32; /* From w32term.h. */ |
| 575 | struct ns_output *ns; /* From nsterm.h. */ | 575 | struct ns_output *ns; /* From nsterm.h. */ |
| 576 | intptr_t nothing; | ||
| 577 | } | 576 | } |
| 578 | output_data; | 577 | output_data; |
| 579 | 578 | ||
diff --git a/src/xterm.c b/src/xterm.c index 278c498125e..55e5cb76f2d 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -2099,7 +2099,6 @@ x_frame_of_widget (Widget widget) | |||
| 2099 | { | 2099 | { |
| 2100 | f = XFRAME (frame); | 2100 | f = XFRAME (frame); |
| 2101 | if (FRAME_X_P (f) | 2101 | if (FRAME_X_P (f) |
| 2102 | && f->output_data.nothing != 1 | ||
| 2103 | && FRAME_DISPLAY_INFO (f) == dpyinfo | 2102 | && FRAME_DISPLAY_INFO (f) == dpyinfo |
| 2104 | && f->output_data.x->widget == widget) | 2103 | && f->output_data.x->widget == widget) |
| 2105 | return f; | 2104 | return f; |