Handle popups in narf--evil-window-move

This commit is contained in:
Henrik Lissner 2016-04-27 23:21:08 -04:00
parent fa192f1bfd
commit 9bef998b0c

View file

@ -30,9 +30,10 @@ evil-window-move-* (e.g. `evil-window-move-far-left')"
(this-buffer (current-buffer)) (this-buffer (current-buffer))
(that-window (windmove-find-other-window direction nil this-window)) (that-window (windmove-find-other-window direction nil this-window))
(that-buffer (window-buffer that-window))) (that-buffer (window-buffer that-window)))
(when (minibufferp that-buffer) (when (or (minibufferp that-buffer)
(narf/popup-p that-window))
(setq that-buffer nil that-window nil)) (setq that-buffer nil that-window nil))
(if (and (not that-window) (not (one-window-p t))) (if (not (or that-window (one-window-p t)))
(funcall (case direction (funcall (case direction
('left 'evil-window-move-far-left) ('left 'evil-window-move-far-left)
('right 'evil-window-move-far-right) ('right 'evil-window-move-far-right)