Fix Japanese language environment on Cygwin and MS-Windows

* lisp/language/japan-util.el
(setup-japanese-environment-internal): Prefer UTF-8 for Cygwin and
other Posix hosts; prefer Codepage 932 on DOS/Windows.  (Bug#69493)

(cherry picked from commit f89cb6b63612a3dce113fa454fece82953fb5d5c)

diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 93e8ab249710bafaf70053557490f6762e67ae19..b058eab7029e290e875e2433a68f6b4dcc44f6bc 100644 (file)
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -29,8 +29,8 @@
 
 ;;;###autoload
 (defun setup-japanese-environment-internal ()
-  (prefer-coding-system (if (memq system-type '(windows-nt ms-dos cygwin))
-                           'japanese-shift-jis
+  (prefer-coding-system (if (memq system-type '(windows-nt ms-dos))
+                           'japanese-cp932
                          'utf-8))
   (use-cjk-char-width-table 'ja_JP))