2003-07-08 Kim F. Storm <storm@cua.dk>

	* international/mule-cmds.el (set-display-table-and-terminal-coding-system):
	Don't break bootstrap if standard-display-table isn't setup yet.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f19974f7e461cc8ccd6216601605c0f233f2b52e..05bffad4c08f9972e4856c43329411eb8dbff4ab 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-08  Kim F. Storm  <storm@cua.dk>
+
+       * international/mule-cmds.el (set-display-table-and-terminal-coding-system):
+       Don't break bootstrap if standard-display-table isn't setup yet.
+
 2003-07-07  Richard M. Stallman  <rms@gnu.org>
 
        * ehelp.el (ehelp-command): Use defalias to define ehelp-command.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8d23b259801152cfe9f79d13434cb3379c31131c..4ebb0d1d48531e033dc28ba28fb913310cef9aa5 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1689,11 +1689,12 @@ The default status is as follows:
       ;; case the user has used standard-display-european earlier in
       ;; this session.  (The MS-DOS port doesn't use that setup, so it
       ;; doesn't need to undo it.)
-      (dotimes (i 128)
-       (aset standard-display-table (+ i 128) nil))
-      (aset standard-display-table 146 nil))
+      (when standard-display-table
+       (dotimes (i 128)
+         (aset standard-display-table (+ i 128) nil))
+       (aset standard-display-table 146 nil)))
     (or (eq window-system 'pc)
-      (set-terminal-coding-system coding))))
+       (set-terminal-coding-system coding))))
 
 (defun set-language-environment (language-name)
   "Set up multi-lingual environment for using LANGUAGE-NAME.