summaryrefslogtreecommitdiff
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2021-10-11 11:22:05 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2021-10-11 11:22:05 +0200
commite9df86004f9f465658207a3b427c16006f78612b (patch)
treeb9d04b43a7a8fd66f29ba018e29c804ee70b1ad7 /lisp/faces.el
parent07edc28bdbfeeaeb1008b4fe21bfda586feae562 (diff)
downloademacs-e9df86004f9f465658207a3b427c16006f78612b.tar.gz
emacs-e9df86004f9f465658207a3b427c16006f78612b.tar.bz2
emacs-e9df86004f9f465658207a3b427c16006f78612b.zip
Make tty-run-terminal-initialization load the .elc file (if any)
* lisp/faces.el (tty-run-terminal-initialization): `locate-library' may have found the .el.gz file (bug#51116).
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 7b96d938c56..327b0ac01ec 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2289,7 +2289,9 @@ If you set `term-file-prefix' to nil, this function does nothing."
(let ((file (locate-library (concat term-file-prefix type))))
(and file
(or (assoc file load-history)
- (load (file-name-sans-extension file)
+ (load (replace-regexp-in-string
+ "\\.el\\(\\.gz\\)?\\'" ""
+ file)
t t)))))
type)
;; Next, try to find a matching initialization function, and call it.