summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Innes <andrewi@gnu.org>2001-01-20 13:53:57 +0000
committerAndrew Innes <andrewi@gnu.org>2001-01-20 13:53:57 +0000
commite689ec067a71bfce286f230b478c98f914db14de (patch)
treef44d8685bbff1f6ae6796cd75466912ffd200c16
parentd0554957e49eccae9e389a24717e10deb9aa82d1 (diff)
downloademacs-e689ec067a71bfce286f230b478c98f914db14de.tar.gz
(realize_default_face):
(realize_face): (realize_tty_face): Remove references to FRAME_W32_CONSOLE_P.
-rw-r--r--src/xfaces.c19
1 files changed, 5 insertions, 14 deletions
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