From: Martin Rudalics <rudalics@gmx.at>
Date: Thu, 18 Jun 2015 12:45:43 +0000 (+0200)
Subject: Fix last fix"
X-Git-Tag: emacs-25.0.90~1709
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8db25739a434902ae5cfc42d1ceddd6c28b53530;p=emacs.git

Fix last fix"
---

diff --git a/src/nsfns.m b/src/nsfns.m
index c5ff42f960a..c6de744c750 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1199,8 +1199,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
   image_cache_refcount =
     FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0;
 
-  init_frame_faces (f);
-
   x_default_parameter (f, parms, Qfont_backend, Qnil,
 			"fontBackend", "FontBackend", RES_TYPE_STRING);
 
@@ -1255,6 +1253,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
   x_default_parameter (f, parms, Qright_fringe, Qnil,
 		       "rightFringe", "RightFringe", RES_TYPE_NUMBER);
 
+  init_frame_faces (f);
+
   /* Read comment about this code in corresponding place in xfns.c.  */
   adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
 		     FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 5, 1,