Remove prefix "coding-system-" from coding system symbol names.

Change coding system name shift-jis to shift_jis.

1 files changed, 24 insertions, 21 deletions

diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index c588e31877c..d9aa3b6389e 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -29,35 +29,41 @@
 
 ;;; Code:
 
+(define-coding-system-alias 'iso-2022-7 'iso-2022-jp)
+(define-coding-system-alias 'iso-2022-7 'junet)
+
 (make-coding-system
- 'coding-system-sjis 1 ?S
+ 'shift_jis 1 ?S
  "Coding-system of Shift-JIS used in Japan." t)
 
-;; ISO-2022-JP and JUNET are aliases for ISO-2022-7.
-(put 'coding-system-iso-2022-jp 'coding-system 'coding-system-iso-2022-7)
-(put 'coding-system-junet 'coding-system 'coding-system-iso-2022-7)
+(define-coding-system-alias 'shift_jis 'sjis)
 
 (make-coding-system
- 'coding-system-old-jis 2 ?J
+ '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))
 
+(define-coding-system-alias 'iso-2022-jp-1978-irv 'old-jis)
+
 (make-coding-system
- 'coding-system-euc-japan 2 ?E
+ 'euc-japan-1990 2 ?E
  "Coding-system of Japanese EUC (Extended Unix Code)."
  '(ascii japanese-jisx0208 katakana-jisx0201 japanese-jisx0212
          short ascii-eol ascii-cntl nil nil single-shift))
 
-(register-input-method
- "Japanese" '("quail-ja" quail-use-package "quail/japanese"))
+(define-coding-system-alias 'euc-japan-1990 'euc-japan)
 
 (register-input-method
+ "Japanese" '("uum" encoded-kbd-select-terminal iso-2022-jp))
+(register-input-method
  "Japanese" '("quail-ja-hiragana" quail-use-package "quail/japanese"))
+(register-input-method
+ "Japanese" '("quail-ja" quail-use-package "quail/japanese"))
 
 (defun setup-japanese-environment ()
   (interactive)
-  (setq coding-category-iso-8-2 'coding-system-euc-japan)
+  (setq coding-category-iso-8-2 'euc-japan-1990)
 
   (set-coding-priority
    '(coding-category-iso-7
@@ -69,14 +75,13 @@
 
   (if (eq system-type 'ms-dos)
       (progn
-        (setq-default buffer-file-coding-system 'coding-system-sjis)
-        (set-terminal-coding-system 'coding-system-sjis)
-        (set-keyboard-coding-system 'coding-system-sjis)
-        (setq default-process-coding-system
-              '(coding-system-sjis-dos . coding-system-sjis-dos)))
-    (setq-default buffer-file-coding-system 'coding-system-iso-2022-jp)
-    (set-terminal-coding-system 'coding-system-iso-2022-jp)
-    (set-keyboard-coding-system 'coding-system-iso-2022-jp))
+        (setq-default buffer-file-coding-system 'sjis)
+        (set-terminal-coding-system 'sjis)
+        (set-keyboard-coding-system 'sjis)
+        (setq default-process-coding-system '(sjis-dos . sjis-dos)))
+    (setq-default buffer-file-coding-system 'iso-2022-jp)
+    (set-terminal-coding-system 'iso-2022-jp)
+    (set-keyboard-coding-system 'iso-2022-jp))
 
   (set-default-input-method "Japanese" "quail-ja")
   )
@@ -87,10 +92,8 @@
               (charset . (japanese-jisx0208 japanese-jisx0208-1978
                           japanese-jisx0212 latin-jisx0201
                           katakana-jisx0201))
-              (coding-system . (coding-system-euc-japan
-                                coding-system-sjis
-                                coding-system-old-jis
-                                coding-system-iso-2022-jp))
+              (coding-system . (euc-japan-1990 sjis
+                                iso-2022-jp iso-2022-jp-1978-irv))
               (documentation . t)
               (sample-text . "Japanese ($BF|K\8l(B)           $B$3$s$K$A$O(B, (I:]FAJ(B")))