* term/ns-win.el (ns-initialize-window-system): Move creation of

fontsets here.

Fixes: debbugs:11964

2 files changed, 15 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a15957c8711..37291cfa774 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-24  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * term/ns-win.el (ns-initialize-window-system): Move creation of
+        fontsets here (Bug#11964).
+
 2012-11-24  Vincent Belaïche  <vincentb1@users.sourceforge.net>
 
         * ses.el (ses-rename-cell): Correct bug on mode-line update after
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index e31362b8313..e255fec1240 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -656,18 +656,6 @@ This defines a fontset consisting of the Courier and other fonts that
 come with OS X.
 See the documentation of `create-fontset-from-fontset-spec' for the format.")
 
-;; Conditional on new-fontset so bootstrapping works on non-GUI compiles.
-(when (fboundp 'new-fontset)
-  ;; Setup the default fontset.
-  (create-default-fontset)
-  ;; Create the standard fontset.
-  (condition-case err
-      (create-fontset-from-fontset-spec ns-standard-fontset-spec t)
-    (error (display-warning
-            'initialization
-            (format "Creation of the standard fontset failed: %s" err)
-            :error))))
-
 (defvar ns-reg-to-script)               ; nsfont.m
 
 ;; This maps font registries (not exposed by NS APIs for font selection) to
@@ -914,6 +902,16 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
   ;; PENDING: not needed?
   (setq command-line-args (x-handle-args command-line-args))
 
+  ;; Setup the default fontset.
+  (create-default-fontset)
+  ;; Create the standard fontset.
+  (condition-case err
+      (create-fontset-from-fontset-spec ns-standard-fontset-spec t)
+    (error (display-warning
+            'initialization
+            (format "Creation of the standard fontset failed: %s" err)
+            :error)))
+
   (x-open-connection (system-name) nil t)
 
   (dolist (service (ns-list-services))