From: Andrew Innes <andrewi@gnu.org>
Date: Sat, 20 Jan 2001 13:53:57 +0000 (+0000)
Subject: (realize_default_face):
X-Git-Tag: emacs-pretest-21.0.96~182
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e689ec067a71bfce286f230b478c98f914db14de;p=emacs.git

(realize_default_face):
(realize_face):
(realize_tty_face): Remove references to FRAME_W32_CONSOLE_P.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 51cb455e95a..c23de151cad 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6158,9 +6158,7 @@ realize_default_face (f)
 	LFACE_FOREGROUND (lface) = XCDR (color);
       else if (FRAME_WINDOW_P (f))
 	return 0;
-      else if (FRAME_TERMCAP_P (f)
-	       || FRAME_MSDOS_P (f)
-	       || FRAME_W32_CONSOLE_P (f))
+      else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
 	LFACE_FOREGROUND (lface) = build_string (unspecified_fg);
       else
 	abort ();
@@ -6175,9 +6173,7 @@ realize_default_face (f)
 	LFACE_BACKGROUND (lface) = XCDR (color);
       else if (FRAME_WINDOW_P (f))
 	return 0;
-      else if (FRAME_TERMCAP_P (f)
-	       || FRAME_MSDOS_P (f)
-	       || FRAME_W32_CONSOLE_P (f))
+      else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
 	LFACE_BACKGROUND (lface) = build_string (unspecified_bg);
       else
 	abort ();
@@ -6264,9 +6260,7 @@ realize_face (cache, attrs, c, base_face, former_face_id)
 
   if (FRAME_WINDOW_P (cache->f))
     face = realize_x_face (cache, attrs, c, base_face);
-  else if (FRAME_TERMCAP_P (cache->f)
-	   || FRAME_MSDOS_P (cache->f)
-	   || FRAME_W32_CONSOLE_P (cache->f))
+  else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f))
     face = realize_tty_face (cache, attrs, c);
   else
     abort ();
@@ -6618,14 +6612,11 @@ realize_tty_face (cache, attrs, c)
   struct frame *f = cache->f;
 
   /* Frame must be a termcap frame.  */
-  xassert (FRAME_TERMCAP_P (cache->f)
-	   || FRAME_MSDOS_P (cache->f)
-	   || FRAME_W32_CONSOLE_P (cache->f));
+  xassert (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f));
 
   /* Allocate a new realized face.  */
   face = make_realized_face (attrs);
-  face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" 
-    : FRAME_W32_CONSOLE_P (cache->f) ? "w32console" : "tty";
+  face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" : "tty";
 
   /* Map face attributes to TTY appearances.  We map slant to
      dimmed text because we want italic text to appear differently