From 650e8505e2bca55d1df1f88158d316f5079c40cb Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 18 Jun 1997 13:06:17 +0000 Subject: [PATCH] Provide XXX-util instead of language/XXX-util. Delete local variable declartion. Delete the code of calling register-input-method form all files under this directory. --- lisp/language/china-util.el | 5 +---- lisp/language/chinese.el | 43 ------------------------------------- lisp/language/devan-util.el | 5 +---- lisp/language/devanagari.el | 16 -------------- lisp/language/english.el | 3 --- lisp/language/ethiopic.el | 3 --- lisp/language/european.el | 23 -------------------- lisp/language/greek.el | 3 --- lisp/language/hebrew.el | 3 --- lisp/language/japan-util.el | 5 +---- lisp/language/japanese.el | 5 ----- lisp/language/korean.el | 11 ---------- lisp/language/lao-util.el | 5 +---- lisp/language/lao.el | 6 ------ lisp/language/misc-lang.el | 3 --- lisp/language/thai-util.el | 5 +---- lisp/language/thai.el | 3 --- lisp/language/tibet-util.el | 5 +---- lisp/language/tibetan.el | 5 ----- lisp/language/viet-util.el | 5 +---- lisp/language/vietnamese.el | 3 --- 21 files changed, 7 insertions(+), 158 deletions(-) diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el index 14661219878..8fa1dc52167 100644 --- a/lisp/language/china-util.el +++ b/lisp/language/china-util.el @@ -228,9 +228,6 @@ Return the length of resulting text." (encode-hz-region (point-min) (point-max))) ;; -(provide 'language/china-util) +(provide 'china-util) -;;; Local Variables: -;;; generated-autoload-file: "../loaddefs.el" -;;; End: ;;; china-util.el ends here diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el index 9718fe2dcc3..869b8129ab0 100644 --- a/lisp/language/chinese.el +++ b/lisp/language/chinese.el @@ -95,23 +95,6 @@ (encode-hz-region 1 (point-max)) nil)) -(register-input-method - "Chinese-GB" '("quail-ccdospy" quail-use-package "quail/ccdospy")) -(register-input-method - "Chinese-GB" '("quail-ctlau" quail-use-package "quail/ctlau")) -(register-input-method - "Chinese-GB" '("quail-punct" quail-use-package "quail/punct")) -(register-input-method - "Chinese-GB" '("quail-qj" quail-use-package "quail/qj")) -(register-input-method - "Chinese-GB" '("quail-sw" quail-use-package "quail/sw")) -(register-input-method - "Chinese-GB" '("quail-ziranma" quail-use-package "quail/ziranma")) -(register-input-method - "Chinese-GB" '("quail-tonepy" quail-use-package "quail/tonepy")) -(register-input-method - "Chinese-GB" '("quail-py" quail-use-package "quail/py")) - (set-language-info-alist "Chinese-GB" '((setup-function . (setup-chinese-gb-environment . setup-chinese-environment-map)) @@ -151,27 +134,6 @@ (setq font-ccl-encoder-alist (cons (cons "big5" ccl-encode-big5-font) font-ccl-encoder-alist)) -(register-input-method - "Chinese-BIG5" '("quail-qj-b5" quail-use-package "quail/qj-b5")) -(register-input-method - "Chinese-BIG5" '("quail-zozy" quail-use-package "quail/zozy")) -(register-input-method - "Chinese-BIG5" '("quail-tsangchi-b5" quail-use-package "quail/tsangchi-b5")) -(register-input-method - "Chinese-BIG5" '("quail-py-b5" quail-use-package "quail/py-b5")) -(register-input-method - "Chinese-BIG5" '("quail-quick-b5" quail-use-package "quail/quick-bt")) -(register-input-method - "Chinese-BIG5" '("quail-etzy" quail-use-package "quail/etzy")) -(register-input-method - "Chinese-BIG5" '("quail-ecdict" quail-use-package "quail/ecdict")) -(register-input-method - "Chinese-BIG5" '("quail-ctlaub" quail-use-package "quail/ctlaub")) -(register-input-method - "Chinese-BIG5" '("quail-array30" quail-use-package "quail/array30")) -(register-input-method - "Chinese-BIG5" '("quail-4corner" quail-use-package "quail/4corner")) - (set-language-info-alist "Chinese-BIG5" '((setup-function . (setup-chinese-big5-environment . setup-chinese-environment-map)) @@ -186,11 +148,6 @@ ;; Chinese CNS11643 (traditional) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(register-input-method - "Chinese-CNS" '("quail-quick-cns" quail-use-package "quail/quick-cns")) -(register-input-method - "Chinese-CNS" '("quail-tsangchi-cns" quail-use-package "quail/tsangchi-cns")) - (set-language-info-alist "Chinese-CNS" '((setup-function . (setup-chinese-cns-environment . setup-chinese-environment-map)) diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el index c14730aebbe..da4ead71772 100644 --- a/lisp/language/devan-util.el +++ b/lisp/language/devan-util.el @@ -1311,9 +1311,6 @@ basic Devanagari character string." ;; Test comment. ;; -(provide 'language/devan-util) +(provide 'devan-util) -;;; Local Variables: -;;; generated-autoload-file: "../loaddefs.el" -;;; End: ;;; devan-util.el end here diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el index 72e2c703144..e84cf3531f6 100644 --- a/lisp/language/devanagari.el +++ b/lisp/language/devanagari.el @@ -43,22 +43,6 @@ (put 'devanagari 'pre-write-conversion 'in-is13194-devanagari-pre-write-conversion) -(register-input-method - "Devanagari" '("quail-devanagari-transliteration" quail-use-package - "quail/devanagari")) - -(register-input-method - "Devanagari" '("quail-devanagari-keyboard-a" quail-use-package - "quail/devanagari")) - -(register-input-method - "Devanagari" '("quail-devanagari-itrans" quail-use-package - "quail/devanagari")) - -(register-input-method - "Devanagari" '("quail-devanagari-hindi-transliteration" quail-use-package - "quail/devanagari")) - (set-language-info-alist "Devanagari" '((setup-function . (setup-devanagari-environment . setup-indian-environment-map)) diff --git a/lisp/language/english.el b/lisp/language/english.el index 74fc77021f7..90c2638931f 100644 --- a/lisp/language/english.el +++ b/lisp/language/english.el @@ -94,7 +94,4 @@ The default status is as follows. Nothing special is needed to handle English.") )) -(register-input-method "English" - '("quail-dvorak" quail-use-package "quail/latin")) - ;;; english.el ends here diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el index 35b4f4d00e4..b8e3aa46fbf 100644 --- a/lisp/language/ethiopic.el +++ b/lisp/language/ethiopic.el @@ -48,9 +48,6 @@ (setq font-ccl-encoder-alist (cons (cons "ethiopic" ccl-encode-ethio-font) font-ccl-encoder-alist)) -(register-input-method - "Ethiopic" '("quail-ethio" quail-use-package "quail/ethiopic")) - (set-language-info-alist "Ethiopic" '((setup-function . setup-ethiopic-environment) (charset . (ethiopic)) diff --git a/lisp/language/european.el b/lisp/language/european.el index eefcf16f56d..8b447e5477e 100644 --- a/lisp/language/european.el +++ b/lisp/language/european.el @@ -76,9 +76,6 @@ (define-coding-system-alias 'iso-latin-1 'iso-8859-1) (define-coding-system-alias 'iso-latin-1 'ctext) -(register-input-method "Latin-1" - '("quail-latin-1" quail-use-package "quail/latin")) - (defun setup-latin1-environment () "Set up multilingual environment (MULE) for European Latin-1 users." (interactive) @@ -109,9 +106,6 @@ These languages are supported with the Latin-1 (ISO-8859-1) character set: (define-coding-system-alias 'iso-latin-2 'iso-8859-2) -(register-input-method "Latin-2" - '("quail-latin-2" quail-use-package "quail/latin")) - (defun setup-latin2-environment () "Set up multilingual environment (MULE) for European Latin-2 users." (interactive) @@ -140,9 +134,6 @@ These languages are supported with the Latin-2 (ISO-8859-2) character set: (define-coding-system-alias 'iso-latin-3 'iso-8859-3) -(register-input-method "Latin-3" - '("quail-latin-3" quail-use-package "quail/latin")) - (defun setup-latin3-environment () "Set up multilingual environment (MULE) for European Latin-3 users." (interactive) @@ -171,9 +162,6 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set: (define-coding-system-alias 'iso-latin-4 'iso-8859-4) -(register-input-method "Latin-4" - '("quail-latin-4" quail-use-package "quail/latin")) - (defun setup-latin4-environment () "Set up multilingual environment (MULE) for European Latin-4 users." (interactive) @@ -202,9 +190,6 @@ These languages are supported with the Latin-4 (ISO-8859-4) character set: (define-coding-system-alias 'iso-latin-5 'iso-8859-9) -(register-input-method "Latin-5" - '("quail-latin-5" quail-use-package "quail/latin")) - (defun setup-latin5-environment () "Set up multilingual environment (MULE) for European Latin-5 users." (interactive) @@ -220,13 +205,5 @@ These languages are supported with the Latin-4 (ISO-8859-4) character set: These languages are supported with the Latin-5 (ISO-8859-9) character set. " . describe-european-environment-map)) )) - -(let ((languages '("French" "German" "Spanish" "Italian" - ;; We have to list much more European languages here. - )) - (val '("quail-latin-1" quail-use-package "quail/latin"))) - (while languages - (register-input-method (car languages) val) - (setq languages (cdr languages)))) ;;; european.el ends here diff --git a/lisp/language/greek.el b/lisp/language/greek.el index 57bc4f24260..aee8a2b27ad 100644 --- a/lisp/language/greek.el +++ b/lisp/language/greek.el @@ -36,9 +36,6 @@ (define-coding-system-alias 'greek-iso-8bit 'iso-8859-7) -(register-input-method - "Greek" '("quail-greek" quail-use-package "quail/greek")) - (defun setup-greek-environment () "Setup multilingual environment (MULE) for Greek." (interactive) diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el index 7970b5a82e4..290c02568f7 100644 --- a/lisp/language/hebrew.el +++ b/lisp/language/hebrew.el @@ -36,9 +36,6 @@ (define-coding-system-alias 'hebrew-iso-8bit 'iso-8859-8) -(register-input-method - "Hebrew" '("quail-hebrew" quail-use-package "quail/hebrew")) - (defun setup-hebrew-environment () "Setup multilingual environment (MULE) for Hebrew. But, please note that right-to-left writing is not yet supported." diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el index 8b7505567b2..81f720dda3d 100644 --- a/lisp/language/japan-util.el +++ b/lisp/language/japan-util.el @@ -297,9 +297,6 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading." "Japanese" "quail-ja-hiragana")) ;; -(provide 'language/japan-util) +(provide 'japan-util) -;;; Local Variables: -;;; generated-autoload-file: "../loaddefs.el" -;;; End: ;;; japan-util.el ends here diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el index 86998bfc85b..87ec76f483e 100644 --- a/lisp/language/japanese.el +++ b/lisp/language/japanese.el @@ -58,11 +58,6 @@ (define-coding-system-alias 'japanese-iso-8bit 'euc-japan) (define-coding-system-alias 'japanese-iso-8bit 'euc-jp) -(register-input-method - "Japanese" '("quail-ja-hiragana" quail-use-package "quail/japanese")) -(register-input-method - "Japanese" '("quail-ja" quail-use-package "quail/japanese")) - (set-language-info-alist "Japanese" '((setup-function . setup-japanese-environment) (tutorial . "TUTORIAL.jp") diff --git a/lisp/language/korean.el b/lisp/language/korean.el index c188c17357e..18bf3b021c4 100644 --- a/lisp/language/korean.el +++ b/lisp/language/korean.el @@ -46,17 +46,6 @@ (define-coding-system-alias 'korean-iso-7bit-lock 'iso-2022-kr) -(register-input-method - "Korean" '("quail-hangul" quail-use-package "quail/hangul")) -(register-input-method - "Korean" '("quail-hangul3" quail-use-package "quail/hangul3")) -(register-input-method - "Korean" '("quail-hanja" quail-use-package "quail/hanja")) -(register-input-method - "Korean" '("quail-symbol-ksc" quail-use-package "quail/symbol-ksc")) -(register-input-method - "Korean" '("quail-hanja-jis" quail-use-package "quail/hanja-jis")) - (defun setup-korean-environment () "Setup multilingual environment (MULE) for Korean." (interactive) diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 8f50bdecea6..8497828d337 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -135,9 +135,6 @@ (setq l (cdr l)))) ;; -(provide 'language/lao-util) +(provide 'lao-util) -;;; Local Variables: -;;; generated-autoload-file: "../loaddefs.el" -;;; End: ;;; lao-util.el ends here diff --git a/lisp/language/lao.el b/lisp/language/lao.el index 38a55d0c5a9..dd132ef12fb 100644 --- a/lisp/language/lao.el +++ b/lisp/language/lao.el @@ -30,12 +30,6 @@ '((ascii t) (lao t) nil nil nil ascii-eol)) -(register-input-method - "Lao" '("quail-lao" quail-use-package "quail/lao")) - -(register-input-method - "Lao" '("quail-lrt" quail-use-package "quail/lrt")) - (set-language-info-alist "Lao" '((setup-function . setup-lao-environment) (charset . (lao)) diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el index 0485cb01ff5..cd73cca8df9 100644 --- a/lisp/language/misc-lang.el +++ b/lisp/language/misc-lang.el @@ -26,7 +26,4 @@ ;;; IPA (International Phonetic Alphabet) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(register-input-method - "IPA" '("quail-ipa" quail-use-package "quail/ipa")) - ;;; misc-lang.el ends here diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el index 4c3e0bc62de..ac68208d395 100644 --- a/lisp/language/thai-util.el +++ b/lisp/language/thai-util.el @@ -179,9 +179,6 @@ positions (integers or markers) specifying the region." nil)) ;; -(provide 'language/thai-util) +(provide 'thai-util) -;;; Local Variables: -;;; generated-autoload-file: "../loaddefs.el" -;;; End: ;;; thai-util.el ends here diff --git a/lisp/language/thai.el b/lisp/language/thai.el index 3c94b7df7f0..adcf055c852 100644 --- a/lisp/language/thai.el +++ b/lisp/language/thai.el @@ -39,9 +39,6 @@ (define-coding-system-alias 'thai-tis620 'th-tis620) (define-coding-system-alias 'thai-tis620 'tis620) -(register-input-method - "Thai" '("quail-thai" quail-use-package "quail/thai")) - (set-language-info-alist "Thai" '((tutorial . "TUTORIAL.th") (setup-function . setup-thai-environment) diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el index 202cf52e29e..96d63d37d8e 100644 --- a/lisp/language/tibet-util.el +++ b/lisp/language/tibet-util.el @@ -465,9 +465,6 @@ See also docstring of the function tibetan-compose-region." ;; Should return nil as annotations. nil)) -(provide 'language/tibet-util) +(provide 'tibet-util) -;;; Local Variables: -;;; generated-autoload-file: "../loaddefs.el" -;;; End: ;;; language/tibet-util.el ends here. diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el index 482939b188d..90be406a37c 100644 --- a/lisp/language/tibetan.el +++ b/lisp/language/tibetan.el @@ -97,11 +97,6 @@ (put 'tibetan 'post-read-conversion 'tibetan-post-read-conversion) (put 'tibetan 'pre-write-conversion 'tibetan-pre-write-conversion) -(register-input-method - "Tibetan" '("quail-tibetan-wylie" quail-use-package "quail/tibetan")) -(register-input-method - "Tibetan" '("quail-tibetan-tibkey" quail-use-package "quail/tibetan")) - (set-language-info-alist "Tibetan" '((setup-function . setup-tibetan-environment) (charset . (tibetan tibetan-1-column)) diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el index bdb3ecfaa87..665ae78dfa2 100644 --- a/lisp/language/viet-util.el +++ b/lisp/language/viet-util.el @@ -289,9 +289,6 @@ positions (integers or markers) specifying the stretch of the region." nil)) ;;; -(provide 'language/viet-util) +(provide 'viet-util) -;;; Local Variables: -;;; generated-autoload-file: "../loaddefs.el" -;;; End: ;;; viet-util.el ends here diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el index 6fbd58cdafe..399b2edaf4c 100644 --- a/lisp/language/vietnamese.el +++ b/lisp/language/vietnamese.el @@ -229,9 +229,6 @@ Both tables are indexed by the position code of Vietnamese characters.") (setq font-ccl-encoder-alist (cons (cons "vscii" ccl-encode-vscii-font) font-ccl-encoder-alist)) -(register-input-method - "Vietnamese" '("quail-viqr" quail-use-package "quail/viqr")) - (set-language-info-alist "Vietnamese" '((setup-function . setup-vietnamese-environment) (charset . (vietnamese-viscii-lower