Merge from emacs-24

2 files changed, 27 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a4ce099021..eb578278bea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to
+        make a font_object from a tty frame (Bug#18573).
+        (Finternal_set_lisp_face_attribute): Add FIXME comment.
+
 2014-10-02  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * alloc.c (mark_overlay): Assume that overlay boundaries are
@@ -398,7 +404,7 @@
         * macfont.m (macfont_close): Release and free font-specific data
         only if it wasn't previously freed.
 
-2014-09-22  David Caldwell <david@porkrind.org> (tiny change)
+2014-09-22  David Caldwell <david@porkrind.org>  (tiny change)
 
         * unexmacosx.c (dump_it): Improve error message.
 
@@ -9808,7 +9814,7 @@
         * eval.c (Ffuncall): Fix handling of ((lambda ..) ..) in lexically
         scoped code (bug#11258).
 
-2013-08-28  Davor Cubranic  <cubranic@stat.ubc.ca> (tiny change)
+2013-08-28  Davor Cubranic  <cubranic@stat.ubc.ca>  (tiny change)
 
         * nsterm.m (last_window): New variable.
         (EV_TRAILER2): New macro.
diff --git a/src/xfaces.c b/src/xfaces.c
index 73704bbba8e..6afa0a2953d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3112,17 +3112,26 @@ FRAME 0 means change the face on all frames, and change the default
                 f = XFRAME (selected_frame);
               else
                 f = XFRAME (frame);
-              if (! FONT_OBJECT_P (value))
-                {
-                  Lisp_Object *attrs = XVECTOR (lface)->contents;
-                  Lisp_Object font_object;
 
-                  font_object = font_load_for_lface (f, attrs, value);
-                  if (NILP (font_object))
-                    signal_error ("Font not available", value);
-                  value = font_object;
-                }
-              set_lface_from_font (f, lface, value, 1);
+              /* FIXME:
+                 If frame is t, and selected frame is a tty frame, the font
+                 can't be realized.  An improvement would be to loop over frames
+                 for a non-tty frame and use that.  See discussion in
+                 bug#18573.  */
+              if (f->terminal->type != output_termcap)
+                {
+                  if (! FONT_OBJECT_P (value))
+                    {
+                      Lisp_Object *attrs = XVECTOR (lface)->contents;
+                      Lisp_Object font_object;
+
+                      font_object = font_load_for_lface (f, attrs, value);
+                      if (NILP (font_object))
+                        signal_error ("Font not available", value);
+                      value = font_object;
+                    }
+                  set_lface_from_font (f, lface, value, 1);
+                }
             }
           else
             ASET (lface, LFACE_FONT_INDEX, value);