diff options
| author | Kenichi Handa <handa@m17n.org> | 2009-03-19 00:56:52 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2009-03-19 00:56:52 +0000 |
| commit | 2d4e20ecbe2a63979f3b40aa81c85fffc358044b (patch) | |
| tree | 11a8d6ef08614e9d73c228414421a1a343e5203d /lisp/term/x-win.el | |
| parent | 4bd4e5bcbec83dfeb2d21073565e237ac598594f (diff) | |
| download | emacs-2d4e20ecbe2a63979f3b40aa81c85fffc358044b.tar.gz emacs-2d4e20ecbe2a63979f3b40aa81c85fffc358044b.tar.bz2 emacs-2d4e20ecbe2a63979f3b40aa81c85fffc358044b.zip | |
(x-initialize-window-system): Call
create-defualt-fontset, not setup-default-fontset. Call
create-fntset-from-fontset-spec within condition-case.
Diffstat (limited to 'lisp/term/x-win.el')
| -rw-r--r-- | lisp/term/x-win.el | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 788d012db3b..3e00a81be15 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -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) |