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

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   07/12/01 15:57:41

Index: w32console.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32console.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- w32console.c        30 Nov 2007 17:15:46 -0000      1.56
+++ w32console.c        1 Dec 2007 15:57:41 -0000       1.57
@@ -517,12 +517,15 @@
   if (NILP (Vtty_defined_color_alist))
     return char_attr;
 
-  if (face->foreground >= 0
-      && face->foreground < 16)
+  /* Colors should be in the range 0...15 unless they are one of
+     FACE_TTY_DEFAULT_COLOR, FACE_TTY_DEFAULT_FG_COLOR or
+     FACE_TTY_DEFAULT_BG_COLOR.  Other out of range colors are
+     invalid, so it is better to use the default color if they ever
+     get through to here.  */
+  if (face->foreground >= 0 && face->foreground < 16)
     char_attr = (char_attr & 0xfff0) + face->foreground;
 
-  if (face->background >= 0
-      && face->background < 16)
+  if (face->background >= 0 && face->background < 16)
     char_attr = (char_attr & 0xff0f) + (face->background << 4);
 
   return char_attr;