[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master bb42f6e 1/2: Remove nothing from union output_data
From: |
Paul Eggert |
Subject: |
master bb42f6e 1/2: Remove nothing from union output_data |
Date: |
Sat, 14 Dec 2019 17:22:41 -0500 (EST) |
branch: master
commit bb42f6ef10cb250a9263b17a8794e950a563d5d0
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
src/frame.c | 2 --
src/frame.h | 1 -
src/xterm.c | 1 -
3 files changed, 4 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index 5468920..df4c98c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1115,7 +1115,6 @@ make_initial_frame (void)
f->output_method = terminal->type;
f->terminal = terminal;
f->terminal->reference_count++;
- f->output_data.nothing = 0;
FRAME_FOREGROUND_PIXEL (f) = FACE_TTY_DEFAULT_FG_COLOR;
FRAME_BACKGROUND_PIXEL (f) = FACE_TTY_DEFAULT_BG_COLOR;
@@ -2136,7 +2135,6 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
if (FRAME_TERMINAL (f)->delete_frame_hook)
(*FRAME_TERMINAL (f)->delete_frame_hook) (f);
terminal = FRAME_TERMINAL (f);
- f->output_data.nothing = 0;
f->terminal = 0; /* Now the frame is dead. */
unblock_input ();
diff --git a/src/frame.h b/src/frame.h
index f408f12..7331ea0 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -573,7 +573,6 @@ struct frame
struct x_output *x; /* From xterm.h. */
struct w32_output *w32; /* From w32term.h. */
struct ns_output *ns; /* From nsterm.h. */
- intptr_t nothing;
}
output_data;
diff --git a/src/xterm.c b/src/xterm.c
index 278c498..55e5cb7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2099,7 +2099,6 @@ x_frame_of_widget (Widget widget)
{
f = XFRAME (frame);
if (FRAME_X_P (f)
- && f->output_data.nothing != 1
&& FRAME_DISPLAY_INFO (f) == dpyinfo
&& f->output_data.x->widget == widget)
return f;