Minor updates.

.emacs.d/modules/config/literate/autoload.el

@@ -9,43 +9,81 @@
   "The file path that `+literate-config-file' will be tangled to, then
 byte-compiled from.")
 
-;;;###autoload
-(defun +literate-tangle-h (&optional force-p)
-  "Tangles `+literate-config-file' if it has changed."
-  (let ((default-directory doom-private-dir))
-    (when (or (file-newer-than-file-p +literate-config-file
-                                      +literate-config-cache-file)
-              force-p)
-      (print! (start "Compiling your literate config..."))
-      (print-group!
-       (let* ((org  (expand-file-name +literate-config-file))
-              (dest (concat (file-name-sans-extension +literate-config-file) ".el"))
-              (output (get-buffer-create "*org-tangle*")))
-         (unwind-protect
-             ;; We tangle in a separate, blank process because loading it here
-             ;; would load all of :lang org (very expensive!).
-             (and (require 'ob-tangle)
-                  (letf! (defun message (msg &rest args)
-                           (print! (info "%s") (apply #'format msg args)))
-                    (org-babel-tangle-file org dest))
-                  ;; Write the cache file to serve as our mtime cache
-                  (with-temp-file +literate-config-cache-file))
-           (kill-buffer output)))))))
+(defvar org-mode-hook)
+(defvar org-inhibit-startup)
+
 
 ;;;###autoload
-(after! org
-  ;; Recompile our literate config if we modify it
-  (add-hook 'after-save-hook #'+literate-recompile-maybe-h))
+(defun +literate-tangle-h ()
+  "Tangles `+literate-config-file' if it has changed."
+  (print! (start "Compiling your literate config..."))
+  (print-group!
+   (let* ((default-directory doom-private-dir)
+          (org  (expand-file-name +literate-config-file))
+          (dest (concat (file-name-sans-extension +literate-config-file) ".el")))
+     (and (require 'ox)
+          (require 'ob-tangle)
+          (letf! (;; Operate on a copy because `org-babel-tangle' has
+                  ;; side-effects we need to undo immediately as not to
+                  ;; overwrite the user's config; it's bad ettiquite.
+                  (backup (make-temp-file (concat (file-name-nondirectory org) ".")))
+                  ;; A hack to prevent ob-tangle from operating relative to the
+                  ;; backup file and thus tangling to the wrong destinations.
+                  (defun org-babel-tangle-single-block (&rest args)
+                    (let* ((spec (apply org-babel-tangle-single-block args))
+                           (file (nth 1 spec))
+                           (file (if (file-equal-p file backup) org file))
+                           (file (if org-babel-tangle-use-relative-file-links
+                                     (file-relative-name file)
+                                   file)))
+                      (setf (nth 1 spec) file)
+                      spec))
+                  ;; Ensure output conforms to the formatting of all doom CLIs
+                  (defun message (msg &rest args)
+                    (when msg
+                      (print! (info "%s") (apply #'format msg args)))))
+            (unwind-protect
+                (with-temp-file backup
+                  (insert-file-contents org)
+                  (let ((buffer-file-name backup)
+                        ;; Prevent unwanted entries in recentf, or formatters, or
+                        ;; anything that could be on these hooks, really. Nothing
+                        ;; else should be touching these files (particularly in
+                        ;; interactive sessions).
+                        (write-file-functions nil)
+                        (before-save-hook nil)
+                        (after-save-hook nil)
+                        ;; Prevent infinite recursion due to recompile-on-save
+                        ;; hooks later, and speed up `org-mode' init.
+                        (org-mode-hook nil)
+                        (org-inhibit-startup t))
+                    (org-mode)
+                    (with-silent-modifications
+                      ;; Tangling won't ordinarily expand #+INCLUDE directives,
+                      ;; so I do it myself.
+                      (org-export-expand-include-keyword)
+                      (org-babel-tangle nil dest))))
+              (ignore-errors (delete-file backup)))
+            ;; Write an empty file to serve as our mtime cache
+            (with-temp-file +literate-config-cache-file)
+            t)))))
+
+;;;###autoload
+(add-hook 'org-mode-hook #'+literate-enable-recompile-h)
 
 ;;;###autoload
 (defalias '+literate/reload #'doom/reload)
 
+;;;###autoload
+(defun +literate-enable-recompile-h ()
+  "Enable literate-compiling-on-save in the current buffer."
+  (add-hook 'after-save-hook #'+literate-recompile-maybe-h nil 'local))
+
 ;;;###autoload
 (defun +literate-recompile-maybe-h ()
-  "Recompile config.org if we're editing an org file in our DOOMDIR.
+  "Recompile literate config to `doom-private-dir'.
 
 We assume any org file in `doom-private-dir' is connected to your literate
 config, and should trigger a recompile if changed."
-  (when (and (eq major-mode 'org-mode)
-             (file-in-directory-p buffer-file-name doom-private-dir))
-    (+literate-tangle-h 'force)))
+  (when (file-in-directory-p buffer-file-name doom-private-dir)
+    (+literate-tangle-h)))