2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 135f28fb20f..7a7fd23d43d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * xfaces.c (map_tty_color): Use assoc_no_quit instead of
+        assq_no_quit to fetch color definition by its string name.
+        (Bug#19802)
+
 2015-02-05  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (move_it_in_display_line_to): Handle the case where the
diff --git a/src/xfaces.c b/src/xfaces.c
index 44c72aa4944..29c91f7169f 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5793,7 +5793,7 @@ map_tty_color (struct frame *f, struct face *face,
   if (STRINGP (color)
       && SCHARS (color)
       && CONSP (Vtty_defined_color_alist)
-      && (def = assq_no_quit (color, call1 (Qtty_color_alist, frame)),
+      && (def = assoc_no_quit (color, call1 (Qtty_color_alist, frame)),
           CONSP (def)))
     {
       /* Associations in tty-defined-color-alist are of the form