From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 11 Oct 2021 09:22:05 +0000 (+0200)
Subject: Make tty-run-terminal-initialization load the .elc file (if any)
X-Git-Tag: emacs-28.0.90~329
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e9df86004f;p=emacs.git

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).
---

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.