Mercurial > emacs

changeset 53358:ff43a451f269

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(reset-language-environment, set-language-environment): Don't invoke fontset-related functions if fontset-list is not fboundp.
author Eli Zaretskii <eliz@is.elta.co.il>
date Mon, 29 Dec 2003 10:58:46 +0000
parents 01e8a4191802
children 479382b4b597
files lisp/international/mule-cmds.el
diffstat 1 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el	Mon Dec 29 07:11:58 2003 +0000
+++ b/lisp/international/mule-cmds.el	Mon Dec 29 10:58:46 2003 +0000
@@ -1693,7 +1693,10 @@
   (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 @@
       (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)