From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 16 Dec 1999 09:38:21 +0000 (+0000)
Subject: (tty_defined_color): Fix last change.
X-Git-Tag: emacs-pretest-21.0.90~5698
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=363e4e4226195164a316ba23f9069feaa9898f4a;p=emacs.git

(tty_defined_color): Fix last change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f4bf9a92cc4..e877aa7e138 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* xfaces.c (tty_defined_color): Fix last change.
+
 1999-12-15  Gerd Moellmann  <gerd@gnu.org>
 
 	* 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)
     {
       status = 0;
       color_desc = call1 (Qtty_color_desc, build_string (color_name));
-      if (!NILP (color_desc) && CONSP (color_desc))
+      if (CONSP (color_desc) && CONSP (XCDR (color_desc)))
 	{
 	  color_idx = XINT (XCAR (XCDR (color_desc)));
 	  if (CONSP (XCDR (XCDR (color_desc))))