From 8782c744ef0c1732c513e29f260b0e73263deffd Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 18 Oct 2007 19:02:23 +0000 Subject: [PATCH] (tty-create-frame-with-faces): Make sure not only tty-run-terminal-initialization but also set-locale-environment are run only once per terminal. (tty-run-terminal-initialization): Don't check if the terminal was already initted. --- lisp/ChangeLog | 6 ++++++ lisp/faces.el | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b92d3b1b654..9063215b99f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2007-10-18 Stefan Monnier + * faces.el (tty-create-frame-with-faces): Make sure not only + tty-run-terminal-initialization but also set-locale-environment + are run only once per terminal. + (tty-run-terminal-initialization): Don't check if the terminal was + already initted. + * international/encoded-kb.el (encoded-kbd-setup-display): Be careful not to remove keymaps that just happen to inherit from one of ours. When setting up our keymap, make sure it won't be accidentally diff --git a/lisp/faces.el b/lisp/faces.el index e31622d9ba0..ab299160b6d 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1876,8 +1876,10 @@ created." (modify-frame-parameters frame '((interprogram-cut-function . nil))) (modify-frame-parameters frame '((interprogram-paste-function . nil))) - (set-locale-environment nil frame) - (tty-run-terminal-initialization frame) + (unless (terminal-parameter frame 'terminal-initted) + (set-terminal-parameter frame 'terminal-initted t) + (set-locale-environment nil frame) + (tty-run-terminal-initialization frame)) (frame-set-background-mode frame) (face-set-after-frame-default frame) (setq success t)) @@ -1910,10 +1912,7 @@ terminal type to a different value." ;; Load library for our terminal type. ;; User init file can set term-file-prefix to nil to prevent this. (with-selected-frame frame - (unless (or (null term-file-prefix) - ;; Don't reinitialize the terminal each time a new - ;; frame is opened on it. - (terminal-parameter frame 'terminal-initted)) + (unless (null term-file-prefix) (let* (term-init-func) ;; First, load the terminal initialization file, if it is ;; available and it hasn't been loaded already. -- 2.11.4.GIT