[Emacs-diffs] /srv/bzr/emacs/trunk r111002: * term/ns-win.el (ns-initialize-window-system): Move creation of

[Jan D.]

------------------------------------------------------------
revno: 111002
fixes bug: http://debbugs.gnu.org/11964
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-24 18:55:48 +0100
message:
  * term/ns-win.el (ns-initialize-window-system): Move creation of
  fontsets here.
modified:
  lisp/ChangeLog
  lisp/term/ns-win.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-24 17:44:29 +0000
+++ b/lisp/ChangeLog    2012-11-24 17:55:48 +0000
@@ -1,3 +1,8 @@
+2012-11-24  Jan Djärv  <address@hidden>
+
+       * term/ns-win.el (ns-initialize-window-system): Move creation of
+       fontsets here (Bug#11964).
+
 2012-11-24  Vincent Belaïche  <address@hidden>
 
        * ses.el (ses-rename-cell): Correct bug on mode-line update after

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2012-10-07 22:31:58 +0000
+++ b/lisp/term/ns-win.el       2012-11-24 17:55:48 +0000
@@ -656,18 +656,6 @@
 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 @@
   ;; 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))