[Emacs-diffs] trunk r116895: Tweak earlier tty-run-terminal-initialization change

[Glenn Morris]

------------------------------------------------------------
revno: 116895
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-03-28 00:16:42 -0700
message:
  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.
modified:
  lisp/faces.el                  faces.el-20091113204419-o5vbwnq5f7feedwu-562

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2014-03-28 01:39:30 +0000
+++ b/lisp/faces.el     2014-03-28 07:16:42 +0000
@@ -2142,8 +2142,9 @@
 
 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