2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5bfb1809139..2609ed7dd01 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2015-03-03  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-03-03  Eli Zaretskii  <eliz@gnu.org>
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
         * xdisp.c (move_it_in_display_line_to): Handle the case where the
         last character of a screen line is whitespace, and we are under
         word-wrap with overflow-newline-into-fringe turned on.
diff --git a/src/xfaces.c b/src/xfaces.c
index fcfdbc0ee4f..b2697220bce 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5700,7 +5700,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