From 8227f40d08524c7fcb98ecfeaf3f2279c893217e Mon Sep 17 00:00:00 2001 From: Yiming Chen Date: Wed, 10 Jan 2018 09:59:01 +0800 Subject: [PATCH 1/3] feature/popup: call +popup/close in +popup*evil-command-window-execute - doom/popup-close was renamed to +popup/close --- modules/feature/popup/+hacks.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/feature/popup/+hacks.el b/modules/feature/popup/+hacks.el index 53ba593d8..958a9238d 100644 --- a/modules/feature/popup/+hacks.el +++ b/modules/feature/popup/+hacks.el @@ -79,7 +79,7 @@ the command buffer." (unless (equal evil-command-window-current-buffer (current-buffer)) (user-error "Originating buffer is no longer active")) ;; (kill-buffer "*Command Line*") - (doom/popup-close popup) + (+popup/close popup) (funcall execute-fn result) (setq evil-command-window-current-buffer nil))) From 4c310bfb17905e55b59fb21af298477dd4fd5a80 Mon Sep 17 00:00:00 2001 From: Yiming Chen Date: Wed, 10 Jan 2018 10:09:03 +0800 Subject: [PATCH 2/3] feature/popup: call get-buffer-window for evil-command execute-window - doom-popup-other-window was removed --- modules/feature/popup/+hacks.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/feature/popup/+hacks.el b/modules/feature/popup/+hacks.el index 958a9238d..4696d0b74 100644 --- a/modules/feature/popup/+hacks.el +++ b/modules/feature/popup/+hacks.el @@ -74,9 +74,10 @@ the command buffer." (let ((result (buffer-substring (line-beginning-position) (line-end-position))) (execute-fn evil-command-window-execute-fn) + (execute-window (get-buffer-window evil-command-window-current-buffer)) (popup (selected-window))) - (select-window doom-popup-other-window) - (unless (equal evil-command-window-current-buffer (current-buffer)) + (if execute-window + (select-window execute-window) (user-error "Originating buffer is no longer active")) ;; (kill-buffer "*Command Line*") (+popup/close popup) From ea55fcfd0fb72e401669cee438be8e05227c9f7c Mon Sep 17 00:00:00 2001 From: Yiming Chen Date: Wed, 10 Jan 2018 17:39:12 +0800 Subject: [PATCH 3/3] feature/popup: use delete-window in +popup*evil-command-window-execute - +popup/close will pollute the popup history - see also https://github.com/hlissner/doom-emacs/pull/339#issuecomment-356544535 --- modules/feature/popup/+hacks.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/feature/popup/+hacks.el b/modules/feature/popup/+hacks.el index 4696d0b74..b6e4dde61 100644 --- a/modules/feature/popup/+hacks.el +++ b/modules/feature/popup/+hacks.el @@ -80,7 +80,7 @@ the command buffer." (select-window execute-window) (user-error "Originating buffer is no longer active")) ;; (kill-buffer "*Command Line*") - (+popup/close popup) + (delete-window popup) (funcall execute-fn result) (setq evil-command-window-current-buffer nil)))