From 2a9373ae38a0ca9a23207b52d817aecd18ec4bdf Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Thu, 28 Jan 2021 12:42:08 -0600 Subject: Change expand-file-name to locate-user-emacs-file --- config.org | 5 ++--- init.el | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config.org b/config.org index 88ca3bd..fff22c5 100644 --- a/config.org +++ b/config.org @@ -2655,9 +2655,8 @@ Bind it to =C-z i= because =C-z C-c= is taken for capture. (message "Tangling config.org... Done.") ;; load init files (load (locate-user-emacs-file "early-init.el")) - (byte-compile-file (locate-user-emacs-file "init.el") :load) - (byte-compile-file (locate-user-emacs-file "config.el") - :load))) + (load (locate-user-emacs-file "init.el")) + (load (locate-user-emacs-file "config.el")))) #+end_src #+begin_src emacs-lisp :noweb-ref bindings diff --git a/init.el b/init.el index 1ddb5f9..ae4ae9f 100644 --- a/init.el +++ b/init.el @@ -24,8 +24,7 @@ user-emacs-directory)) (config.el (concat config ".el")) (config.org (concat config ".org")) - (straight-org-dir (expand-file-name "straight/build/org" - user-emacs-directory))) + (straight-org-dir (locate-user-emacs-file "straight/build/org"))) ;; Okay, let's figure this out. ;; `and' evaluates each form, and returns nil on the first that ;; returns nil. `unless' only executes its body if the test -- cgit 1.4.1-21-gabe81