Mercurial > emacs

changeset 27893:0f639a575917

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(tty_defined_color): Apply xfaces.c change from 02-17.
author Jason Rumney <jasonr@gnu.org>
date Sun, 27 Feb 2000 21:32:22 +0000
parents 1857b9695885
children 6c4ff3519d09
files src/w32faces.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32faces.c	Sun Feb 27 21:31:07 2000 +0000
+++ b/src/w32faces.c	Sun Feb 27 21:32:22 2000 +0000
@@ -1093,7 +1093,8 @@
      int alloc;
 {
   Lisp_Object color_desc;
-  int color_idx = FACE_TTY_DEFAULT_COLOR, red = 0, green = 0, blue = 0;
+  unsigned long color_idx = FACE_TTY_DEFAULT_COLOR;
+  unsigned long red = 0, green = 0, blue = 0;
   int status = 1;
 
   if (*color_name && !NILP (Ffboundp (Qtty_color_desc)))
@@ -1129,7 +1130,10 @@
 	color_idx = FACE_TTY_DEFAULT_BG_COLOR;
     }
 
-  color_def->pixel = (unsigned long) color_idx;
+  if (color_idx != FACE_TTY_DEFAULT_COLOR)
+    status = 1;
+
+  color_def->pixel = color_idx;
   color_def->red = red;
   color_def->green = green;
   color_def->blue = blue;