summaryrefslogtreecommitdiff
path: root/lisp/international/fontset.el
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2003-01-17 08:13:39 +0000
committerKenichi Handa <handa@m17n.org>2003-01-17 08:13:39 +0000
commitc963bbc27db5290e1cfb237918cb2be8542e9ffc (patch)
tree18031d035d56b1fb3098b6de777cf97522b5bd9e /lisp/international/fontset.el
parent77c49b4ce66fba7212062aca4bcdd65437a5b8de (diff)
downloademacs-c963bbc27db5290e1cfb237918cb2be8542e9ffc.tar.gz
Don't setup the default fontset and
font-encoding-alist at the top level. (setup-default-fontset): New function. (create-fontset-from-fontset-spec): Delete autoload cookie.
Diffstat (limited to 'lisp/international/fontset.el')
-rw-r--r--lisp/international/fontset.el18
1 files changed, 6 insertions, 12 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 2c73d46b532..53cf2479ad2 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -40,7 +40,10 @@
;; character `*' is embedded in `CHARSET_ENCODING' field. The
;; REGISTRY for ASCII characters are predefined as "ISO8859-1".
-(let ((l
+(defun setup-default-fontset ()
+ "Setup the default fontset."
+ (dolist
+ (elt
;; Eval this at compile-time, since fontset.el is always loaded
;; when run under X and this would always load ind-util.el as well.
(eval-when-compile
@@ -119,13 +122,7 @@
((,(indian-glyph-char 0 'malayalam)
. ,(indian-glyph-char 255 'malayalam)) . ("*" . "Malayalam-CDAC"))
)))
- charset font-spec arg)
- (while l
- (setq charset (car (car l)) font-spec (cdr (car l)) l (cdr l))
- (if (symbolp charset)
- (setq arg (make-char charset))
- (setq arg charset))
- (set-fontset-font "fontset-default" arg font-spec)))
+ (set-fontset-font "fontset-default" (car elt) (cdr elt))))
;; Set arguments in `font-encoding-alist' (which see).
(defun set-font-encoding (pattern charset encoding)
@@ -139,9 +136,6 @@
(cons (list pattern (cons charset encoding)) font-encoding-alist)))
))
-(set-font-encoding "ISO8859-1" 'ascii 0)
-(set-font-encoding "JISX0201" 'latin-jisx0201 0)
-
;; Allow display of arbitrary characters with an iso-10646-encoded
;; (`Unicode') font.
(define-translation-table 'ucs-mule-to-mule-unicode
@@ -494,7 +488,7 @@ with \"fontset\" in `<CHARSET_REGISTRY> field."
name))
fontset)))
-;;;###autoload
+
(defun create-fontset-from-fontset-spec (fontset-spec
&optional style-variant noerror)
"Create a fontset from fontset specification string FONTSET-SPEC.