From 0206197b224f67e6a4c65bb850758f4affc9cc84 Mon Sep 17 00:00:00 2001 From: Lin Sun Date: Sat, 4 Dec 2021 00:00:32 +0000 Subject: [PATCH] [core] less ".el" suffix for support both *.el and *.elc --- core/core-dumper.el | 2 +- dump-init.el | 2 +- early-init.el | 2 +- init.el | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/core-dumper.el b/core/core-dumper.el index 2a74faa3f6bd..dafbe086e447 100644 --- a/core/core-dumper.el +++ b/core/core-dumper.el @@ -170,7 +170,7 @@ When universal prefix argument is passed then display the process buffer." :command (list dotspacemacs-emacs-pdumper-executable-file "--batch" - "-l" (concat spacemacs-start-directory "dump-init.el") + "-l" (concat spacemacs-start-directory "dump-init") "-eval" (concat "(dump-emacs-portable \"" dump-file-temp "\")")))) (when (equal '(4) display-buffer) (pop-to-buffer spacemacs-dump-buffer-name)))) diff --git a/dump-init.el b/dump-init.el index c9cda75158cc..57c44c2ef143 100644 --- a/dump-init.el +++ b/dump-init.el @@ -2,7 +2,7 @@ (setq spacemacs-dump-mode 'dumping) ;; load init.el (setq spacemacs-start-directory (file-name-directory load-file-name)) -(load (concat spacemacs-start-directory "init.el")) +(load (concat spacemacs-start-directory "init")) ;; prepare the dump (spacemacs/dump-save-load-path) ;; disable undo-tree to prevent from segfaulting when loading the dump diff --git a/early-init.el b/early-init.el index b06eb8883a54..0673c335e852 100644 --- a/early-init.el +++ b/early-init.el @@ -36,7 +36,7 @@ (setq package-enable-at-startup nil) (load (concat (file-name-directory load-file-name) - "core/core-early-funcs.el") + "core/core-early-funcs") nil (not init-file-debug)) ;; Remove GUI elements soon after GUI being initialized to avoid some possible grapical glitches. diff --git a/init.el b/init.el index 7f2526cb6151..36adea2efc99 100644 --- a/init.el +++ b/init.el @@ -29,16 +29,16 @@ (defconst emacs-start-time (current-time)) (setq gc-cons-threshold 402653184 gc-cons-percentage 0.6) (load (concat (file-name-directory load-file-name) - "core/core-versions.el") + "core/core-versions") nil (not init-file-debug)) (load (concat (file-name-directory load-file-name) - "core/core-load-paths.el") + "core/core-load-paths") nil (not init-file-debug)) -(load (concat spacemacs-core-directory "core-dumper.el") +(load (concat spacemacs-core-directory "core-dumper") nil (not init-file-debug)) ;; Remove compiled core files if they become stale or Emacs version has changed. -(load (concat spacemacs-core-directory "core-compilation.el") +(load (concat spacemacs-core-directory "core-compilation") nil (not init-file-debug)) (load spacemacs--last-emacs-version-file t (not init-file-debug)) (when (or (not (string= spacemacs--last-emacs-version emacs-version))