From b681917082874a7fb7810bb308249f73fdf21606 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 6 Jan 2018 03:27:23 -0500 Subject: [PATCH] Remove/replace references to doom-popup-buffer --- core/autoload/menu.el | 5 ++--- core/autoload/message.el | 4 ++-- modules/app/regex/autoload/regex.el | 4 ++-- modules/app/rss/autoload.el | 10 ---------- modules/app/rss/config.el | 2 +- modules/feature/eval/autoload/repl.el | 4 ++-- modules/feature/eval/config.el | 3 ++- modules/tools/eshell/autoload/eshell.el | 2 +- modules/tools/gist/config.el | 2 +- modules/tools/term/autoload.el | 2 +- 10 files changed, 14 insertions(+), 24 deletions(-) diff --git a/core/autoload/menu.el b/core/autoload/menu.el index c0ad798f2..bd19bbc43 100644 --- a/core/autoload/menu.el +++ b/core/autoload/menu.el @@ -31,9 +31,8 @@ PROMPT (a string) and COMMAND (a list of command plists; see `def-menu!').") (setq header-line-format (concat (propertize "$ " 'face 'font-lock-doc-face) (propertize command 'face 'font-lock-preprocessor-face))) - (doom-resize-window - (doom-popup-buffer (current-buffer) - '(:autokill t :autoclose t)) 12))) + (doom-resize-window (get-buffer-window (pop-to-buffer (current-buffer))) + 12))) ((or (symbolp command) (functionp command)) (call-interactively command)) diff --git a/core/autoload/message.el b/core/autoload/message.el index 8924264ca..d84d40a92 100644 --- a/core/autoload/message.el +++ b/core/autoload/message.el @@ -66,8 +66,8 @@ interactive session." (insert "\n") (setq end (point)) (ansi-color-apply-on-region beg end))) - (with-selected-window (doom-popup-buffer buf) - (goto-char (point-max)))))) + (pop-to-buffer buf) + (goto-char (point-max))))) ;;;###autoload (defmacro debug! (message &rest args) diff --git a/modules/app/regex/autoload/regex.el b/modules/app/regex/autoload/regex.el index a54a210a5..87178f29a 100644 --- a/modules/app/regex/autoload/regex.el +++ b/modules/app/regex/autoload/regex.el @@ -64,8 +64,8 @@ (switch-to-buffer +regex--text-buffer) (with-current-buffer +regex--text-buffer (insert +regex-dummy-text))) - (doom-popup-buffer +regex--groups-buffer) - (doom-popup-buffer +regex--expr-buffer) + (pop-to-buffer +regex--groups-buffer) + (pop-to-buffer +regex--expr-buffer) (with-current-buffer +regex--expr-buffer (conf-mode) (rainbow-delimiters-mode +1) diff --git a/modules/app/rss/autoload.el b/modules/app/rss/autoload.el index ed9e10fbe..38e79fc02 100644 --- a/modules/app/rss/autoload.el +++ b/modules/app/rss/autoload.el @@ -33,16 +33,6 @@ (kill-buffer buff) (delete-window window))) -;;;###autoload -(defun +rss-popup-pane (buf) - "Display BUF in a popup." - (doom-popup-buffer buf - '(:align +rss-split-direction - :size 0.75 - :select t - :autokill t - :autoclose t))) - ;;;###autoload (defun +rss/open (entry) "Display the currently selected item in a buffer." diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el index bfd25007f..1aa6cd903 100644 --- a/modules/app/rss/config.el +++ b/modules/app/rss/config.el @@ -21,7 +21,7 @@ (setq elfeed-search-filter "@2-week-ago " elfeed-db-directory (concat doom-local-dir "elfeed/db/") elfeed-enclosure-default-dir (concat doom-local-dir "elfeed/enclosures/") - elfeed-show-entry-switch #'+rss-popup-pane + elfeed-show-entry-switch #'pop-to-buffer elfeed-show-entry-delete #'+rss/delete-pane shr-max-image-proportion 0.6) diff --git a/modules/feature/eval/autoload/repl.el b/modules/feature/eval/autoload/repl.el index 5655a64f3..8e75e402d 100644 --- a/modules/feature/eval/autoload/repl.el +++ b/modules/feature/eval/autoload/repl.el @@ -9,14 +9,14 @@ (if (and +eval-repl-buffer (buffer-live-p +eval-repl-buffer)) (if-let* ((win (get-buffer-window +eval-repl-buffer))) (select-window win) - (doom-popup-buffer +eval-repl-buffer)) + (pop-to-buffer +eval-repl-buffer)) (when command (let ((repl-buffer (save-window-excursion (call-interactively command)))) (unless (bufferp repl-buffer) (error "REPL command didn't return a buffer")) (with-current-buffer repl-buffer (+eval-repl-mode +1)) (setq +eval-repl-buffer repl-buffer) - (select-window (doom-popup-buffer repl-buffer))))) + (pop-to-buffer repl-buffer)))) (when (eq (current-buffer) +eval-repl-buffer) (goto-char (if (and (derived-mode-p 'comint-mode) (cdr comint-last-prompt)) diff --git a/modules/feature/eval/config.el b/modules/feature/eval/config.el index 00b2526ed..227e04d2c 100644 --- a/modules/feature/eval/config.el +++ b/modules/feature/eval/config.el @@ -83,6 +83,7 @@ function that creates and returns the REPL buffer." "Ensures window is scrolled to BOF on invocation." (with-selected-window (get-buffer-window quickrun--buffer-name) (goto-char (point-min)) - (doom-popup-fit-to-buffer))) + (let ((ignore-window-parameters t)) + (shrink-window-if-larger-than-buffer)))) (add-hook 'quickrun-after-run-hook #'+eval|quickrun-scroll-to-bof)) diff --git a/modules/tools/eshell/autoload/eshell.el b/modules/tools/eshell/autoload/eshell.el index 84a8e54b8..b15c4aa76 100644 --- a/modules/tools/eshell/autoload/eshell.el +++ b/modules/tools/eshell/autoload/eshell.el @@ -28,7 +28,7 @@ (let ((buf (get-buffer-create +eshell-buffer-name))) (with-current-buffer buf (unless (eq major-mode 'eshell-mode) (eshell-mode))) - (doom-popup-buffer buf '(:autokill t) t) + (pop-to-buffer buf) (when command (+eshell-run-command command)))) diff --git a/modules/tools/gist/config.el b/modules/tools/gist/config.el index d0864b08f..46473990a 100644 --- a/modules/tools/gist/config.el +++ b/modules/tools/gist/config.el @@ -12,5 +12,5 @@ (defun +gist*list-render (orig-fn &rest args) (funcall orig-fn (car args) t) (unless (cadr args) - (doom-popup-buffer (current-buffer)))) + (pop-to-buffer (current-buffer)))) (advice-add #'gist-list-render :around #'+gist*list-render)) diff --git a/modules/tools/term/autoload.el b/modules/tools/term/autoload.el index efab41c95..25125e906 100644 --- a/modules/tools/term/autoload.el +++ b/modules/tools/term/autoload.el @@ -16,7 +16,7 @@ current project's root." (require 'multi-term) (let ((default-directory (if project-root (doom-project-root) default-directory)) (buffer (multi-term-get-buffer current-prefix-arg))) - (select-window (doom-popup-buffer buffer)) + (pop-to-buffer buffer) (setq multi-term-buffer-list (nconc multi-term-buffer-list (list buffer))) (multi-term-internal)))