[Emacs-diffs] emacs-24 r117331: * xfaces.c (init_frame_faces): Always realize basic faces (#Bug17889).

[Dmitry Antipov]

------------------------------------------------------------
revno: 117331
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-07-01 11:30:33 +0400
message:
  * xfaces.c (init_frame_faces): Always realize basic faces (#Bug17889).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-30 16:45:38 +0000
+++ b/src/ChangeLog     2014-07-01 07:30:33 +0000
@@ -1,3 +1,7 @@
+2014-07-01  Dmitry Antipov  <address@hidden>
+
+       * xfaces.c (init_frame_faces): Always realize basic faces (#Bug17889).
+
 2014-06-30  Eli Zaretskii  <address@hidden>
 
        * frame.c (do_switch_frame): When switching to another TTY frame,

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2014-02-04 07:36:58 +0000
+++ b/src/xfaces.c      2014-07-01 07:30:33 +0000
@@ -680,19 +680,9 @@
     }
 #endif /* HAVE_WINDOW_SYSTEM */
 
-  /* Realize basic faces.  Must have enough information in frame
-     parameters to realize basic faces at this point.  */
-#ifdef HAVE_X_WINDOWS
-  if (!FRAME_X_P (f) || FRAME_X_WINDOW (f))
-#endif
-#ifdef HAVE_NTGUI
-  if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f))
-#endif
-#ifdef HAVE_NS
-  if (!FRAME_NS_P (f) || FRAME_NS_WINDOW (f))
-#endif
-    if (!realize_basic_faces (f))
-       emacs_abort ();
+  /* Realize faces early (Bug#17889).  */
+  if (!realize_basic_faces (f))
+    emacs_abort ();
 }