Mercurial > vim
view runtime/macmap.vim @ 34538:c865c2f93a04 v9.1.0171
patch 9.1.0171: Small split-move related improvements
Commit: https://github.com/vim/vim/commit/5cac1a9bee0798d70a7fd80363a1f697759638e8
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Mar 12 21:11:39 2024 +0100
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):
- 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 #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 #14109, which I hope to get around to finishing at
some point).
- Make winframe_restore restore window positions for the altframe, which
winframe_remove changes. This doesn't affect the prior behaviour, as we called
win_comp_pos after, but as win_comp_pos only works for curtab, and
winframe_remove supports non-current tabpages, we should undo it. Regardless,
this should mean we don't need win_comp_pos anymore; adjust tests to check
that window positions remain unchanged.
I'm not sure win_comp_pos is needed after last_status anyway if it doesn't
steal rows from another frame to make room for a new statusline, which
shouldn't be the case after winframe_remove? To be safe, I'll leave it as is.
closes: #14185
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 12 Mar 2024 21:15:03 +0100 |
| parents | 99305c4c42d4 |
| children |
line wrap: on
line source
" System gvimrc file for Mac OS X " Author: Benji Fisher <benji@member.AMS.org> " Last Change: Thu Mar 09 09:00 AM 2006 EST " " Define Mac-standard keyboard shortcuts. " We don't change 'cpoptions' here, because it would not be set properly when " a .vimrc file is found later. Thus don't use line continuation and use " <special> in mappings. nnoremap <special> <D-n> :confirm enew<CR> vmap <special> <D-n> <Esc><D-n>gv imap <special> <D-n> <C-O><D-n> cmap <special> <D-n> <C-C><D-n> omap <special> <D-n> <Esc><D-n> nnoremap <special> <D-o> :browse confirm e<CR> vmap <special> <D-o> <Esc><D-o>gv imap <special> <D-o> <C-O><D-o> cmap <special> <D-o> <C-C><D-o> omap <special> <D-o> <Esc><D-o> nnoremap <silent> <special> <D-w> :if winheight(2) < 0 <Bar> confirm enew <Bar> else <Bar> confirm close <Bar> endif<CR> vmap <special> <D-w> <Esc><D-w>gv imap <special> <D-w> <C-O><D-w> cmap <special> <D-w> <C-C><D-w> omap <special> <D-w> <Esc><D-w> nnoremap <silent> <special> <D-s> :if expand("%") == ""<Bar>browse confirm w<Bar> else<Bar>confirm w<Bar>endif<CR> vmap <special> <D-s> <Esc><D-s>gv imap <special> <D-s> <C-O><D-s> cmap <special> <D-s> <C-C><D-s> omap <special> <D-s> <Esc><D-s> nnoremap <special> <D-S-s> :browse confirm saveas<CR> vmap <special> <D-S-s> <Esc><D-s>gv imap <special> <D-S-s> <C-O><D-s> cmap <special> <D-S-s> <C-C><D-s> omap <special> <D-S-s> <Esc><D-s> " From the Edit menu of SimpleText: nnoremap <special> <D-z> u vmap <special> <D-z> <Esc><D-z>gv imap <special> <D-z> <C-O><D-z> cmap <special> <D-z> <C-C><D-z> omap <special> <D-z> <Esc><D-z> vnoremap <special> <D-x> "+x vnoremap <special> <D-c> "+y cnoremap <special> <D-c> <C-Y> nnoremap <special> <D-v> "+gP cnoremap <special> <D-v> <C-R>+ execute 'vnoremap <script> <special> <D-v>' paste#paste_cmd['v'] execute 'inoremap <script> <special> <D-v>' paste#paste_cmd['i'] nnoremap <silent> <special> <D-a> :if &slm != ""<Bar>exe ":norm gggH<C-O>G"<Bar> else<Bar>exe ":norm ggVG"<Bar>endif<CR> vmap <special> <D-a> <Esc><D-a> imap <special> <D-a> <Esc><D-a> cmap <special> <D-a> <C-C><D-a> omap <special> <D-a> <Esc><D-a> nnoremap <special> <D-f> / vmap <special> <D-f> <Esc><D-f> imap <special> <D-f> <Esc><D-f> cmap <special> <D-f> <C-C><D-f> omap <special> <D-f> <Esc><D-f> nnoremap <special> <D-g> n vmap <special> <D-g> <Esc><D-g> imap <special> <D-g> <C-O><D-g> cmap <special> <D-g> <C-C><D-g> omap <special> <D-g> <Esc><D-g>