[Emacs-diffs] trunk r118235: * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to realize

[Dmitry Antipov]

------------------------------------------------------------
revno: 118235
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2014-10-30 12:37:08 +0300
message:
  * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to realize
  font on an initial frame when running as a daemon (Bug#18869).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-30 05:15:28 +0000
+++ b/src/ChangeLog     2014-10-30 09:37:08 +0000
@@ -1,3 +1,8 @@
+2014-10-30  Dmitry Antipov  <address@hidden>
+
+       * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to realize
+       font on an initial frame when running as a daemon (Bug#18869).
+
 2014-10-30  Eli Zaretskii  <address@hidden>
 
        * fileio.c (Fexpand_file_name): Use make_unibyte_string, not

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2014-10-12 22:56:45 +0000
+++ b/src/xfaces.c      2014-10-30 09:37:08 +0000
@@ -3116,9 +3116,9 @@
               /* 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)
+                 for a non-tty frame and use that.  See discussion in 
Bug#18573.
+                 For a daemon, frame may be an initial frame (Bug#18869).  */
+              if (FRAME_WINDOW_P (f))
                 {
                   if (! FONT_OBJECT_P (value))
                     {