Finally sort out the config.org/el loading thing

1 files changed, 23 insertions, 12 deletions

@@ -1559,18 +1559,29 @@ the needed boolean expression to tangle config.org.  Booleans, yall!
          (config.org (concat config ".org"))
          (straight-org-dir (expand-file-name "straight/build/org"
                                              user-emacs-directory)))
-    (unless (load config 'no-error))
-    ;; A plain require here just loads the older `org'
-    ;; in Emacs' install dir.  We need to add the newer
-    ;; one to the `load-path', hopefully that's all.
-    (when (file-exists-p straight-org-dir)
-      (add-to-list 'load-path straight-org-dir))
-    ;; Load config.org
-    (require 'org)
-    (org-babel-load-file config.org :compile))
-#+end_src
-
-*** early-init.el
+    ;; 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
+    ;; returns nil.  So.
+    ;; 1. Test if config.org is newer than config.el.  If it is (t), we
+    ;;    *want* to evaluate the body, so we need to negate that test.
+    ;; 2. Try to load the config.  If it errors (nil), it'll bubble that
+    ;;    to the `and' and the body will be evaluated.
+    (unless (and (not (file-newer-than-file-p config.org config.el))
+                 (load config :noerror))
+      ;; A plain require here just loads the older `org'
+      ;; in Emacs' install dir.  We need to add the newer
+      ;; one to the `load-path', hopefully that's all.
+      (when (file-exists-p straight-org-dir)
+        (add-to-list 'load-path straight-org-dir))
+      ;; Load config.org
+      (require 'org)
+      (org-babel-load-file config.org)))
+
+  ;;; init.el ends here
+#+end_src
+
+** early-init.el
 :PROPERTIES:
 :header-args: :tangle early-init.el :noweb yes
 :END: