andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Call create-defualt-fontset, not

Browse source 
setup-default-fontset.  Call create-fontset-from-fontset-spec
within condition-case.
This commit is contained in:
Kenichi Handa 2009-03-19 00:58:19 +00:00
parent 0311148f52
commit 2c0359930b
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/ChangeLog
View file

@ -1,3 +1,21 @@
2009-03-19 Kenichi Handa <handa@m17n.org>
* term/ns-win.el: Call create-defualt-fontset, not
setup-default-fontset. Call create-fontset-from-fontset-spec
within condition-case.
* term/w32-win.el (w32-initialize-window-system): Call
create-defualt-fontset, not setup-default-fontset. Call
create-fontset-from-fontset-spec within condition-case.
* term/x-win.el (x-initialize-window-system): Call
create-defualt-fontset, not setup-default-fontset. Call
create-fontset-from-fontset-spec within condition-case.
* international/fontset.el (create-default-fontset): New function.
(create-fontset-from-x-resource): Use display-warning instead of
message.
2009-03-18 Richard M Stallman <rms@gnu.org>
* mail/rmail.el (rmail-retry-ignored-headers): Add usual mime headers.

9
lisp/term/ns-win.el
View file

@ -1179,9 +1179,14 @@ See the documentation of `create-fontset-from-fontset-spec for the format.")
(if (fboundp 'new-fontset)
(progn
;; Setup the default fontset.
(setup-default-fontset)
(create-default-fontset)
;; Create the standard fontset.
(create-fontset-from-fontset-spec ns-standard-fontset-spec t)))
(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)))))
;;(push (cons 'font "-ns-*-*-*-*-*-10-*-*-*-*-*-fontset-standard")
;; default-frame-alist)