(tty_defined_color): Declare color_idx unsigned long.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b28faa07505f6a90080ad9cd071f1a4bea49894..8ea781c54c1fdfba07263790d1be8f4f2311d275 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-14  Dave Love  <fx@gnu.org>
+
+       * xfaces.c (tty_defined_color): Declare color_idx unsigned long.
+
 2000-02-14  Stefan Monnier  <monnier@cs.yale.edu>
 
        * regex.h (RE_SYNTAX_EMACS): Add RE_CHAR_CLASSES and RE_INTERVALS

diff --git a/src/xfaces.c b/src/xfaces.c
index c4d7923d26efeac98902fdfecb4579bd436ce854..30f122d86514d8125ad0e10fb290c91d3af656c2 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1085,7 +1085,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,
+    red = 0, green = 0, blue = 0;
   int status = 1;
 
   if (*color_name && !NILP (Ffboundp (Qtty_color_desc)))
@@ -1121,7 +1122,7 @@ tty_defined_color (f, color_name, color_def, alloc)
        color_idx = FACE_TTY_DEFAULT_BG_COLOR;
     }
 
-  color_def->pixel = (unsigned long) color_idx;
+  color_def->pixel = color_idx;
   color_def->red = red;
   color_def->green = green;
   color_def->blue = blue;