(reset-language-environment): Handle

coding-systems not being defined yet for bootstrapping.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5628198bb32ec19e76d55f6dd72e3f0f118800fd..56ae3b61526d0f6f82d7d551c991fb597dedcd7f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-08  Jason Rumney  <jasonr@gnu.org>
+
+       * international/mule-cmds.el (reset-language-environment): Handle
+       coding-systems not being defined yet.
+
 2002-04-07  Sam Steingold  <sds@gnu.org>
 
        * vc-cvs.el (vc-cvs-checkin): Pass the required argument to `error'.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8e92f94707d5f7474ce11870558c2ac6dee4e089..76055a0ed77b49f0985ec8bd8c36b91dd9099af8 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1415,11 +1415,17 @@ The default status is as follows:
   ;; users shell appropriately, so should not be altered by changing
   ;; language environment.
   (let ((output-coding
-        (coding-system-change-text-conversion
-         (car default-process-coding-system) 'undecided))
+        ;; When bootstrapping, coding-systems are not defined yet, so
+        ;; we need to catch the error from check-coding-system.
+        (condition-case nil 
+            (coding-system-change-text-conversion
+             (car default-process-coding-system) 'undecided)
+          (coding-system-error 'undecided)))
        (input-coding
-        (coding-system-change-text-conversion
-         (cdr default-process-coding-system) 'iso-latin-1)))
+        (condition-case nil
+            (coding-system-change-text-conversion
+             (cdr default-process-coding-system) 'iso-latin-1)
+          (coding-system-error 'iso-latin-1))))
     (setq default-process-coding-system
          (cons output-coding input-coding)))