From f641bf4554ed363e3239d7e189c9dc826f8a31cc Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 4 Aug 2020 13:58:40 -0400 Subject: [PATCH] Fix 'void-variable: backup' error Fixes my fix for #3685 --- modules/config/literate/autoload.el | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/modules/config/literate/autoload.el b/modules/config/literate/autoload.el index 39f6e13c3..a9ae4bdf0 100644 --- a/modules/config/literate/autoload.el +++ b/modules/config/literate/autoload.el @@ -16,20 +16,19 @@ byte-compiled from.") (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) - (unwind-protect + (dest (concat (file-name-sans-extension +literate-config-file) ".el")) + ;; Operate on a copy because `org-babel-tangle' has side-effects we + ;; don't want to impose on the User's config permanently. + (backup (make-temp-file (concat (file-name-nondirectory org) ".")))) + (unwind-protect + (and (require 'ox) + (require 'ob-tangle) (letf! ((defun message (msg &rest args) (when msg (print! (info "%s") (apply #'format msg args)))) ;; Prevent infinite recursion due to recompile-on-save ;; hooks later. - (org-mode-hook nil) - ;; Operate on a copy because `org-babel-tangle' has - ;; side-effects we don't want to impose on the User's - ;; config permanently. - (backup (make-temp-file (concat (file-name-nondirectory org) ".")))) + (org-mode-hook nil)) (copy-file org backup t) (with-current-buffer (find-file-noselect backup) ;; Tangling won't ordinarily expand #+INCLUDE directives @@ -37,9 +36,9 @@ byte-compiled from.") (org-babel-tangle nil dest) (kill-buffer (current-buffer))) t) - (ignore-errors (delete-file backup))) - ;; Write an empty file to serve as our mtime cache - (with-temp-file +literate-config-cache-file))))) + ;; Write an empty file to serve as our mtime cache + (with-temp-file +literate-config-cache-file)) + (ignore-errors (delete-file backup)))))) ;;;###autoload (add-hook 'org-mode-hook #'+literate-enable-recompile-h)