[emacs] Support native compiled init file in ‘mpn-find-file-map’

When init.el goes through native compilation, ‘user-init-file’ ends up pointing at a *.eln file in its own directory. Open init.el when that happens.
mina86 · Jun 1, 2024 · dd4b709 · dd4b709
1 parent 8a3936b
commit dd4b709
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/emacs/init.el b/emacs/init.el
@@ -414,11 +414,20 @@ If function given tries to `describe-function' otherwise uses
 
 (defvar mpn-find-file-map
   (let ((map (make-sparse-keymap))
-        (lst `(("i" . ,(cond ((not user-init-file) ; Called with -Q
-			      "init.el")
-			     ((string-match "\\.elc$" user-init-file)
-                              (substring user-init-file 0 -1))
-			     (user-init-file)))
+        (lst `(("i" . ,(cond
+                        ;; Called with -Q
+                        ((not user-init-file)
+                         "init.el")
+                        ;; Compiled file.  Open the source.
+                        ((string-match "\\.elc$" user-init-file)
+                         (substring user-init-file 0 -1))
+                        ;; Native compiled file.  Finding the source isn’t as
+                        ;; simple as changing extension from .eln to .el.  Just
+                        ;; open init.el.
+                        ((string-match "\\.eln$" user-init-file)
+                         "init.el")
+                        ;; Open whatever init file we’re loading.
+                        (user-init-file)))
                ("e" . "early-init.el")
                ("m" . "mail.el")
                ("c" . "customize.el")