(setup-japanese-environment-internal): Prefer japanese-shift-jis on

DOS and Windows.

diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 7641593440c9167a309503970e2d14977298094e..9ad6cb678c14a0263a4102478935c36265fa181d 100644 (file)
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -32,10 +32,8 @@
   ;; By default, we use 'japanese-iso-8bit for file names.  But, the
   ;; following prefer-coding-system will override it.
   (setq default-file-name-coding-system 'japanese-iso-8bit)
-  (cond ((eq system-type 'ms-dos)
-        (prefer-coding-system 'japanese-shift-jis))
-       ((eq system-type 'usg-unix-v)
-        (prefer-coding-system 'japanese-iso-8bit))))
+  (if (memq system-type '(windows-nt ms-dos cygwin))
+      (prefer-coding-system 'japanese-shift-jis)))
 
 (defconst japanese-kana-table
   '((?\e$B$"\e(B ?\e$B%"\e(B ?\e(I1\e(B) (?\e$B$$\e(B ?\e$B%$\e(B ?\e(I2\e(B) (?\e$B$&\e(B ?\e$B%&\e(B ?\e(I3\e(B) (?\e$B$(\e(B ?\e$B%(\e(B ?\e(I4\e(B) (?\e$B$*\e(B ?\e$B%*\e(B ?\e(I5\e(B)