Merge branch 'master' into feature/igc3feature/igc3

1 files changed, 5 insertions, 5 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index 567a56d229c..fdc08391fb7 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5827,7 +5827,7 @@ face for italic.  */)
     }
 
   /* Dispatch to the appropriate handler.  */
-  if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
+  if (is_tty_frame (f))
     supports = tty_supports_face_attributes_p (f, attrs, def_face);
 #ifdef HAVE_WINDOW_SYSTEM
   else
@@ -6121,7 +6121,7 @@ realize_default_face (struct frame *f)
         ASET (lface, LFACE_FOREGROUND_INDEX, XCDR (color));
       else if (FRAME_WINDOW_P (f))
         return false;
-      else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
+      else if (FRAME_INITIAL_P (f) || is_tty_frame (f))
         ASET (lface, LFACE_FOREGROUND_INDEX, build_string (unspecified_fg));
       else
         emacs_abort ();
@@ -6136,7 +6136,7 @@ realize_default_face (struct frame *f)
         ASET (lface, LFACE_BACKGROUND_INDEX, XCDR (color));
       else if (FRAME_WINDOW_P (f))
         return false;
-      else if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
+      else if (FRAME_INITIAL_P (f) || is_tty_frame (f))
         ASET (lface, LFACE_BACKGROUND_INDEX, build_string (unspecified_bg));
       else
         emacs_abort ();
@@ -6247,7 +6247,7 @@ realize_face (struct face_cache *cache, Lisp_Object attrs[LFACE_VECTOR_SIZE],
 
   if (FRAME_WINDOW_P (cache->f))
     face = realize_gui_face (cache, attrs);
-  else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f))
+  else if (is_tty_frame (cache->f))
     face = realize_tty_face (cache, attrs);
   else if (FRAME_INITIAL_P (cache->f))
     {
@@ -6760,7 +6760,7 @@ realize_tty_face (struct face_cache *cache,
   struct frame *f = cache->f;
 
   /* Frame must be a termcap frame.  */
-  eassert (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f));
+  eassert (is_tty_frame (cache->f));
 
   /* Allocate a new realized face.  */
   face = make_realized_face (attrs);