1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00

(x-initialize-window-system): Call

create-defualt-fontset, not setup-default-fontset.  Call
create-fntset-from-fontset-spec within condition-case.
This commit is contained in:
Kenichi Handa 2009-03-19 00:56:52 +00:00
parent 4bd4e5bcbe
commit 2d4e20ecbe

View file

@ -1480,11 +1480,16 @@ The value nil is the same as this list:
(setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100)
x-cut-buffer-max))
;; Setup the default fontset.
(setup-default-fontset)
;; Create the default fontset.
(create-default-fontset)
;; Create the standard fontset.
(create-fontset-from-fontset-spec standard-fontset-spec t)
(condition-case err
(create-fontset-from-fontset-spec standard-fontset-spec t)
(error (display-warning
'initialization
(format "Creation of the standard fontset failed: %s" err)
:error)))
;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
(create-fontset-from-x-resource)