(setup-japanese-environment): Adjusted for the change of coding

category names.  Set default-input-method correctly.

diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index e860b27156b61bbdd6d4b7db1a0f95c611f19314..6e277f83c3f11dce4d03f8fe672c43e7e53da4c5 100644 (file)
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -36,7 +36,8 @@
      coding-category-iso-8-2
      coding-category-sjis
      coding-category-iso-8-1
-     coding-category-iso-else
+     coding-category-iso-7-else
+     coding-category-iso-8-else
      coding-category-emacs-mule))
 
   (if (eq system-type 'ms-dos)
@@ -50,7 +51,7 @@
     (set-terminal-coding-system-internal 'iso-2022-7bit)
     (set-keyboard-coding-system-internal 'iso-2022-7bit))
 
-  (setq default-input-method '("Japanese" . "quail-ja"))
+  (setq default-input-method "japanese")
 
   (setq sendmail-coding-system 'iso-2022-jp
        rmail-file-coding-system 'iso-2022-jp)