[Emacs-diffs] Changes to emacs/lisp/faces.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/10/18 19:02:24

Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -b -r1.380 -r1.381
--- faces.el    15 Oct 2007 02:07:48 -0000      1.380
+++ faces.el    18 Oct 2007 19:02:22 -0000      1.381
@@ -1876,8 +1876,10 @@
          (modify-frame-parameters frame '((interprogram-cut-function . nil)))
          (modify-frame-parameters frame '((interprogram-paste-function . nil)))
 
+          (unless (terminal-parameter frame 'terminal-initted)
+            (set-terminal-parameter frame 'terminal-initted t)
          (set-locale-environment nil frame)
-         (tty-run-terminal-initialization frame)
+            (tty-run-terminal-initialization frame))
          (frame-set-background-mode frame)
          (face-set-after-frame-default frame)
          (setq success t))
@@ -1910,10 +1912,7 @@
   ;; 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.