From 345479c29eb4ee9e193baf22fe3b53e0792ed747 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 7 Jan 2020 14:27:02 -0500 Subject: [PATCH] Always display evaluated result in popup buffer If +eval isn't enabled --- modules/tools/eval/autoload/eval.el | 43 +++++++++++------------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/modules/tools/eval/autoload/eval.el b/modules/tools/eval/autoload/eval.el index e1cd7b018..6ccfdcb3b 100644 --- a/modules/tools/eval/autoload/eval.el +++ b/modules/tools/eval/autoload/eval.el @@ -3,33 +3,22 @@ ;;;###autoload (defun +eval-display-results-in-popup (output &optional _source-buffer) "Display OUTPUT in a popup buffer." - (if (with-temp-buffer - (insert output) - (or (>= (count-lines (point-min) (point-max)) - +eval-popup-min-lines) - (> (string-width - (buffer-substring (point-min) - (save-excursion - (goto-char (point-min)) - (line-end-position)))) - (window-width)))) - (let ((output-buffer (get-buffer-create "*doom eval*")) - (origin (selected-window))) - (with-current-buffer output-buffer - (setq-local scroll-margin 0) - (erase-buffer) - (insert output) - (goto-char (point-min)) - (if (fboundp '+word-wrap-mode) - (+word-wrap-mode +1) - (visual-line-mode +1))) - (when-let (win (display-buffer output-buffer)) - (fit-window-to-buffer - win (/ (frame-height) 2) - nil (/ (frame-width) 2))) - (select-window origin) - output-buffer) - (message "%s" output))) + (let ((output-buffer (get-buffer-create "*doom eval*")) + (origin (selected-window))) + (with-current-buffer output-buffer + (setq-local scroll-margin 0) + (erase-buffer) + (insert output) + (goto-char (point-min)) + (if (fboundp '+word-wrap-mode) + (+word-wrap-mode +1) + (visual-line-mode +1))) + (when-let (win (display-buffer output-buffer)) + (fit-window-to-buffer + win (/ (frame-height) 2) + nil (/ (frame-width) 2))) + (select-window origin) + output-buffer)) ;;;###autoload (defun +eval-display-results-in-overlay (output &optional source-buffer)