diff options
| author | Miles Bader <miles@gnu.org> | 2007-12-06 09:51:45 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-12-06 09:51:45 +0000 |
| commit | 40f159a4ae7d081d4ced7c12a9eea261317c4ea9 (patch) | |
| tree | d6c70803dc99aa1441ccd764033a34e3c6169158 /src/xfaces.c | |
| parent | 64effd5514fcb3e902c99e7bc211b156be01bead (diff) | |
| parent | c6b18b69fc894b12b70b780ff864fb95ffdcf7ee (diff) | |
| download | emacs-40f159a4ae7d081d4ced7c12a9eea261317c4ea9.tar.gz | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index f43054fe06a..853a3867f63 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1474,10 +1474,6 @@ tty_color_name (f, idx) if (idx == FACE_TTY_DEFAULT_BG_COLOR) return build_string (unspecified_bg); -#ifdef WINDOWSNT - return vga_stdcolor_name (idx); -#endif - return Qunspecified; } @@ -7948,13 +7944,11 @@ map_tty_color (f, face, idx, defaulted) { pixel = load_color (f, face, color, idx); -#if defined (MSDOS) || defined (WINDOWSNT) +#ifdef MSDOS /* If the foreground of the default face is the default color, use the foreground color defined by the frame. */ -#ifdef MSDOS if (FRAME_MSDOS_P (f)) { -#endif /* MSDOS */ if (pixel == default_pixel || pixel == FACE_TTY_DEFAULT_COLOR) { @@ -7974,10 +7968,8 @@ map_tty_color (f, face, idx, defaulted) face->lface[idx] = tty_color_name (f, pixel); *defaulted = 1; } -#ifdef MSDOS - } -#endif -#endif /* MSDOS or WINDOWSNT */ + } +#endif /* MSDOS */ } if (foreground_p) |