Mercurial > emacs
changeset 17098:8917133b7e82
Remove prefix "coding-system-" from coding system symbol names.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 26 Feb 1997 13:11:47 +0000 |
| parents | c3c90aba16f9 |
| children | 6ae39e04077b |
| files | lisp/international/skkdic-cnv.el lisp/international/titdic-cnv.el lisp/language/china-util.el lisp/language/european.el lisp/language/greek.el lisp/language/hebrew.el lisp/language/korean.el lisp/language/thai.el lisp/language/vietnamese.el |
| diffstat | 9 files changed, 65 insertions(+), 70 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/international/skkdic-cnv.el Wed Feb 26 13:08:35 1997 +0000 +++ b/lisp/international/skkdic-cnv.el Wed Feb 26 13:11:47 1997 +0000 @@ -47,9 +47,9 @@ ;; To make a generated skkdic.el smaller. (make-coding-system - 'coding-system-iso-2022-7-short + 'iso-2022-7-short 2 ?J - "Like `coding-system-iso-2022' but no ASCII designation before SPC." + "Like `iso-2022-7' but no ASCII designation before SPC." '(ascii nil nil nil t t nil t)) (defconst skkdic-jbytes @@ -418,7 +418,7 @@ ;; Save the working buffer. (set-buffer buf) (set-visited-file-name (expand-file-name skkdic-filename dirname) t) - (set-buffer-file-coding-system 'coding-system-iso-2022-7-short) + (set-buffer-file-coding-system 'iso-2022-7-short) (save-buffer 0)) (kill-buffer skkbuf) (switch-to-buffer buf)))
--- a/lisp/international/titdic-cnv.el Wed Feb 26 13:08:35 1997 +0000 +++ b/lisp/international/titdic-cnv.el Wed Feb 26 13:11:47 1997 +0000 @@ -59,10 +59,10 @@ ;; List of values of key "ENCODE:" and the corresponding Emacs' ;; coding-system and language environment name. (defvar tit-encode-list - '(("GB" coding-system-euc-china "Chinese-GB") - ("BIG5" coding-system-big5 "Chinese-BIG5") - ("JIS" coding-system-euc-japan "Japanese") - ("KS" coding-system-euc-korea "Korean"))) + '(("GB" euc-china "Chinese-GB") + ("BIG5" cn-big5 "Chinese-BIG5") + ("JIS" euc-japan "Japanese") + ("KS" euc-kk "Korean"))) ;; Return a value of the key in the current line. (defsubst tit-read-key-value () @@ -310,7 +310,7 @@ (let ((coding-system-for-read 'no-conversion)) (insert-file-contents (expand-file-name filename))) (set-visited-file-name (tit-make-quail-package-name filename dirname) t) - (set-buffer-file-coding-system 'coding-system-iso-2022-7) + (set-buffer-file-coding-system 'iso-2022-7) ;; Decode the buffer contents from the encoding specified by a ;; value of the key "ENCODE:".
--- a/lisp/language/china-util.el Wed Feb 26 13:08:35 1997 +0000 +++ b/lisp/language/china-util.el Wed Feb 26 13:11:47 1997 +0000 @@ -61,7 +61,7 @@ (save-restriction (narrow-to-region beg end) - ;; We, at first, convert HZ/ZW to `coding-system-iso-2022-7', + ;; We, at first, convert HZ/ZW to `iso-2022-7', ;; then decode it. ;; "~\n" -> "\n" @@ -76,13 +76,13 @@ (let ((chinese-found nil)) (while (re-search-forward hz/zw-start-gb nil t) (if (= (char-after (match-beginning 0)) ?z) - ;; ZW -> coding-system-iso-20227-7 + ;; ZW -> iso-20227-7 (progn (delete-char -2) (insert iso2022-gb-designation) (end-of-line) (insert iso2022-ascii-designation)) - ;; HZ -> coding-system-iso-20227-7 + ;; HZ -> iso-20227-7 (delete-char -2) (insert iso2022-gb-designation) (let ((pos (save-excursion (end-of-line) (point)))) @@ -97,8 +97,7 @@ ;; If any, we had better decode them also. (goto-char (point-min)) (re-search-forward "[\240-\377]" nil t))) - (decode-coding-region (point-min) (point-max) - 'coding-system-euc-china))) + (decode-coding-region (point-min) (point-max) 'euc-china))) ;; "~~" -> "~" (goto-char (point-min)) @@ -130,7 +129,7 @@ (let ((enable-multibyte-characters nil) pos) (goto-char (setq pos (match-beginning 0))) - (encode-coding-region pos (point-max) 'coding-system-iso-2022-7) + (encode-coding-region pos (point-max) 'iso-2022-7) (goto-char pos) (while (search-forward iso2022-gb-designation nil t) (delete-char -3)
--- a/lisp/language/european.el Wed Feb 26 13:08:35 1997 +0000 +++ b/lisp/language/european.el Wed Feb 26 13:11:47 1997 +0000 @@ -29,31 +29,31 @@ ;;; Code: (make-coding-system - 'coding-system-iso-8859-1 2 ?X + 'iso-8859-1 2 ?X "Coding-system used in X as Compound Text Encoding." '((ascii t) (latin-iso8859-1 t) nil nil nil ascii-eol ascii-cntl)) ;; CTEXT is an alias for ISO-8859-1 -(put 'coding-system-ctext 'coding-system 'coding-system-iso-8859-1) +(define-coding-system-alias 'iso-8859-1 'ctext) (make-coding-system - 'coding-system-iso-8859-2 2 ?2 "MIME ISO-8859-2" + 'iso-8859-2 2 ?2 "MIME ISO-8859-2" '((ascii t) (latin-iso8859-2 t) nil nil nil ascii-eol ascii-cntl nil nil nil nil)) (make-coding-system - 'coding-system-iso-8859-3 2 ?3 "MIME ISO-8859-3" + 'iso-8859-3 2 ?3 "MIME ISO-8859-3" '((ascii t) (latin-iso8859-3 t) nil nil nil ascii-eol ascii-cntl nil nil nil nil)) (make-coding-system - 'coding-system-iso-8859-4 2 ?4 "MIME ISO-8859-4" + 'iso-8859-4 2 ?4 "MIME ISO-8859-4" '((ascii t) (latin-iso8859-4 t) nil nil nil ascii-eol ascii-cntl nil nil nil nil)) (make-coding-system - 'coding-system-iso-8859-9 2 ?9 "MIME ISO-8859-9" + 'iso-8859-9 2 ?9 "MIME ISO-8859-9" '((ascii t) (latin-iso8859-9 t) nil nil nil ascii-eol ascii-cntl nil nil nil nil)) @@ -69,16 +69,16 @@ '("quail-latin-5" quail-use-package "quail/latin")) (defun setup-european-environment () - (setq coding-category-iso-8-1 'coding-system-iso-8859-1) + (setq coding-category-iso-8-1 'iso-8859-1) (set-coding-priority '(coding-category-iso-7 coding-category-iso-8-1 coding-category-iso-8-2)) - (setq-default buffer-file-coding-system 'coding-system-iso-8859-1) - (set-terminal-coding-system 'coding-system-iso-8859-1) - (set-keyboard-coding-system 'coding-system-iso-8859-1) + (setq-default buffer-file-coding-system 'iso-8859-1) + (set-terminal-coding-system 'iso-8859-1) + (set-keyboard-coding-system 'iso-8859-1) (setq default-input-method '("European" . "quail-latin-1")) ) @@ -94,11 +94,8 @@ "European" '((setup-function . setup-european-environment) (charset . (ascii latin-iso8859-1 latin-iso8859-2 latin-iso8859-3 latin-iso8859-4 latin-iso8859-9)) - (coding-system . (coding-system-iso-8859-1 - coding-system-iso-8859-2 - coding-system-iso-8859-3 - coding-system-iso-8859-4 - coding-system-iso-8859-9)) + (coding-system . (iso-8859-1 iso-8859-2 iso-8859-3 + iso-8859-4 iso-8859-9)) (documentation . t) (sample-text . "Hello, Hej, Tere, Hei, Bonjour, Gr,A|_(B Gott, Ciao, ,A!(BHola!")))
--- a/lisp/language/greek.el Wed Feb 26 13:08:35 1997 +0000 +++ b/lisp/language/greek.el Wed Feb 26 13:11:47 1997 +0000 @@ -29,7 +29,7 @@ ;;; Code: (make-coding-system - 'coding-system-iso-8859-7 2 ?7 "MIME ISO-8859-7" + 'iso-8859-7 2 ?7 "MIME ISO-8859-7" '((ascii t) (greek-iso8859-7 t) nil nil nil ascii-eol ascii-cntl nil nil nil nil)) @@ -37,15 +37,15 @@ "Greek" '("quail-greek" quail-use-package "quail/greek")) (defun setup-greek-environment () - (setq coding-category-iso-8-1 'coding-system-iso-8859-7) + (setq coding-category-iso-8-1 'iso-8859-7) (set-coding-priority '(coding-category-iso-7 coding-category-iso-8-1)) - (setq-default buffer-file-coding-system 'coding-system-iso-8859-7) - (set-terminal-coding-system 'coding-system-iso-8859-7) - (set-keyboard-coding-system 'coding-system-iso-8859-7) + (setq-default buffer-file-coding-system 'iso-8859-7) + (set-terminal-coding-system 'iso-8859-7) + (set-keyboard-coding-system 'iso-8859-7) (setq default-input-method '("Greek" . "quail-greek")) ) @@ -53,7 +53,7 @@ (set-language-info-alist "Greek" '((setup-function . setup-greek-environment) (charset . (greek-iso8859-7)) - (coding-system . (coding-system-iso-8859-7)) + (coding-system . (iso-8859-7)) (documentation . t) (sample-text . "Greek (,FGkk]mija(B) ,FCei\(B ,Fsar(B")))
--- a/lisp/language/hebrew.el Wed Feb 26 13:08:35 1997 +0000 +++ b/lisp/language/hebrew.el Wed Feb 26 13:11:47 1997 +0000 @@ -29,7 +29,7 @@ ;;; Code: (make-coding-system - 'coding-system-iso-8859-8 2 ?8 "MIME ISO-8859-8" + 'iso-8859-8 2 ?8 "MIME ISO-8859-8" '((ascii t) (hebrew-iso8859-8 t) nil nil nil ascii-eol ascii-cntl nil nil nil nil nil t)) @@ -37,16 +37,16 @@ "Hebrew" '("quail-hebrew" quail-use-package "quail/hebrew")) (defun setup-hebrew-environment () - (setq coding-category-iso-8-1 'coding-system-iso-8859-8) + (setq coding-category-iso-8-1 'iso-8859-8) (set-coding-priority '(coding-category-iso-7 coding-category-iso-8-1 coding-category-iso-8-2)) - (setq-default buffer-file-coding-system 'coding-category-iso-8-2) - (set-terminal-coding-system 'coding-category-iso-8-2) - (set-keyboard-coding-system 'coding-category-iso-8-2) + (setq-default buffer-file-coding-system 'iso-8859-8) + (set-terminal-coding-system 'iso-8859-8) + (set-keyboard-coding-system 'iso-8859-8) (setq default-input-method '("Hebrew" . "quail-hebrew")) ) @@ -54,7 +54,7 @@ (set-language-info-alist "Hebrew" '((setup-function . setup-hebrew-environment) (charset . (hebrew-iso8859-8)) - (coding-system . (coding-system-iso-8859-8)) + (coding-system . (iso-8859-8)) (documentation . "Right-to-left writing is Not yet supported") (sample-text . "Hebrew ,Hylem(B")))
--- a/lisp/language/korean.el Wed Feb 26 13:08:35 1997 +0000 +++ b/lisp/language/korean.el Wed Feb 26 13:11:47 1997 +0000 @@ -29,21 +29,23 @@ ;;; Code: (make-coding-system - 'coding-system-euc-korea 2 ?K + 'euc-kr 2 ?K "Coding-system of Korean EUC (Extended Unix Code)." '((ascii t) korean-ksc5601 nil nil nil ascii-eol ascii-cntl)) -;; EUC-KR is an alias for EUC-KOREA. -(put 'coding-system-euc-kr 'coding-system 'coding-system-euc-korea) +(define-coding-system-alias 'euc-kr 'euc-korea) (make-coding-system - 'coding-system-iso-2022-kr 2 ?k - "Coding-System used for communication with mail in Korea." + 'iso-2022-kr 2 ?k + "MIME ISO-2022-KR" '(ascii (nil korean-ksc5601) nil nil - nil ascii-eol ascii-cntl seven locking-shift)) + nil ascii-eol ascii-cntl seven locking-shift nil nil nil nil nil + 'designation-bol)) (register-input-method + "Korean" '("hanterm" encoded-kbd-select-terminal euc-kr)) +(register-input-method "Korean" '("quail-hangul" quail-use-package "quail/hangul")) (register-input-method "Korean" '("quail-hangul3" quail-use-package "quail/hangul3")) @@ -55,14 +57,14 @@ "Korean" '("quail-hanja-jis" quail-use-package "quail/hanja-jis")) (defun setup-korean-environment () - (setq coding-category-iso-8-2 'coding-system-euc-korea) + (setq coding-category-iso-8-2 'euc-kr) (set-coding-priority '(coding-category-iso-7 coding-category-iso-8-2 coding-category-iso-8-1)) - (setq-default buffer-file-coding-system 'coding-system-euc-korea) + (setq-default buffer-file-coding-system 'euc-kr) (setq default-input-method '("Korean" . "quail-hangul")) ) @@ -71,8 +73,7 @@ "Korean" '((setup-function . setup-korean-environment) (tutorial . "TUTORIAL.kr") (charset . (korean-ksc5601)) - (coding-system . (coding-system-euc-korea - coding-system-iso-2022-kr)) + (coding-system . (euc-kr iso-2022-kr)) (documentation . t) (sample-text . "Hangul ($(CGQ1[(B) $(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B")))
--- a/lisp/language/thai.el Wed Feb 26 13:08:35 1997 +0000 +++ b/lisp/language/thai.el Wed Feb 26 13:11:47 1997 +0000 @@ -29,26 +29,26 @@ ;;; Code: (make-coding-system - 'coding-system-tis620 2 ?T + 'th-tis620 2 ?T "Coding-system used for ASCII(MSB=0) & TIS620(MSB=1)." '((ascii t) (thai-tis620 t) nil nil nil ascii-eol)) -(put 'coding-system-tis620 'post-read-conversion - 'thai-post-read-conversion) -(put 'coding-system-tis620 'pre-write-conversion - 'thai-pre-write-conversion) +(put 'th-tis620 'post-read-conversion 'thai-post-read-conversion) +(put 'th-tis620 'pre-write-conversion 'thai-pre-write-conversion) + +(define-coding-system-alias 'th-tis620 'tis620) (register-input-method "Thai" '("quail-thai" quail-use-package "quail/thai")) (defun setup-thai-environment () - (setq coding-category-iso-8-1 'coding-system-tis620) + (setq coding-category-iso-8-1 'th-tis620) (set-coding-priority '(coding-category-iso-7 coding-category-iso-8-1)) - (setq-default buffer-file-coding-system 'coding-system-tis620) + (setq-default buffer-file-coding-system 'th-tis620) (setq default-input-method '("Thai" . "quail-thai")) ) @@ -57,7 +57,7 @@ "Thai" '((tutorial . "TUTORIAL.th") (setup-function . setup-thai-environment) (charset . (thai-tis620)) - (coding-systemm . (coding-system-tis620)) + (coding-system . (th-tis620)) (documentation . t) (sample-text . "Thai (,T@RIRd7B(B) ,TJ0GQ1J04U1$0CQ1:(B, ,TJ0GQ1J04U10$h1P(B")))
--- a/lisp/language/vietnamese.el Wed Feb 26 13:08:35 1997 +0000 +++ b/lisp/language/vietnamese.el Wed Feb 26 13:11:47 1997 +0000 @@ -201,21 +201,21 @@ (make-coding-system - 'coding-system-viscii 4 ?V + 'viscii 4 ?V "Coding-system used for VISCII 1.1." (cons ccl-decode-viscii ccl-encode-viscii)) (make-coding-system - 'coding-system-vscii 4 ?V + 'vscii 4 ?V "Coding-system used for VSCII-1." (cons ccl-decode-vscii ccl-encode-vscii)) (make-coding-system - 'coding-system-viqr 0 ?v + 'viqr 0 ?v "Codins-system used for VIQR." nil) -(put 'coding-system-viqr 'post-read-conversion 'viet-decode-viqr-region) -(put 'coding-system-viqr 'pre-write-conversion 'viet-encode-viqr-region) +(put 'viqr 'post-read-conversion 'viet-decode-viqr-region) +(put 'viqr 'pre-write-conversion 'viet-encode-viqr-region) (setq font-ccl-encoder-alist (cons (cons "viscii" ccl-encode-viscii-font) font-ccl-encoder-alist)) @@ -228,16 +228,16 @@ (defun setup-viet-environment () ;; for VISCII users - (setq coding-category-binary 'coding-system-viscii) + (setq coding-category-binary 'viscii) ;; for VSCII users - ;; (setq coding-category-binary 'coding-system-vscii) + ;; (setq coding-category-binary 'vscii) (set-coding-priority '(coding-category-iso-7 coding-category-binary)) - (setq-default buffer-file-coding-system 'coding-system-viscii) + (setq-default buffer-file-coding-system 'viscii) (setq default-input-method '("Vietnamese" . "quail-viqr")) ) @@ -246,9 +246,7 @@ "Vietnamese" '((setup-function . setup-viet-environment) (charset . (vietnamese-viscii-lower vietnamese-viscii-upper)) - (coding-system . (coding-system-viscii - coding-system-vscii - coding-system-viqr)) + (coding-system . (viscii vscii viqr)) (documentation . t) (sample-text . "Vietnamese (Ti,1*(Bng Vi,1.(Bt) Ch,1`(Bo b,1U(Bn")))