From: Jason Rumney Date: Mon, 8 Apr 2002 19:23:38 +0000 (+0000) Subject: (reset-language-environment): Handle X-Git-Tag: ttn-vms-21-2-B4~15746 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a099a2ff9553e2aa3d3517459afcc6605770ac88;p=emacs.git (reset-language-environment): Handle coding-systems not being defined yet for bootstrapping. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5628198bb32..56ae3b61526 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-04-08 Jason Rumney + + * international/mule-cmds.el (reset-language-environment): Handle + coding-systems not being defined yet. + 2002-04-07 Sam Steingold * 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 8e92f94707d..76055a0ed77 100644 --- 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)))