# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 891647351 0
# Node ID b2da0edeae628349b311e4f1373144e77fb7f82f
# Parent  ede1a6e9e1221050aa5f2f4038dc4285d33ed844
(command-line): If already unibyte, just load
latin-N instead of calling set-language-environment.

diff -r ede1a6e9e122 -r b2da0edeae62 lisp/startup.el
--- a/lisp/startup.el	Fri Apr 03 21:06:38 1998 +0000
+++ b/lisp/startup.el	Fri Apr 03 23:49:11 1998 +0000
@@ -483,10 +483,14 @@
 	(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