aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii1999-12-16 09:38:21 +0000
committerEli Zaretskii1999-12-16 09:38:21 +0000
commit363e4e4226195164a316ba23f9069feaa9898f4a (patch)
treeda9f9635adf1b4ab8f2de3ddaba187905dcc9fea /src
parent6c27ec258db83cf695fdb7eb36b5dd324ddb9227 (diff)
downloademacs-363e4e4226195164a316ba23f9069feaa9898f4a.tar.gz
emacs-363e4e4226195164a316ba23f9069feaa9898f4a.zip
(tty_defined_color): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfaces.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f4bf9a92cc4..e877aa7e138 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
11999-12-16 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * xfaces.c (tty_defined_color): Fix last change.
4
11999-12-15 Gerd Moellmann <gerd@gnu.org> 51999-12-15 Gerd Moellmann <gerd@gnu.org>
2 6
3 * xdisp.c (redisplay_window) <optional new window start>: Check 7 * xdisp.c (redisplay_window) <optional new window start>: Check
diff --git a/src/xfaces.c b/src/xfaces.c
index dd51df034ac..2017edbfd9a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1090,7 +1090,7 @@ tty_defined_color (f, color_name, color_def, alloc)
1090 { 1090 {
1091 status = 0; 1091 status = 0;
1092 color_desc = call1 (Qtty_color_desc, build_string (color_name)); 1092 color_desc = call1 (Qtty_color_desc, build_string (color_name));
1093 if (!NILP (color_desc) && CONSP (color_desc)) 1093 if (CONSP (color_desc) && CONSP (XCDR (color_desc)))
1094 { 1094 {
1095 color_idx = XINT (XCAR (XCDR (color_desc))); 1095 color_idx = XINT (XCAR (XCDR (color_desc)));
1096 if (CONSP (XCDR (XCDR (color_desc)))) 1096 if (CONSP (XCDR (XCDR (color_desc))))