]> git.eshelyaron.com Git - emacs.git/commitdiff
Make tty-run-terminal-initialization load the .elc file (if any)
authorLars Ingebrigtsen <larsi@gnus.org>
Mon, 11 Oct 2021 09:22:05 +0000 (11:22 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Mon, 11 Oct 2021 09:22:05 +0000 (11:22 +0200)
* lisp/faces.el (tty-run-terminal-initialization):
`locate-library' may have found the .el.gz file (bug#51116).

lisp/faces.el

index 7b96d938c56066b33bfc682ad8887ad2da60a46b..327b0ac01eca471ef6427cf0443148646c3e345c 100644 (file)
@@ -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.