Mercurial > emacs

diff src/xfaces.c @ 91204:53108e6cea98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
author Miles Bader <miles@gnu.org>
date Thu, 06 Dec 2007 09:51:45 +0000
parents 609500aa30a8 51288a744d1c
children 606f2d163a64
line wrap: on
line diff
--- a/src/xfaces.c	Thu Dec 06 07:36:30 2007 +0000
+++ b/src/xfaces.c	Thu Dec 06 09:51:45 2007 +0000
@@ -1474,10 +1474,6 @@
   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 @@
     {
       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 @@
 	      face->lface[idx] = tty_color_name (f, pixel);
 	      *defaulted = 1;
 	    }
-#ifdef MSDOS
-	}
-#endif
-#endif /* MSDOS or WINDOWSNT */
+        }
+#endif /* MSDOS */
     }
 
   if (foreground_p)