2 files changed, 13 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef3495eada7..315d69af254 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * international/mule-cmds.el (reset-language-environment)
+        (set-language-environment-nonascii-translation): Don't set-unibyte-charset.
+
         * doc-view.el: Remove all cb-args, use closures instead.
         (doc-view-sentinel): Merge doc-view-dvi->pdf-sentinel,
         doc-view-ps->pdf-sentinel, and doc-view-pdf->txt-sentinel (which was
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 45b3543b0ee..2ce56546bfe 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1775,7 +1775,11 @@ The default status is as follows:
   ;; (set-terminal-coding-system-internal nil)
   ;; (set-keyboard-coding-system-internal nil)
 
-  (set-unibyte-charset 'iso-8859-1))
+  ;; Back in Emacs-20, it was necessary to provide some fallback implicit
+  ;; conversion, because almost no packages handled coding-system issues.
+  ;; Nowadays it'd just paper over bugs.
+  ;; (set-unibyte-charset 'iso-8859-1)
+  )
 
 (reset-language-environment)
 
@@ -1964,7 +1968,11 @@ Setting this variable directly does not take effect.  See
     (or (and (charsetp nonascii)
              (get-charset-property nonascii :ascii-compatible-p))
         (setq nonascii 'iso-8859-1))
-    (set-unibyte-charset nonascii)))
+    ;; Back in Emacs-20, it was necessary to provide some fallback implicit
+    ;; conversion, because almost no packages handled coding-system issues.
+    ;; Nowadays it'd just paper over bugs.
+    ;; (set-unibyte-charset nonascii)
+    ))
 
 (defun set-language-environment-charset (language-name)
   "Do various charset setups for language environment LANGUAGE-NAME."