From: Jason Rumney <jasonr@gnu.org>
Date: Sun, 27 Feb 2000 21:32:22 +0000 (+0000)
Subject: (tty_defined_color): Apply xfaces.c change from 02-17.
X-Git-Tag: emacs-pretest-21.0.90~4859
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bcc4670cfe5fa06c8bd2e920b7f3913dabdb3426;p=emacs.git

(tty_defined_color): Apply xfaces.c change from 02-17.
---

diff --git a/src/w32faces.c b/src/w32faces.c
index 5384f97ad7c..65828f04e52 100644
--- a/src/w32faces.c
+++ b/src/w32faces.c
@@ -1093,7 +1093,8 @@ tty_defined_color (f, color_name, color_def, alloc)
      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 @@ tty_defined_color (f, color_name, color_def, alloc)
 	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;