changeset 21350:b2da0edeae62

(command-line): If already unibyte, just load latin-N instead of calling set-language-environment.
author Richard M. Stallman <rms@gnu.org>
date Fri, 03 Apr 1998 23:49:11 +0000
parents ede1a6e9e122
children 78203467fc7d
files lisp/startup.el
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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