From 6b79afabed10f7077062db7c8d981320eb01a76d Mon Sep 17 00:00:00 2001 From: tomo Date: Tue, 29 Jun 1999 15:59:54 +0000 Subject: [PATCH] - Use `define-coding-system-alias' instead of `copy-coding-system'. - Register `coding-priority', `input-method' and `features' keys into language-info-alist. 1998-08-31 Paul Eggert * mule/japanese.el: Add coding: local variable, to avoid bootstrapping problem if you need to recompile all the Lisp files using interpreted code. --- lisp/mule/japanese.el | 92 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 30 deletions(-) diff --git a/lisp/mule/japanese.el b/lisp/mule/japanese.el index fbc7328..c9eedb4 100644 --- a/lisp/mule/japanese.el +++ b/lisp/mule/japanese.el @@ -1,4 +1,4 @@ -;;; japanese.el --- Japanese support +;;; japanese.el --- Japanese support -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. @@ -144,10 +144,11 @@ ;; 'iso-2022-jp 2 ?J ;; "ISO 2022 based 7bit encoding for Japanese (MIME:ISO-2022-JP)" ;; '((ascii japanese-jisx0208-1978 japanese-jisx0208 -;; latin-jisx0201 japanese-jisx0212 katakana-jisx0201 t) nil nil nil -;; short ascii-eol ascii-cntl seven)) - -;; (define-coding-system-alias 'junet 'iso-2022-jp) +;; latin-jisx0201 japanese-jisx0212 katakana-jisx0201) nil nil nil +;; short ascii-eol ascii-cntl seven) +;; '((safe-charsets ascii japanese-jisx0208-1978 japanese-jisx0208 +;; latin-jisx0201 japanese-jisx0212 katakana-jisx0201) +;; (mime-charset . iso-2022-jp))) (make-coding-system 'iso-2022-jp 'iso2022 @@ -160,26 +161,47 @@ mnemonic "MULE/7bit" )) -(copy-coding-system 'iso-2022-jp 'junet) +(define-coding-system-alias 'junet 'iso-2022-jp) + +;; (make-coding-system +;; 'iso-2022-jp-2 2 ?J +;; "ISO 2022 based 7bit encoding for CJK, Latin-1, and Greek (MIME:ISO-2022-JP-2)" +;; '((ascii japanese-jisx0208-1978 japanese-jisx0208 +;; latin-jisx0201 japanese-jisx0212 katakana-jisx0201 +;; chinese-gb2312 korean-ksc5601) nil +;; (nil latin-iso8859-1 greek-iso8859-7) nil +;; short ascii-eol ascii-cntl seven nil single-shift) +;; '((safe-charsets ascii japanese-jisx0208-1978 japanese-jisx0208 +;; latin-jisx0201 japanese-jisx0212 katakana-jisx0201 +;; chinese-gb2312 korean-ksc5601 +;; latin-iso8859-1 greek-iso8859-7) +;; (mime-charset . iso-2022-jp-2))) ;; (make-coding-system -;; 'shift_jis 1 ?S -;; "Coding-system of Shift-JIS used in Japan." t) +;; 'japanese-shift-jis 1 ?S +;; "Shift-JIS 8-bit encoding for Japanese (MIME:SHIFT_JIS)" +;; nil +;; '((safe-charsets ascii japanese-jisx0208 japanese-jisx0208-1978 +;; latin-jisx0201 katakana-jisx0201) +;; (mime-charset . shift_jis) +;; (charset-origin-alist (japanese-jisx0208 "SJIS" encode-sjis-char) +;; (katakana-jisx0201 "SJIS" encode-sjis-char)))) (make-coding-system 'shift_jis 'shift-jis "Coding-system of Shift-JIS used in Japan." '(mnemonic "Ja/SJIS")) -;;(define-coding-system-alias 'shift_jis 'sjis) - -(copy-coding-system 'shift_jis 'sjis) +;; (define-coding-system-alias 'shift_jis 'japanese-shift-jis) +;; (define-coding-system-alias 'sjis 'japanese-shift-jis) ;; (make-coding-system -;; 'iso-2022-jp-1978-irv 2 ?J -;; "Coding-system used for old jis terminal." -;; '((ascii t) nil nil nil -;; short ascii-eol ascii-cntl seven nil nil use-roman use-oldjis)) +;; 'japanese-iso-7bit-1978-irv 2 ?j +;; "ISO 2022 based 7-bit encoding for Japanese JISX0208-1978 and JISX0201-Roman" +;; '((ascii japanese-jisx0208-1978 japanese-jisx0208 +;; latin-jisx0201 japanese-jisx0212 katakana-jisx0201 t) nil nil nil +;; short ascii-eol ascii-cntl seven nil nil use-roman use-oldjis) +;; '(ascii japanese-jisx0208-1978 japanese-jisx0208 latin-jisx0201)) (make-coding-system 'iso-2022-jp-1978-irv 'iso2022 @@ -192,15 +214,19 @@ mnemonic "Ja-78/7bit" )) -;;(define-coding-system-alias 'iso-2022-jp-1978-irv 'old-jis) +;; (define-coding-system-alias 'iso-2022-jp-1978-irv 'japanese-iso-7bit-1978-irv) +;; (define-coding-system-alias 'old-jis 'japanese-iso-7bit-1978-irv) -(copy-coding-system 'iso-2022-jp-1978-irv 'old-jis) +(define-coding-system-alias 'old-jis 'iso-2022-jp-1978-irv) ;; (make-coding-system -;; 'euc-japan-1990 2 ?E -;; "Coding-system of Japanese EUC (Extended Unix Code)." +;; 'japanese-iso-8bit 2 ?E +;; "ISO 2022 based EUC encoding for Japanese (MIME:EUC-JP)" ;; '(ascii japanese-jisx0208 katakana-jisx0201 japanese-jisx0212 -;; short ascii-eol ascii-cntl nil nil single-shift)) +;; short ascii-eol ascii-cntl nil nil single-shift) +;; '((safe-charsets ascii latin-jisx0201 japanese-jisx0208 japanese-jisx0208-1978 +;; katakana-jisx0201 japanese-jisx0212) +;; (mime-charset . euc-jp))) (make-coding-system 'euc-jp 'iso2022 @@ -213,20 +239,26 @@ mnemonic "Ja/EUC" )) -;;(define-coding-system-alias 'euc-japan-1990 'euc-japan) +;; (define-coding-system-alias 'euc-japan-1990 'japanese-iso-8bit) +;; (define-coding-system-alias 'euc-japan 'japanese-iso-8bit) +;; (define-coding-system-alias 'euc-jp 'japanese-iso-8bit) -(copy-coding-system 'euc-jp 'euc-japan) ; only for w3 -(copy-coding-system 'euc-jp 'japanese-euc) +(define-coding-system-alias 'euc-japan 'euc-jp) ; only for w3 +(define-coding-system-alias 'japanese-euc 'euc-jp) (set-language-info-alist - "Japanese" '((setup-function . setup-japanese-environment) + "Japanese" '((setup-function . setup-japanese-environment-internal) + (exit-function . exit-japanese-environment) (tutorial . "TUTORIAL.ja") - (charset . (japanese-jisx0208 japanese-jisx0208-1978 - japanese-jisx0212 latin-jisx0201 - katakana-jisx0201)) - (coding-system . (iso-2022-jp euc-jp - shift_jis iso-2022-jp-1978-irv)) - (sample-text . "Japanese ($BF|K\8l(B) $B$3$s$K$A$O(B, (I:]FAJ(B") + (charset japanese-jisx0208 japanese-jisx0208-1978 + japanese-jisx0212 latin-jisx0201 katakana-jisx0201) + (coding-system iso-2022-jp euc-jp + shift_jis iso-2022-jp-2) + (coding-priority iso-2022-jp euc-jp + shift_jis iso-2022-jp-2) + (input-method . "japanese") + (features japan-util) + (sample-text . "Japanese ($BF|K\8l(B) $B$3$s$K$A$O(B, (I:]FAJ(B") (documentation . t))) ;;; japanese.el ends here -- 1.7.10.4