APPROVE COMMIT 21.5
diff -r 1cc781a3cdc2 lisp/ChangeLog
--- a/lisp/ChangeLog Tue Nov 14 13:02:04 2017 +0900
+++ b/lisp/ChangeLog Tue Nov 14 13:31:59 2017 +0900
@@ -28,6 +28,10 @@
2017-10-26 Stephen J. Turnbull <stephen(a)xemacs.org>
+ * mule/japanese.el (shift_jis): Correct comment.
+
+2017-10-26 Stephen J. Turnbull <stephen(a)xemacs.org>
+
* gutter-items.el (buffers-tab-omit-function):
(buffers-tab-omit-list):
(buffers-tab-selection-function):
diff -r 1cc781a3cdc2 lisp/mule/japanese.el
--- a/lisp/mule/japanese.el Tue Nov 14 13:02:04 2017 +0900
+++ b/lisp/mule/japanese.el Tue Nov 14 13:31:59 2017 +0900
@@ -292,7 +292,7 @@
documentation "The standard Japanese encoding in MS Windows."
))
-;; A former name?
+;; The registered MIME name uses an underscore.
(define-coding-system-alias 'shift_jis 'shift-jis)
;; FSF: