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

[Kenichi Handa]

Index: emacs/lisp/international/utf-8.el
diff -c emacs/lisp/international/utf-8.el:1.45 
emacs/lisp/international/utf-8.el:1.46
*** emacs/lisp/international/utf-8.el:1.45      Thu Oct 28 02:00:15 2004
--- emacs/lisp/international/utf-8.el   Mon Dec 27 06:11:02 2004
***************
*** 305,330 ****
      ;; Load the files explicitly, to avoid having to keep
      ;; around the large tables they contain (as well as the
      ;; ones which get built).
!     (cond ((string= "Korean" current-language-environment)
!          (load "subst-jis")
!          (load "subst-big5")
!          (load "subst-gb2312")
!          (load "subst-ksc"))
!         ((string= "Chinese-BIG5" current-language-environment)
!          (load "subst-jis")
!          (load "subst-ksc")
!          (load "subst-gb2312")
!          (load "subst-big5"))
!         ((string= "Chinese-GB" current-language-environment)
!          (load "subst-jis")
!          (load "subst-ksc")
!          (load "subst-big5")
!          (load "subst-gb2312"))
!         (t
!          (load "subst-ksc")
!          (load "subst-gb2312")
!          (load "subst-big5")
!          (load "subst-jis")))   ; jis covers as much as big5, gb2312
  
      (when redefined
        (define-translation-hash-table 'utf-subst-table-for-decode
--- 305,334 ----
      ;; Load the files explicitly, to avoid having to keep
      ;; around the large tables they contain (as well as the
      ;; ones which get built).
!     ;; Here we bind coding-system-for-read to nil so that coding tags
!     ;; in the files are respected even if the files are not yet
!     ;; byte-compiled
!     (let ((coding-system-for-read nil))
!       (cond ((string= "Korean" current-language-environment)
!            (load "subst-jis")
!            (load "subst-big5")
!            (load "subst-gb2312")
!            (load "subst-ksc"))
!           ((string= "Chinese-BIG5" current-language-environment)
!            (load "subst-jis")
!            (load "subst-ksc")
!            (load "subst-gb2312")
!            (load "subst-big5"))
!           ((string= "Chinese-GB" current-language-environment)
!            (load "subst-jis")
!            (load "subst-ksc")
!            (load "subst-big5")
!            (load "subst-gb2312"))
!           (t
!            (load "subst-ksc")
!            (load "subst-gb2312")
!            (load "subst-big5")
!            (load "subst-jis")))) ; jis covers as much as big5, gb2312
  
      (when redefined
        (define-translation-hash-table 'utf-subst-table-for-decode