Merge from origin/emacs-24

[gnu-emacs] / src / xfaces.c

diff --git a/src/xfaces.c b/src/xfaces.c
index fcfdbc0ee4ff8ee6dbc1fc8f53ef8782d17f1cb6..b2697220bce70f5553b559a9f5c8371b546d2568 100644 (file)
--- 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