aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Innes2001-01-20 13:53:57 +0000
committerAndrew Innes2001-01-20 13:53:57 +0000
commite689ec067a71bfce286f230b478c98f914db14de (patch)
treef44d8685bbff1f6ae6796cd75466912ffd200c16 /src
parentd0554957e49eccae9e389a24717e10deb9aa82d1 (diff)
downloademacs-e689ec067a71bfce286f230b478c98f914db14de.tar.gz
emacs-e689ec067a71bfce286f230b478c98f914db14de.zip
(realize_default_face):
(realize_face): (realize_tty_face): Remove references to FRAME_W32_CONSOLE_P.
Diffstat (limited to 'src')
-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)
6158 LFACE_FOREGROUND (lface) = XCDR (color); 6158 LFACE_FOREGROUND (lface) = XCDR (color);
6159 else if (FRAME_WINDOW_P (f)) 6159 else if (FRAME_WINDOW_P (f))
6160 return 0; 6160 return 0;
6161 else if (FRAME_TERMCAP_P (f) 6161 else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
6162 || FRAME_MSDOS_P (f)
6163 || FRAME_W32_CONSOLE_P (f))
6164 LFACE_FOREGROUND (lface) = build_string (unspecified_fg); 6162 LFACE_FOREGROUND (lface) = build_string (unspecified_fg);
6165 else 6163 else
6166 abort (); 6164 abort ();
@@ -6175,9 +6173,7 @@ realize_default_face (f)
6175 LFACE_BACKGROUND (lface) = XCDR (color); 6173 LFACE_BACKGROUND (lface) = XCDR (color);
6176 else if (FRAME_WINDOW_P (f)) 6174 else if (FRAME_WINDOW_P (f))
6177 return 0; 6175 return 0;
6178 else if (FRAME_TERMCAP_P (f) 6176 else if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
6179 || FRAME_MSDOS_P (f)
6180 || FRAME_W32_CONSOLE_P (f))
6181 LFACE_BACKGROUND (lface) = build_string (unspecified_bg); 6177 LFACE_BACKGROUND (lface) = build_string (unspecified_bg);
6182 else 6178 else
6183 abort (); 6179 abort ();
@@ -6264,9 +6260,7 @@ realize_face (cache, attrs, c, base_face, former_face_id)
6264 6260
6265 if (FRAME_WINDOW_P (cache->f)) 6261 if (FRAME_WINDOW_P (cache->f))
6266 face = realize_x_face (cache, attrs, c, base_face); 6262 face = realize_x_face (cache, attrs, c, base_face);
6267 else if (FRAME_TERMCAP_P (cache->f) 6263 else if (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f))
6268 || FRAME_MSDOS_P (cache->f)
6269 || FRAME_W32_CONSOLE_P (cache->f))
6270 face = realize_tty_face (cache, attrs, c); 6264 face = realize_tty_face (cache, attrs, c);
6271 else 6265 else
6272 abort (); 6266 abort ();
@@ -6618,14 +6612,11 @@ realize_tty_face (cache, attrs, c)
6618 struct frame *f = cache->f; 6612 struct frame *f = cache->f;
6619 6613
6620 /* Frame must be a termcap frame. */ 6614 /* Frame must be a termcap frame. */
6621 xassert (FRAME_TERMCAP_P (cache->f) 6615 xassert (FRAME_TERMCAP_P (cache->f) || FRAME_MSDOS_P (cache->f));
6622 || FRAME_MSDOS_P (cache->f)
6623 || FRAME_W32_CONSOLE_P (cache->f));
6624 6616
6625 /* Allocate a new realized face. */ 6617 /* Allocate a new realized face. */
6626 face = make_realized_face (attrs); 6618 face = make_realized_face (attrs);
6627 face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" 6619 face->font_name = FRAME_MSDOS_P (cache->f) ? "ms-dos" : "tty";
6628 : FRAME_W32_CONSOLE_P (cache->f) ? "w32console" : "tty";
6629 6620
6630 /* Map face attributes to TTY appearances. We map slant to 6621 /* Map face attributes to TTY appearances. We map slant to
6631 dimmed text because we want italic text to appear differently 6622 dimmed text because we want italic text to appear differently