Mercurial > emacs
changeset 18162:f23435e45e36
(command-line): Don't call face-initialize.
(command-line): If environment specifies ISO 8859,
always set up for both singe-byte and multibyte operation.
But set-language-environment does most of the job now.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 07 Jun 1997 23:15:30 +0000 |
| parents | 1f13d44dcbbf |
| children | 8064de096e1f |
| files | lisp/startup.el |
| diffstat | 1 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Sat Jun 07 23:12:19 1997 +0000 +++ b/lisp/startup.el Sat Jun 07 23:15:30 1997 +0000 @@ -429,16 +429,13 @@ (when (and ctype (string-match iso-8859-n-locale-regexp ctype)) (setq charset (concat "latin-" (match-string 1 ctype))) - (if (default-value 'enable-multibyte-characters) - (if (string-match "latin-[12345]" charset) - (set-language-environment charset)) - ;; These two lines are ok for any Latin-N character set, - ;; as long as the terminal displays it. - (require 'disp-table) - (standard-display-european t) - ;; Set up syntax for the chosen character set. - (if (string-match "latin-[1234]" charset) - (require (intern charset)))))) + ;; Set up for this character set in multibyte mode. + (if (string-match "latin-[12345]" charset) + (set-language-environment charset)) + ;; These two lines are ok for any Latin-N character set, + ;; as long as the terminal displays it. + (require 'disp-table) + (standard-display-european t))) ;;! This has been commented out; I currently find the behavior when ;;! split-window-keep-point is nil disturbing, but if I can get used @@ -544,8 +541,6 @@ (and command-line-args (setcdr command-line-args args))) ;; Under X Windows, this creates the X frame and deletes the terminal frame. - (if (fboundp 'face-initialize) - (face-initialize)) (if (fboundp 'frame-initialize) (frame-initialize)) ;; If frame was created with a menu bar, set menu-bar-mode on.