Fix terminal initialization code. (Contributed by Dan Nicolaescu.)

* lisp/faces.el (tty-create-frame-with-faces): Call terminal-init-*.
  Don't load the initialization file more than once.

* lisp/startup.el (command-line): Don't load the terminal initialization
  file more than once.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-398

2 files changed, 21 insertions, 5 deletions

diff --git a/lisp/faces.el b/lisp/faces.el
index 7c0185e1700..eb61a04cb70 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1820,14 +1820,25 @@ created."
           ;; User init file can set term-file-prefix to nil to prevent this.
           (unless (null term-file-prefix)
             (let ((term (cdr (assq 'tty-type parameters)))
-                  hyphend)
+                  hyphend
+                  term-init-func)
               (while (and term
+                          (not (fboundp 
+                                (setq term-init-func (intern (concat "terminal-init-" term)))))
                           (not (load (concat term-file-prefix term) t t)))
                 ;; Strip off last hyphen and what follows, then try again
                 (setq term
                       (if (setq hyphend (string-match "[-_][^-_]+$" term))
                           (substring term 0 hyphend)
-                        nil)))))
+                        nil))
+                (setq term-init-func nil))
+              (when term
+                ;; The terminal file has been loaded, now call the terminal
+                ;; specific initialization function.
+                (unless term-init-func 
+                  (setq term-init-func (intern (concat "terminal-init-" term)))
+                  (when (fboundp term-init-func)
+                    (funcall term-init-func))))))
           ;; Make sure the kill and yank functions do not touch the X clipboard.
           (modify-frame-parameters frame '((interprogram-cut-function . nil)))
           (modify-frame-parameters frame '((interprogram-paste-function . nil)))
diff --git a/lisp/startup.el b/lisp/startup.el
index 5ca9d2ca2fa..86f9bae30a3 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -982,18 +982,23 @@ opening the first frame (e.g. open a connection to an X server).")
               initial-window-system
               (null term-file-prefix))
     (let ((term (getenv "TERM"))
-          hyphend)
+          hyphend
+          term-init-func)
       (while (and term
+                  (not (fboundp 
+                        (setq term-init-func (intern (concat "terminal-init-" term)))))
                   (not (load (concat term-file-prefix term) t t)))
         ;; Strip off last hyphen and what follows, then try again
         (setq term
               (if (setq hyphend (string-match "[-_][^-_]+$" term))
                   (substring term 0 hyphend)
-                nil)))
+                nil))
+        (setq term-init-func nil))
       (when term
         ;; The terminal file has been loaded, now call the terminal
         ;; specific initialization function.
-        (let ((term-init-func (intern (concat "terminal-init-" term))))
+        (unless term-init-func 
+          (setq term-init-func (intern (concat "terminal-init-" term)))
           (when (fboundp term-init-func)
             (funcall term-init-func))))))