From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 26 Apr 1998 00:13:54 +0000 (+0000)
Subject: (setup-8-bit-environment): If default-enable-multibyte-characters is nil,
X-Git-Tag: emacs-20.3~1308
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0828b971b5918e9018581b069144dcf3fac65c9a;p=emacs.git

(setup-8-bit-environment): If default-enable-multibyte-characters is nil,
call standard-display-european, and don't set nonascii-insert-offset
or default-input-method.
---

diff --git a/lisp/language/european.el b/lisp/language/european.el
index bdff7120c58..28cb9c805d0 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -34,14 +34,21 @@
   (setup-english-environment)
   (set-language-environment-coding-systems language)
 
-  (if charset
-      (let ((nonascii-offset (- (make-char charset) 128)))
-	;; Set up for insertion of characters in this character set
-	;; when codes 0200 - 0377 are typed in.
-	(setq nonascii-insert-offset nonascii-offset)))
-
-  (if input-method
-      (setq default-input-method input-method))
+  (when default-enable-multibyte-characters
+    (or (member (downcase language)
+		'("latin-1" "latin-2" "latin-3" "latin-4" "latin-5"))
+	(error "Language environment `%s' not supported in unibyte mode"))
+    (standard-display-european 1 (downcase language)))
+
+  (unless default-enable-multibyte-characters
+    (if charset
+	(let ((nonascii-offset (- (make-char charset) 128)))
+	  ;; Set up for insertion of characters in this character set
+	  ;; when codes 0200 - 0377 are typed in.
+	  (setq nonascii-insert-offset nonascii-offset)))
+
+    (if input-method
+	(setq default-input-method input-method)))
 
   ;; If this is a Latin-N character set, set up syntax for it in
   ;; single-byte mode.  We can't use require because the file