aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2000-02-17 15:32:52 +0000
committerEli Zaretskii2000-02-17 15:32:52 +0000
commit3b451f74120ac47b29c4966e7c30be51b71e57f3 (patch)
treeabe925d64d236ef32a31a1345b7cb0a49389e311 /src
parent1216f5e4132d14cad310cb8ac6fb91fac41569f7 (diff)
downloademacs-3b451f74120ac47b29c4966e7c30be51b71e57f3.tar.gz
emacs-3b451f74120ac47b29c4966e7c30be51b71e57f3.zip
(tty_defined_color): Don't return faulire indication
for unspecified-fg and unspecified-bg pseudo-colors.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfaces.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a383d08cc1f..26f5f8869a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-02-17 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * xfaces.c (tty_defined_color): Don't return faulire indication
4 for unspecified-fg and unspecified-bg pseudo-colors.
5
12000-02-17 Gerd Moellmann <gerd@gnu.org> 62000-02-17 Gerd Moellmann <gerd@gnu.org>
2 7
3 * alloc.c (mark_object): Don't mark symbol names in pure space. 8 * alloc.c (mark_object): Don't mark symbol names in pure space.
diff --git a/src/xfaces.c b/src/xfaces.c
index 30f122d8651..55799d183d1 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1122,6 +1122,9 @@ tty_defined_color (f, color_name, color_def, alloc)
1122 color_idx = FACE_TTY_DEFAULT_BG_COLOR; 1122 color_idx = FACE_TTY_DEFAULT_BG_COLOR;
1123 } 1123 }
1124 1124
1125 if (color_idx != FACE_TTY_DEFAULT_COLOR)
1126 status = 1;
1127
1125 color_def->pixel = color_idx; 1128 color_def->pixel = color_idx;
1126 color_def->red = red; 1129 color_def->red = red;
1127 color_def->green = green; 1130 color_def->green = green;