aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/international/fontset.el22
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index b35c1ab4935..1f8e7f22deb 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -349,14 +349,14 @@ with \"fontset\" in `<CHARSET_REGISTRY> field."
349 name)) 349 name))
350 fontset))) 350 fontset)))
351 351
352(defvar uninstanciated-fontset-alist nil 352(defvar uninstantiated-fontset-alist nil
353 "Alist of fontset names vs. information for instanciating them. 353 "Alist of fontset names vs. information for instantiating them.
354Each element has the form (FONTSET STYLE BASE-FONTSET), where 354Each element has the form (FONTSET STYLE BASE-FONTSET), where
355FONTSET is a name of fontset not yet instanciated. 355FONTSET is a name of fontset not yet instantiated.
356STYLE is a style of FONTSET, one of the followings: 356STYLE is a style of FONTSET, one of the followings:
357 bold, demobold, italic, oblique, 357 bold, demobold, italic, oblique,
358 bold-italic, demibold-italic, bold-oblique, demibold-oblique. 358 bold-italic, demibold-italic, bold-oblique, demibold-oblique.
359BASE-FONTSET is a name of fontset base from which FONSET is instanciated.") 359BASE-FONTSET is a name of fontset base from which FONSET is instantiated.")
360 360
361(defun create-fontset-from-fontset-spec (fontset-spec &optional style noerror) 361(defun create-fontset-from-fontset-spec (fontset-spec &optional style noerror)
362 "Create a fontset from fontset specification string FONTSET-SPEC. 362 "Create a fontset from fontset specification string FONTSET-SPEC.
@@ -421,8 +421,8 @@ signaled unless the optional 3rd argument NOERROR is non-nil."
421 (while funcs 421 (while funcs
422 (setq new-name (funcall (car funcs) new-name)) 422 (setq new-name (funcall (car funcs) new-name))
423 (setq funcs (cdr funcs))) 423 (setq funcs (cdr funcs)))
424 (setq uninstanciated-fontset-alist 424 (setq uninstantiated-fontset-alist
425 (cons (list new-name style name) uninstanciated-fontset-alist)) 425 (cons (list new-name style name) uninstantiated-fontset-alist))
426 (setq funcs-alist (cdr funcs-alist))))) 426 (setq funcs-alist (cdr funcs-alist)))))
427 427
428 (if (and noerror (query-fontset name)) 428 (if (and noerror (query-fontset name))
@@ -438,10 +438,10 @@ signaled unless the optional 3rd argument NOERROR is non-nil."
438 (setq fontset-alias-alist 438 (setq fontset-alias-alist
439 (cons (cons name alias) fontset-alias-alist)))))))) 439 (cons (cons name alias) fontset-alias-alist))))))))
440 440
441(defun instanciate-fontset (fontset) 441(defun instantiate-fontset (fontset)
442 "Create a new fontset FONTSET if it is not yet instanciated. 442 "Create a new fontset FONTSET if it is not yet instantiated.
443Return FONTSET if it is created successfully, else return nil." 443Return FONTSET if it is created successfully, else return nil."
444 (let ((fontset-data (assoc fontset uninstanciated-fontset-alist))) 444 (let ((fontset-data (assoc fontset uninstantiated-fontset-alist)))
445 (if (null fontset-data) 445 (if (null fontset-data)
446 nil 446 nil
447 (let ((style (nth 1 fontset-data)) 447 (let ((style (nth 1 fontset-data))
@@ -456,8 +456,8 @@ Return FONTSET if it is created successfully, else return nil."
456 (bold-oblique x-make-font-bold x-make-font-oblique) 456 (bold-oblique x-make-font-bold x-make-font-oblique)
457 (demibold-oblique x-make-font-demibold x-make-font-oblique))) 457 (demibold-oblique x-make-font-demibold x-make-font-oblique)))
458 ascii-font font font2 funcs) 458 ascii-font font font2 funcs)
459 (setq uninstanciated-fontset-alist 459 (setq uninstantiated-fontset-alist
460 (delete fontset-data uninstanciated-fontset-alist)) 460 (delete fontset-data uninstantiated-fontset-alist))
461 (setq fontset-data (assoc base-fontset global-fontset-alist)) 461 (setq fontset-data (assoc base-fontset global-fontset-alist))
462 (setq ascii-font (cdr (assq 'ascii (cdr fontset-data)))) 462 (setq ascii-font (cdr (assq 'ascii (cdr fontset-data))))
463 (setq funcs (cdr (assq style funcs-alist))) 463 (setq funcs (cdr (assq style funcs-alist)))