aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Love2000-02-14 18:05:57 +0000
committerDave Love2000-02-14 18:05:57 +0000
commit3a28db80b0af5cd6ab1d083427e205581bb00cb1 (patch)
tree1406b87ce3da55840e34cd8d67d286b45102eb33 /src
parent8a44227ac5dcf4b1786f2459cd1107e3342436f8 (diff)
downloademacs-3a28db80b0af5cd6ab1d083427e205581bb00cb1.tar.gz
emacs-3a28db80b0af5cd6ab1d083427e205581bb00cb1.zip
(tty_defined_color): Declare color_idx unsigned long.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfaces.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3b28faa0750..8ea781c54c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12000-02-14 Dave Love <fx@gnu.org>
2
3 * xfaces.c (tty_defined_color): Declare color_idx unsigned long.
4
12000-02-14 Stefan Monnier <monnier@cs.yale.edu> 52000-02-14 Stefan Monnier <monnier@cs.yale.edu>
2 6
3 * regex.h (RE_SYNTAX_EMACS): Add RE_CHAR_CLASSES and RE_INTERVALS 7 * regex.h (RE_SYNTAX_EMACS): Add RE_CHAR_CLASSES and RE_INTERVALS
diff --git a/src/xfaces.c b/src/xfaces.c
index c4d7923d26e..30f122d8651 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1085,7 +1085,8 @@ tty_defined_color (f, color_name, color_def, alloc)
1085 int alloc; 1085 int alloc;
1086{ 1086{
1087 Lisp_Object color_desc; 1087 Lisp_Object color_desc;
1088 int color_idx = FACE_TTY_DEFAULT_COLOR, red = 0, green = 0, blue = 0; 1088 unsigned long color_idx = FACE_TTY_DEFAULT_COLOR,
1089 red = 0, green = 0, blue = 0;
1089 int status = 1; 1090 int status = 1;
1090 1091
1091 if (*color_name && !NILP (Ffboundp (Qtty_color_desc))) 1092 if (*color_name && !NILP (Ffboundp (Qtty_color_desc)))
@@ -1121,7 +1122,7 @@ tty_defined_color (f, color_name, color_def, alloc)
1121 color_idx = FACE_TTY_DEFAULT_BG_COLOR; 1122 color_idx = FACE_TTY_DEFAULT_BG_COLOR;
1122 } 1123 }
1123 1124
1124 color_def->pixel = (unsigned long) color_idx; 1125 color_def->pixel = color_idx;
1125 color_def->red = red; 1126 color_def->red = red;
1126 color_def->green = green; 1127 color_def->green = green;
1127 color_def->blue = blue; 1128 color_def->blue = blue;