Mercurial > vim
view runtime/syntax/grub.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 | 1218c5353e2b |
| children |
line wrap: on
line source
" Vim syntax file " Language: grub(8) configuration file " Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Latest Revision: 2006-04-19 if exists("b:current_syntax") finish endif let s:cpo_save = &cpo set cpo&vim syn keyword grubTodo contained TODO FIXME XXX NOTE syn region grubComment display oneline start='^#' end='$' \ contains=grubTodo,@Spell syn match grubDevice display \ '(\([fh]d\d\|\d\+\|0x\x\+\)\(,\d\+\)\=\(,\l\)\=)' syn match grubBlock display '\(\d\+\)\=+\d\+\(,\(\d\+\)\=+\d\+\)*' syn match grubNumbers display '+\=\<\d\+\|0x\x\+\>' syn match grubBegin display '^' \ nextgroup=@grubCommands,grubComment skipwhite syn cluster grubCommands contains=grubCommand,grubTitleCommand syn keyword grubCommand contained default fallback hiddenmenu timeout syn keyword grubTitleCommand contained title nextgroup=grubTitle skipwhite syn match grubTitle contained display '.*' syn keyword grubCommand contained bootp color device dhcp hide ifconfig \ pager partnew parttype password rarp serial setkey \ terminal tftpserver unhide blocklist boot cat \ chainloader cmp configfile debug displayapm \ displaymem embed find fstest geometry halt help \ impsprobe initrd install ioprobe kernel lock \ makeactive map md5crypt module modulenounzip pause \ quit reboot read root rootnoverify savedefault setup \ testload testvbe uppermem vbeprobe syn keyword grubSpecial saved syn match grubBlink display 'blink-' syn keyword grubBlack black syn keyword grubBlue blue syn keyword grubGreen green syn keyword grubRed red syn keyword grubMagenta magenta syn keyword grubBrown brown yellow syn keyword grubWhite white syn match grubLightGray display 'light-gray' syn match grubLightBlue display 'light-blue' syn match grubLightGreen display 'light-green' syn match grubLightCyan display 'light-cyan' syn match grubLightRed display 'light-red' syn match grubLightMagenta display 'light-magenta' syn match grubDarkGray display 'dark-gray' hi def link grubComment Comment hi def link grubTodo Todo hi def link grubNumbers Number hi def link grubDevice Identifier hi def link grubBlock Identifier hi def link grubCommand Keyword hi def link grubTitleCommand grubCommand hi def link grubTitle String hi def link grubSpecial Special hi def grubBlink cterm=inverse hi def grubBlack ctermfg=Black ctermbg=White guifg=Black guibg=White hi def grubBlue ctermfg=DarkBlue guifg=DarkBlue hi def grubGreen ctermfg=DarkGreen guifg=DarkGreen hi def grubRed ctermfg=DarkRed guifg=DarkRed hi def grubMagenta ctermfg=DarkMagenta guifg=DarkMagenta hi def grubBrown ctermfg=Brown guifg=Brown hi def grubWhite ctermfg=White ctermbg=Black guifg=White guibg=Black hi def grubLightGray ctermfg=LightGray guifg=LightGray hi def grubLightBlue ctermfg=LightBlue guifg=LightBlue hi def grubLightGreen ctermfg=LightGreen guifg=LightGreen hi def grubLightCyan ctermfg=LightCyan guifg=LightCyan hi def grubLightRed ctermfg=LightRed guifg=LightRed hi def grubLightMagenta ctermfg=LightMagenta guifg=LightMagenta hi def grubDarkGray ctermfg=DarkGray guifg=DarkGray let b:current_syntax = "grub" let &cpo = s:cpo_save unlet s:cpo_save