From: Kazuhiro Ito <kzhr@d1.dion.ne.jp>
Date: Fri, 1 Mar 2024 23:44:56 +0000 (+0900)
Subject: Fix Japanese language environment on Cygwin and MS-Windows
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f889cb9aa13967d206b3fb8f9ab699e2f1cb4b3;p=emacs.git

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 93e8ab24971..b058eab7029 100644
--- 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))