diff options
| author | Kenichi Handa | 1998-07-03 04:39:22 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1998-07-03 04:39:22 +0000 |
| commit | 53caf287d1103f41f16bbb697c19aed16e9651ac (patch) | |
| tree | 9fa169f4266b7d4d63f5866e3a291c382021e1d8 /lisp/faces.el | |
| parent | 139039320922b361ffa1ffc303b75b62bfde206a (diff) | |
| download | emacs-53caf287d1103f41f16bbb697c19aed16e9651ac.tar.gz emacs-53caf287d1103f41f16bbb697c19aed16e9651ac.zip | |
(x-create-frame-with-faces): If an ASCII font is
specified in PARAMETERS, create a fontset from the font and use it
for the new frame.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index b1b269c084f..e4a10a115e1 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1345,6 +1345,19 @@ If FRAME is nil, the current FRAME is used." | |||
| 1345 | ;; Put the geometry parameters at the end. | 1345 | ;; Put the geometry parameters at the end. |
| 1346 | ;; Copy default-frame-alist so that they go after it. | 1346 | ;; Copy default-frame-alist so that they go after it. |
| 1347 | (setq parameters (append parameters default-frame-alist parsed))))) | 1347 | (setq parameters (append parameters default-frame-alist parsed))))) |
| 1348 | |||
| 1349 | (if default-enable-multibyte-characters | ||
| 1350 | ;; If an ASCII font is specified in PARAMETERS, we try to create | ||
| 1351 | ;; a fontset from it, and use it for the new frame. | ||
| 1352 | (condition-case nil | ||
| 1353 | (let ((font (cdr (assq 'font parameters)))) | ||
| 1354 | (if (and font | ||
| 1355 | (not (query-fontset font))) | ||
| 1356 | (setq parameters | ||
| 1357 | (cons (cons 'font (create-fontset-from-ascii-font font)) | ||
| 1358 | parameters)))) | ||
| 1359 | (error nil))) | ||
| 1360 | |||
| 1348 | (let (frame) | 1361 | (let (frame) |
| 1349 | (if (null global-face-data) | 1362 | (if (null global-face-data) |
| 1350 | (progn | 1363 | (progn |