(setup-english-environment): Don't set default-enable-multibyte-characters.

diff --git a/lisp/language/english.el b/lisp/language/english.el
index b0a03a1028c4f216ec6e41bd4dcc6def3a2745a2..0fcdaa73858313cbd615ff5c24c6d92a483ff6ab 100644 (file)
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -32,9 +32,10 @@
 
 (defun setup-english-environment ()
   "Reset multilingual environment of Emacs to the default status.
-The default status is as follows.
+This function is called by all the `setup-function's for
+the various supported language environments.
 
-  The default value of enable-multibyte-characters is t.
+The default status is as follows:
 
   The default value of buffer-file-coding-system is nil.
   The coding system for terminal output is nil.
@@ -57,7 +58,8 @@ The default status is as follows.
        coding-category-binarry         no-conversion
 "
   (interactive)
-  (setq-default enable-multibyte-characters t)
+  ;; This function formerly set default-enable-multibyte-characters to t,
+  ;; but that is incorrect.  It should not alter the unibyte/multibyte choice.
 
   (setq coding-category-iso-7-tight    'iso-2022-jp
        coding-category-iso-7           'iso-2022-7bit