summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2000-11-25 16:24:43 +0000
committerJason Rumney <jasonr@gnu.org>2000-11-25 16:24:43 +0000
commit640a9cdd27498e747fcbce0a542717cce45c9870 (patch)
tree2ded30d8c8bd51f6b0eb09c2895917cdac7a8609
parentc8874f14d79c5149636dbeb7901883237ed1dd61 (diff)
downloademacs-640a9cdd27498e747fcbce0a542717cce45c9870.tar.gz
Do not call set-locale-environment until after terminal is initialized.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/startup.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f0103d2a99..9b8beee5d6c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-25 Jason Rumney <jasonr@gnu.org>
+
+ * startup.el (command-line): Call set-locale-environment after
+ Window System init file is read, as it can result in a call to
+ redraw-frame.
+
2000-11-25 Eli Zaretskii <eliz@is.elta.co.il>
* simple.el (shell-command): Mention the effect of the prefix
diff --git a/lisp/startup.el b/lisp/startup.el
index 5ee789657da..f4550310a87 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -621,8 +621,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(string= vc "simple"))
(setq version-control 'never))))
- (set-locale-environment nil)
-
;;! This has been commented out; I currently find the behavior when
;;! split-window-keep-point is nil disturbing, but if I can get used
;;! to it, then it would be better to eliminate the option.
@@ -673,6 +671,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(not noninteractive))
(setq command-line-args (tty-handle-args command-line-args)))
+ (set-locale-environment nil)
+
(let ((done nil)
(args (cdr command-line-args)))