(setup-japanese-environment): Do not

call set-terminal-coding-system and set-keyboard-coding-system,
instead call set-defualt-coding-systems.

diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 95ae9fb5b28b3e7c2f305fcdb5e05dd3cb6c2ae2..95d139843db118bd906914b5a50c0fa88e2b11bb 100644 (file)
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -29,6 +29,7 @@
   "Setup multilingual environment (MULE) for Japanese."
   (interactive)
   (setup-english-environment)
+
   (setq coding-category-iso-8-2 'japanese-iso-8bit)
 
   (set-coding-priority
@@ -40,16 +41,10 @@
      coding-category-iso-8-else
      coding-category-emacs-mule))
 
-  (if (eq system-type 'ms-dos)
-      (progn
-       (setq-default buffer-file-coding-system 'japanese-shift-jis)
-       (set-terminal-coding-system-internal 'japanese-shift-jis)
-       (set-keyboard-coding-system-internal 'japanese-shift-jis)
-       (setq default-process-coding-system
-             '(japanese-shift-jis-dos . japanese-shift-jis-dos)))
-    (setq-default buffer-file-coding-system 'iso-2022-7bit)
-    (set-terminal-coding-system-internal 'iso-2022-7bit)
-    (set-keyboard-coding-system-internal 'iso-2022-7bit))
+  (set-default-coding-systems
+   (if (eq system-type 'ms-dos)
+       'japanese-shift-jis
+     'iso-2022-7bit))
 
   (setq default-input-method "japanese")
   (setq-default default-input-method "japanese")