Merge pull request #339 from dsdshcym/fix-popup-evil-command-window-execute

Fix popup evil command window execute
This commit is contained in:
Henrik Lissner 2018-01-10 22:08:05 -05:00 committed by GitHub
commit 44f8b579ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -74,12 +74,13 @@ 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*")
(doom/popup-close popup)
(delete-window popup)
(funcall execute-fn result)
(setq evil-command-window-current-buffer nil)))