aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-03-28 00:16:42 -0700
committerGlenn Morris2014-03-28 00:16:42 -0700
commit06940bd0817e7c06a90cdcd02b7cf0b92ed93f89 (patch)
tree7923730e5e19e508d3c8760ba0564da491f23c2b
parent6638d67cd23f5266274b6a15c0b0ae215a2505d2 (diff)
downloademacs-06940bd0817e7c06a90cdcd02b7cf0b92ed93f89.tar.gz
emacs-06940bd0817e7c06a90cdcd02b7cf0b92ed93f89.zip
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.
-rw-r--r--lisp/faces.el5
1 files changed, 3 insertions, 2 deletions
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'.
2142 2142
2143If you set `term-file-prefix' to nil, this function does nothing." 2143If you set `term-file-prefix' to nil, this function does nothing."
2144 (setq type (or type (tty-type frame))) 2144 (setq type (or type (tty-type frame)))
2145 (let ((alias (assoc type term-file-aliases))) 2145 (let ((alias (tty-find-type
2146 (if alias (setq type (cdr alias)))) 2146 (lambda (typ) (assoc typ term-file-aliases)) type)))
2147 (if alias (setq type (cdr (assoc alias term-file-aliases)))))
2147 ;; Load library for our terminal type. 2148 ;; Load library for our terminal type.
2148 ;; User init file can set term-file-prefix to nil to prevent this. 2149 ;; User init file can set term-file-prefix to nil to prevent this.
2149 (with-selected-frame frame 2150 (with-selected-frame frame