[Emacs-diffs] master a2e7804 2/2: Mention Japanese change in documentation

[Paul Eggert]

branch: master
commit a2e78046f6b52e0a433ae6e1b9e6e5015f415412
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Mention Japanese change in documentation
---
 doc/emacs/mule.texi         | 2 +-
 etc/NEWS                    | 5 +++++
 lisp/language/japan-util.el | 8 +++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index b3e7d21..6a26667 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -397,7 +397,7 @@ messages.  But if your locale matches an entry in the 
variable
 coding system instead.  For example, if the locale @samp{ja_JP.PCK}
 matches @code{japanese-shift-jis} in
 @code{locale-preferred-coding-systems}, Emacs uses that encoding even
-though it might normally use @code{japanese-iso-8bit}.
+though it might normally use @code{utf-8}.
 
   You can override the language environment chosen at startup with
 explicit use of the command @code{set-language-environment}, or with
diff --git a/etc/NEWS b/etc/NEWS
index 3670ab5..6a91017 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -218,6 +218,11 @@ regular expression was previously invalid, but is now 
accepted:
 ** New input methods 'hawaiian-postfix' and 'hawaiian-prefix'.
 
 +++
+** In Japanese environments that do not specify encodings and are not
+based on MS-Windows, the default encoding is now utf-8 instead of
+japanese-iso-8bit.
+
++++
 ** New function 'exec-path'.
 This function by default returns the value of the corresponding
 variable, but can optionally return the equivalent of 'exec-path'
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index 6d87303..b1eb3d9 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -29,11 +29,9 @@
 
 ;;;###autoload
 (defun setup-japanese-environment-internal ()
-  ;; By default, we use 'iso-2022-jp for default coding system.  But, the
-  ;; following prefer-coding-system will override it.
-  (if (memq system-type '(windows-nt ms-dos cygwin))
-      (prefer-coding-system 'japanese-shift-jis)
-    (prefer-coding-system 'utf-8))
+  (prefer-coding-system (if (memq system-type '(windows-nt ms-dos cygwin))
+                           'japanese-shift-jis
+                         'utf-8))
   (use-cjk-char-width-table 'ja_JP))
 
 (defconst japanese-kana-table