[Emacs-diffs] Changes to emacs/src/xfaces.c,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   07/11/30 13:56:28

Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -b -r1.369 -r1.370
--- xfaces.c    9 Nov 2007 09:45:24 -0000       1.369
+++ xfaces.c    30 Nov 2007 13:56:27 -0000      1.370
@@ -1463,10 +1463,6 @@
   if (idx == FACE_TTY_DEFAULT_BG_COLOR)
     return build_string (unspecified_bg);
 
-#ifdef WINDOWSNT
-  return vga_stdcolor_name (idx);
-#endif
-
   return Qunspecified;
 }
 
@@ -7464,13 +7460,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)
            {
@@ -7490,10 +7484,8 @@
              face->lface[idx] = tty_color_name (f, pixel);
              *defaulted = 1;
            }
-#ifdef MSDOS
        }
-#endif
-#endif /* MSDOS or WINDOWSNT */
+#endif /* MSDOS */
     }
 
   if (foreground_p)