emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Half-revert 92e604d0

Browse source 
+ Fixes config.org buffer being killed when tangled
+ Tangle files in same session if ob-tangle is loaded (and in
  noninteractive sessions). i.e. only tangle quietly when starting up
  interactive Emacs.
This commit is contained in:
Henrik Lissner 2019-03-28 15:07:39 -04:00
parent ece7b8fdcd
commit 132ad7d391
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/config/literate/init.el
View file

@ -18,21 +18,27 @@ byte-compiled from.")
(when (or force-p (file-newer-than-file-p org +literate-config-cache-file))
(message "Compiling your literate config...")
;; We tangle in a separate, blank process because loading it here would
;; load all of :lang org (very expensive!).
(or (and (zerop (call-process
"emacs" nil nil nil
"-q" "--batch" "-l" "ob-tangle" "--eval"
(format "(org-babel-tangle-file %S nil \"emacs-lisp\")"
org)))
(setq org (file-truename +literate-config-file))
(or (and (if (fboundp 'org-babel-tangle-file)
(org-babel-tangle-file org nil "emacs-lisp")
;; We tangle in a separate, blank process because loading it
;; here would load all of :lang org (very expensive!).
(zerop (call-process
"emacs" nil nil nil
"-q" "--batch" "-l" "ob-tangle" "--eval"
(format "(org-babel-tangle-file %S nil \"emacs-lisp\")"
org))))
;; Write the cache file to serve as our mtime cache
(with-temp-file +literate-config-cache-file t))
(warn "There was a problem tangling your literate config!"))
(with-temp-file +literate-config-cache-file
(message "Done!")))
(warn "There was a problem tangling your literate config!")))))
(message "Done!"))))
;; Let 'er rip!
(+literate-tangle doom-reloading-p)
(when noninteractive
(require 'ob-tangle nil t))
(+literate-tangle (or doom-reloading-p noninteractive))
;; No need to load the resulting file. Doom will do this for us after all
;; modules have finished loading.