From cc4c8e6e9f41bc07cb3047e4ecc52ccfeaac0c75 Mon Sep 17 00:00:00 2001
From: Basil L. Contovounesios
Date: Wed, 18 Mar 2026 12:16:37 +0100
Subject: Simplify some struct frame.output_method checks

* src/lisp.h (inhibit_window_system): Fix typo in commentary.
* src/dispnew.c (Fopen_termscript):
(init_display_interactive) [!HAVE_ANDROID, !MSDOS]:
* src/dosfns.c [MSDOS] (dos_cleanup):
* src/frame.c (frame_inhibit_resize, frame_windows_min_size)
(do_switch_frame, delete_frame):
(make_terminal_frame) [MSDOS]:
(Fmake_terminal_frame) [MSDOS, WINDOWSNT]:
* src/keyboard.c (read_decoded_event_from_main_queue) [!WINDOWSNT]:
(Fcurrent_input_mode):
* src/menu.c (single_menu_item):
* src/msdos.c [MSDOS] (internal_terminal_init):
* src/sysdep.c (init_sys_modes):
* src/term.c: [HAVE_GPM] (Fgpm_mouse_start, Fgpm_mouse_stop):
[MSDOS] (tty_free_frame_resources):
* src/w32xfns.c (get_frame_dc):
* src/xdisp.c (clear_garbaged_frames, hscroll_window_tree)
(redisplay_internal):
* src/xfaces.c (Fdisplay_supports_face_attributes_p)
(realize_default_face, realize_face, realize_tty_face): Use
is_tty_frame, FRAME_INITIAL_P, FRAME_MSDOS_P, FRAME_TERMCAP_P,
FRAME_W32_P, and FRAME_TTY as appropriate instead of open-coding
them (bug#80629).
---
 src/sysdep.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/sysdep.c')

diff --git a/src/sysdep.c b/src/sysdep.c
index 8895655566e..10269e4d0ce 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1341,8 +1341,7 @@ init_sys_modes (struct tty_display_info *tty_out)
       frame_garbaged = 1;
       FOR_EACH_FRAME (tail, frame)
         {
-          if ((FRAME_TERMCAP_P (XFRAME (frame))
-	       || FRAME_MSDOS_P (XFRAME (frame)))
+          if (is_tty_frame (XFRAME (frame))
               && FRAME_TTY (XFRAME (frame)) == tty_out)
             FRAME_GARBAGED_P (XFRAME (frame)) = 1;
         }
-- 
cgit v1.2.1