summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-01-28 12:42:08 -0600
committerCase Duckworth2021-01-28 12:42:08 -0600
commit2a9373ae38a0ca9a23207b52d817aecd18ec4bdf (patch)
treee6a34e8fe34a597de11bc4495eb96595b528d1cc
parentTweak expand-file-name calls and acdw/reload (diff)
downloademacs-2a9373ae38a0ca9a23207b52d817aecd18ec4bdf.tar.gz
emacs-2a9373ae38a0ca9a23207b52d817aecd18ec4bdf.zip
Change expand-file-name to locate-user-emacs-file
-rw-r--r--config.org5
-rw-r--r--init.el3
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.
2655 (message "Tangling config.org... Done.") 2655 (message "Tangling config.org... Done.")
2656 ;; load init files 2656 ;; load init files
2657 (load (locate-user-emacs-file "early-init.el")) 2657 (load (locate-user-emacs-file "early-init.el"))
2658 (byte-compile-file (locate-user-emacs-file "init.el") :load) 2658 (load (locate-user-emacs-file "init.el"))
2659 (byte-compile-file (locate-user-emacs-file "config.el") 2659 (load (locate-user-emacs-file "config.el"))))
2660 :load)))
2661#+end_src 2660#+end_src
2662 2661
2663#+begin_src emacs-lisp :noweb-ref bindings 2662#+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 @@
24 user-emacs-directory)) 24 user-emacs-directory))
25 (config.el (concat config ".el")) 25 (config.el (concat config ".el"))
26 (config.org (concat config ".org")) 26 (config.org (concat config ".org"))
27 (straight-org-dir (expand-file-name "straight/build/org" 27 (straight-org-dir (locate-user-emacs-file "straight/build/org")))
28 user-emacs-directory)))
29 ;; Okay, let's figure this out. 28 ;; Okay, let's figure this out.
30 ;; `and' evaluates each form, and returns nil on the first that 29 ;; `and' evaluates each form, and returns nil on the first that
31 ;; returns nil. `unless' only executes its body if the test 30 ;; returns nil. `unless' only executes its body if the test