* xfaces.c (init_frame_faces): Always realize basic faces (#Bug17889).

2 files changed, 7 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d1e23b40fd..a94bf5dbb46 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-01  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xfaces.c (init_frame_faces): Always realize basic faces (#Bug17889).
+
 2014-06-30  Eli Zaretskii  <eliz@gnu.org>
 
         * frame.c (do_switch_frame): When switching to another TTY frame,
diff --git a/src/xfaces.c b/src/xfaces.c
index 4271e47c36f..ac67c7b7be4 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -680,19 +680,9 @@ init_frame_faces (struct frame *f)
     }
 #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 ();
 }