From: Glenn Morris <rgm@gnu.org>
Date: Fri, 28 Mar 2014 07:16:42 +0000 (-0700)
Subject: Tweak earlier tty-run-terminal-initialization change
X-Git-Tag: emacs-25.0.90~2612^2~709^2~1143
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06940bd0817e7c06a90cdcd02b7cf0b92ed93f89;p=emacs.git

Tweak earlier tty-run-terminal-initialization change

* lisp/faces.el (tty-run-terminal-initialization):
Use tty-find-type so that aliases are matched with the
hyphen and underscore stripping behavior.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 755de8e3fcd..49b59281576 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2142,8 +2142,9 @@ this runs the hook `tty-setup-hook'.
 
 If you set `term-file-prefix' to nil, this function does nothing."
   (setq type (or type (tty-type frame)))
-  (let ((alias (assoc type term-file-aliases)))
-    (if alias (setq type (cdr alias))))
+  (let ((alias (tty-find-type
+		(lambda (typ) (assoc typ term-file-aliases)) type)))
+    (if alias (setq type (cdr (assoc alias term-file-aliases)))))
   ;; Load library for our terminal type.
   ;; User init file can set term-file-prefix to nil to prevent this.
   (with-selected-frame frame