Mercurial > vim
view runtime/macmap.vim @ 34536:ad6cd802579d v9.1.0170
patch 9.1.0170: Re-allow curwin == prevwin, but document it instead
Commit: https://github.com/vim/vim/commit/d64801e913314d2e19dbb38f60e6d285238debff
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Mar 12 20:46:12 2024 +0100
patch 9.1.0170: Re-allow curwin == prevwin, but document it instead
Problem: more places exist where curwin == prevwin, and it may even be
expected in some cases.
Solution: revert v9.1.0001, but document that it's possible instead.
(Sean Dewar)
I've had a change of heart for the following reasons:
- A quick 'n dirty [GitHub code
search](https://github.com/search?q=%2F%28winnr%5C%28%5C%29%5Cs*%3D%3D%5Cs*winnr%5C%28%5B%27%22%5D%23%5B%27%22%5D%5C%29%7Cwinnr%5C%28%5B%27%22%5D%23%5B%27%22%5D%5C%29%5Cs*%3D%3D%5Cs*winnr%5C%28%5C%29%29%2F&type=code)
reveals some cases where it's expected in the wild.
Particularly, it made me aware `winnr() == winnr('#')` is possible when curwin
is changed temporarily during the evaluation of a &statusline expression item
(`%{...}`), and is used to show something different on the statusline
belonging to the previous window; that behaviour wasn't changed in v9.1.0001,
but it means curwin == prevwin makes sense in some cases.
- The definition and call sites of back_to_prevwin imply some expectation that
prevwin == wp (== curwin) is possible, as it's used to skip entering the
prevwin in that case.
- Prior to v9.1.0001, `:wincmd p` would not beep in the case that was patched in
v9.1.0001, but now does. That resulted in #14047 being opened, as it affected
the CtrlP plugin.
I find it odd that `:wincmd p` had cases where it wouldn't beep despite doing
nothing, but it may be preferable to keep things that way (or instead also
beep if curwin == prevwin, if that's preferred).
- After more digging, I found cases in win_free_mem, enter_tabpage,
aucmd_restbuf and qf_open_new_cwindow where curwin == prevwin is possible
(many of them from autocommands). Others probably exist too, especially in
places where curwin is changed temporarily.
fixes: #14047
closes: #14186
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:00:11 +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>