diff options
author | Sean Dewar <6256228+seandewar@users.noreply.github.com> | 2024-03-12 21:19:18 +0000 |
---|---|---|
committer | Sean Dewar <6256228+seandewar@users.noreply.github.com> | 2024-03-12 21:38:39 +0000 |
commit | 6bbb02d9ba76551dd4856ad50a237e92c678702d (patch) | |
tree | 2714dd51a7a70e586b0b51d0094a2f86fafa3959 /src/nvim/eval/window.c | |
parent | ca7b603d02ecd1ed4098f487cd01acd470ca6a74 (diff) | |
download | rneovim-6bbb02d9ba76551dd4856ad50a237e92c678702d.tar.gz rneovim-6bbb02d9ba76551dd4856ad50a237e92c678702d.tar.bz2 rneovim-6bbb02d9ba76551dd4856ad50a237e92c678702d.zip |
vim-patch:9.1.0171: Small split-move related improvements
Problem: small improvements can be made to split-move related
functions.
Solution: apply them (Sean Dewar):
Some of these changes were already applied to Nvim.
Here are the ones which were missing:
- Improve some doc comments (frame_flatten should still work for non-current
tabpages, despite the topframe check, which looks benign, though I'm unsure if
it's still needed; see vim/vim#2467).
- f_win_splitmove should check_split_disallowed on wp, not targetwin, as that's
what win_splitmove checks (though it's probably unnecessary to check
b_locked_split at all; see vim/vim#14109, which I hope to get around to
finishing at some point).
- Apply the winframe_restore comment changes, and remove win_comp_pos from after
winframe_restore in win_splitmove, as it shouldn't be necessary (no need to
remove it from nvim_win_set_config too, as it was already omitted).
Move win_append after winframe_restore in win_splitmove to match Vim.
closes: vim/vim#14185
https://github.com/vim/vim/commit/5cac1a9bee0798d70a7fd80363a1f697759638e8
Diffstat (limited to 'src/nvim/eval/window.c')
-rw-r--r-- | src/nvim/eval/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval/window.c b/src/nvim/eval/window.c index 26624c8dd7..3e2f6301ca 100644 --- a/src/nvim/eval/window.c +++ b/src/nvim/eval/window.c @@ -701,8 +701,8 @@ void f_win_splitmove(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) size = (int)tv_dict_get_number(d, "size"); } - // Check if we can split the target before we bother switching windows. - if (is_aucmd_win(wp) || text_or_buf_locked() || check_split_disallowed(targetwin) == FAIL) { + // Check if we're allowed to continue before we bother switching windows. + if (is_aucmd_win(wp) || text_or_buf_locked() || check_split_disallowed(wp) == FAIL) { return; } |