diff --git a/core/cli/byte-compile.el b/core/cli/byte-compile.el index b5b0d7282..a08602908 100644 --- a/core/cli/byte-compile.el +++ b/core/cli/byte-compile.el @@ -144,7 +144,7 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files." total-fail) (t (print! (green "✓ Compiled %s") short-name) - (quiet! (load target t t)) + (load target t t) total-ok)))) (cl-incf total-noop))) (print! (bold (color (if (= total-fail 0) 'green 'red) diff --git a/core/core-lib.el b/core/core-lib.el index b13015af0..22877494a 100644 --- a/core/core-lib.el +++ b/core/core-lib.el @@ -170,19 +170,22 @@ compilation. This will no-op on features that have been disabled by the user." (defmacro quiet! (&rest forms) "Run FORMS without making any output." - `(if doom-debug-mode - (progn ,@forms) - (let ((old-fn (symbol-function 'write-region))) - (cl-letf* ((standard-output (lambda (&rest _))) - ((symbol-function 'load-file) (lambda (file) (load file nil t))) - ((symbol-function 'message) (lambda (&rest _))) - ((symbol-function 'write-region) - (lambda (start end filename &optional append visit lockname mustbenew) - (unless visit (setq visit 'no-message)) - (funcall old-fn start end filename append visit lockname mustbenew))) - (inhibit-message t) - (save-silently t)) - ,@forms)))) + `(cond (noninteractive + (let ((old-fn (symbol-function 'write-region))) + (cl-letf ((standard-output (lambda (&rest _))) + ((symbol-function 'load-file) (lambda (file) (load file nil t))) + ((symbol-function 'message) (lambda (&rest _))) + ((symbol-function 'write-region) + (lambda (start end filename &optional append visit lockname mustbenew) + (unless visit (setq visit 'no-message)) + (funcall old-fn start end filename append visit lockname mustbenew)))) + ,@forms))) + ((or doom-debug-mode debug-on-error debug-on-quit) + ,@forms) + ((let ((inhibit-message t) + (save-silently t)) + ,@forms + (message ""))))) (defmacro add-transient-hook! (hook-or-function &rest forms) "Attaches a self-removing function to HOOK-OR-FUNCTION. diff --git a/core/core-packages.el b/core/core-packages.el index 60c5b9dc1..438c524a3 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -146,7 +146,7 @@ them." package--initialized nil) (let (byte-compile-warnings) (condition-case _ - (quiet! (package-initialize)) + (package-initialize) ('error (package-refresh-contents) (setq doom--refreshed-p t) (package-initialize)))))) diff --git a/core/test/test-autoload-files.el b/core/test/test-autoload-files.el index f3c2d4b92..4251e6f0d 100644 --- a/core/test/test-autoload-files.el +++ b/core/test/test-autoload-files.el @@ -40,7 +40,7 @@ (expect (quiet! (doom/copy-this-file dest t))) (expect (file-exists-p! src dest))) (it "prompts if overwriting a file" - (quiet! (quiet! (doom/copy-this-file existing))) + (quiet! (doom/copy-this-file existing)) (expect 'y-or-n-p :to-have-been-called-times 1))) (describe "delete-this-file" diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el index edf161be6..f4f586cb1 100644 --- a/modules/lang/org/autoload/org.el +++ b/modules/lang/org/autoload/org.el @@ -364,10 +364,10 @@ another level of headings on each invocation." (defun +org|realign-table-maybe () "Auto-align table under cursor and re-calculate formulas." (when (and (org-at-table-p) org-table-may-need-update) - (let ((pt (point))) - (quiet! - (org-table-recalculate) - (if org-table-may-need-update (org-table-align))) + (let ((pt (point)) + (inhibit-message t)) + (org-table-recalculate) + (if org-table-may-need-update (org-table-align)) (goto-char pt)))) ;;;###autoload diff --git a/modules/lang/web/test/test-web.el b/modules/lang/web/test/test-web.el index 27edb7c73..bd20b26d2 100644 --- a/modules/lang/web/test/test-web.el +++ b/modules/lang/web/test/test-web.el @@ -40,7 +40,7 @@ (describe "toggle-inline-or-block" (after-each - (+css/toggle-inline-or-block) + (quiet! (+css/toggle-inline-or-block)) (expect (string-trim (buffer-string)) :to-equal (string-join '("body {"