emacs-28 e9df860: Make tty-run-terminal-initialization load the .elc file (if any)

[Lars Ingebrigtsen]

branch: emacs-28
commit e9df86004f9f465658207a3b427c16006f78612b
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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).
---
 lisp/faces.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/faces.el b/lisp/faces.el
index 7b96d93..327b0ac 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.