emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/feature/popup/+hacks.el
View file

@ -74,12 +74,13 @@ the command buffer."
(let ((result (buffer-substring (line-beginning-position) (let ((result (buffer-substring (line-beginning-position)
(line-end-position))) (line-end-position)))
(execute-fn evil-command-window-execute-fn) (execute-fn evil-command-window-execute-fn)
(execute-window (get-buffer-window evil-command-window-current-buffer))
(popup (selected-window))) (popup (selected-window)))
(select-window doom-popup-other-window) (if execute-window
(unless (equal evil-command-window-current-buffer (current-buffer)) (select-window execute-window)
(user-error "Originating buffer is no longer active")) (user-error "Originating buffer is no longer active"))
;; (kill-buffer "*Command Line*") ;; (kill-buffer "*Command Line*")
(doom/popup-close popup) (delete-window popup)
(funcall execute-fn result) (funcall execute-fn result)
(setq evil-command-window-current-buffer nil))) (setq evil-command-window-current-buffer nil)))