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

Fix split-window & update docstring

Browse source
This commit is contained in:
Henrik Lissner 2019-10-29 18:27:19 -04:00
parent 496a4b1b5f
commit 1d09e4655a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/editor/evil/autoload/advice.el
View file

@ -151,13 +151,18 @@ more information on modifiers."
;;;###autoload (autoload '+evil-window-split-a "editor/evil/autoload/advice" nil t) ;;;###autoload (autoload '+evil-window-split-a "editor/evil/autoload/advice" nil t)
(evil-define-command +evil-window-split-a (&optional count file) (evil-define-command +evil-window-split-a (&optional count file)
"Same as `evil-window-split', but focuses (and recenters) the new split." "Same as `evil-window-split', but correctly updates the window history."
:repeat nil :repeat nil
(interactive "P<f>") (interactive "P<f>")
(let ((win (selected-window))) ;; HACK This ping-ponging between the destination and source windows is to
(split-window (selected-window) count ;; update the window focus history, so that, if you close either split
(if evil-split-window-below 'above 'below)) ;; afterwards you won't be sent to some random window.
(select-window win)) (let* ((doom-inhibit-switch-window-hooks t)
(origwin (selected-window))
(win (select-window (split-window origwin count 'below))))
(unless evil-split-window-below
(select-window origwin))
(run-hooks 'doom-switch-window-hook))
(recenter) (recenter)
(when (and (not count) evil-auto-balance-windows) (when (and (not count) evil-auto-balance-windows)
(balance-windows (window-parent))) (balance-windows (window-parent)))
@ -165,13 +170,19 @@ more information on modifiers."
;;;###autoload (autoload '+evil-window-vsplit-a "editor/evil/autoload/advice" nil t) ;;;###autoload (autoload '+evil-window-vsplit-a "editor/evil/autoload/advice" nil t)
(evil-define-command +evil-window-vsplit-a (&optional count file) (evil-define-command +evil-window-vsplit-a (&optional count file)
"Same as `evil-window-vsplit', but focuses (and recenters) the new split." "Same as `evil-window-split', but correctly updates the window history."
:repeat nil :repeat nil
(interactive "P<f>") (interactive "P<f>")
(let ((win (selected-window))) ;; HACK This ping-ponging between the destination and source windows is to
(split-window (selected-window) count ;; update the window focus history, so that, if you close either split
(if evil-vsplit-window-right 'left 'right)) ;; afterwards you won't be sent to some random window.
(select-window win)) (let* ((doom-inhibit-switch-window-hooks t)
(origwin (selected-window))
(win (select-window (split-window origwin count 'right))))
(unless evil-vsplit-window-right
(select-window origwin))
(run-hooks 'doom-switch-window-hook))
(run-hooks)
(recenter) (recenter)
(when (and (not count) evil-auto-balance-windows) (when (and (not count) evil-auto-balance-windows)
(balance-windows (window-parent))) (balance-windows (window-parent)))