[Emacs-diffs] Changes to emacs/lisp/international/fontset.el

[Kenichi Handa]

Index: emacs/lisp/international/fontset.el
diff -c emacs/lisp/international/fontset.el:1.54 
emacs/lisp/international/fontset.el:1.55
*** emacs/lisp/international/fontset.el:1.54    Mon Sep 30 02:41:01 2002
--- emacs/lisp/international/fontset.el Fri Jan 17 03:13:39 2003
***************
*** 40,46 ****
  ;; character `*' is embedded in `CHARSET_ENCODING' field.  The
  ;; REGISTRY for ASCII characters are predefined as "ISO8859-1".
  
! (let ((l
         ;; 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
--- 40,49 ----
  ;; character `*' is embedded in `CHARSET_ENCODING' field.  The
  ;; REGISTRY for ASCII characters are predefined as "ISO8859-1".
  
! (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,131 ****
           ((,(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 arguments in `font-encoding-alist' (which see).
  (defun set-font-encoding (pattern charset encoding)
--- 122,128 ----
           ((,(indian-glyph-char 0 'malayalam)
             . ,(indian-glyph-char 255 'malayalam)) . ("*" . "Malayalam-CDAC"))
           )))
!     (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,147 ****
            (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
--- 136,141 ----
***************
*** 494,500 ****
            name))
        fontset)))
  
! ;;;###autoload
  (defun create-fontset-from-fontset-spec (fontset-spec
                                         &optional style-variant noerror)
    "Create a fontset from fontset specification string FONTSET-SPEC.
--- 488,494 ----
            name))
        fontset)))
  
! 
  (defun create-fontset-from-fontset-spec (fontset-spec
                                         &optional style-variant noerror)
    "Create a fontset from fontset specification string FONTSET-SPEC.