From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 3 Apr 1998 23:49:11 +0000 (+0000)
Subject: (command-line): If already unibyte, just load
X-Git-Tag: emacs-20.3~1724
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c2e527be0b180325bfb4610a5c51bd5848370878;p=emacs.git

(command-line): If already unibyte, just load
latin-N instead of calling set-language-environment.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 1f5c63d6993..6d777541c26 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -483,10 +483,14 @@ from being initialized."
 	(if (equal "5" which)
 	    (setq which "9"))
 	(setq charset (concat "latin-" which))
-	;; Set up for this character set in multibyte mode.
 	(if (string-match "latin-[12345]" charset)
-	    (set-language-environment charset))
-	(standard-display-european t charset))))
+	    (if default-enable-multibyte-characters
+		;; Set up for this character set in multibyte mode.
+		(set-language-environment charset)
+	      ;; Set up for this character set in unibyte mode.
+	      (load charset)))
+	(standard-display-european t (and default-enable-multibyte-characters
+					  charset))))))
 
   ;;! This has been commented out; I currently find the behavior when
   ;;! split-window-keep-point is nil disturbing, but if I can get used