mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

(reset-language-environment, set-language-environment): Don't invoke

Browse Source 
fontset-related functions if fontset-list is not fboundp.
This commit is contained in:
Eli Zaretskii 2003-12-29 10:59:41 +00:00
parent 3e7cfcdc3d
commit 5d26489ff5
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2003-12-29 Eli Zaretskii <eliz@elta.co.il>
* international/mule-cmds.el (reset-language-environment)
(set-language-environment): Don't invoke fontset-related functions
if fontset-list is not fboundp.
2003-12-29 Kenichi Handa <handa@m17n.org>
* international/mule-cmds.el (reset-language-environment): Call

16
lisp/international/mule-cmds.el
View File

@ -1693,7 +1693,10 @@ The default status is as follows:
(setq nonascii-translation-table nil
nonascii-insert-offset 0)
(set-overriding-fontspec-internal nil))
;; Don't invoke fontset-related functions if fontsets aren't
;; supported in this build of Emacs.
(and (fboundp 'fontset-list)
(set-overriding-fontspec-internal nil)))
(reset-language-environment)
@ -1800,10 +1803,13 @@ specifies the character set for the major languages of Western Europe."
(require (car required-features))
(setq required-features (cdr required-features))))
(let ((overriding-fontspec (get-language-info language-name
'overriding-fontspec)))
(if overriding-fontspec
(set-overriding-fontspec-internal overriding-fontspec)))
;; Don't invoke fontset-related functions if fontsets aren't
;; supported in this build of Emacs.
(when (fboundp 'fontset-list)
(let ((overriding-fontspec (get-language-info language-name
'overriding-fontspec)))
(if overriding-fontspec
(set-overriding-fontspec-internal overriding-fontspec))))
(let ((func (get-language-info language-name 'setup-function)))
(if (functionp func)