Mercurial > emacs
comparison lisp/term/x-win.el @ 49288:7f09b406bc3c
Require fontset unconditionally again.
Call setup-default-fontset at the top level.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 17 Jan 2003 08:14:14 +0000 |
| parents | d2cbeb3c7b3d |
| children | 5ade352e8d1c |
comparison
equal
deleted
inserted
replaced
| 49287:5cb7e7103296 | 49288:7f09b406bc3c |
|---|---|
| 73 (require 'mouse) | 73 (require 'mouse) |
| 74 (require 'scroll-bar) | 74 (require 'scroll-bar) |
| 75 (require 'faces) | 75 (require 'faces) |
| 76 (require 'select) | 76 (require 'select) |
| 77 (require 'menu-bar) | 77 (require 'menu-bar) |
| 78 (if (fboundp 'new-fontset) | 78 (require 'fontset) |
| 79 (require 'fontset)) | |
| 80 | 79 |
| 81 (defvar x-invocation-args) | 80 (defvar x-invocation-args) |
| 82 | 81 |
| 83 (defvar x-command-line-resources nil) | 82 (defvar x-command-line-resources nil) |
| 84 | 83 |
| 2266 (setq frame-creation-function 'x-create-frame-with-faces) | 2265 (setq frame-creation-function 'x-create-frame-with-faces) |
| 2267 | 2266 |
| 2268 (setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) | 2267 (setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) |
| 2269 x-cut-buffer-max)) | 2268 x-cut-buffer-max)) |
| 2270 | 2269 |
| 2270 ;; Setup the default fontset. | |
| 2271 (setup-default-fontset) | |
| 2272 | |
| 2271 ;; Create the standard fontset. | 2273 ;; Create the standard fontset. |
| 2272 (create-fontset-from-fontset-spec standard-fontset-spec t) | 2274 (create-fontset-from-fontset-spec standard-fontset-spec t) |
| 2273 | 2275 |
| 2274 ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...). | 2276 ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...). |
| 2275 (create-fontset-from-x-resource) | 2277 (create-fontset-from-x-resource) |