commit 28c294363f37d013af69e2779d734c132037f73f
parent 77162a717aaebcdf5b8f34acffcf83b9a53339d1
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 1 Feb 2026 08:51:31 +0800
Merge pull request #37646 from zeertzjq/vim-c99aaf4
vim-patch: runtime file updates
Diffstat:
11 files changed, 282 insertions(+), 92 deletions(-)
diff --git a/runtime/colors/catppuccin.vim b/runtime/colors/catppuccin.vim
@@ -3,7 +3,7 @@
" Author: The Catppuccin Community <catppuccin.com>
" Maintainer: Mao-Yining <mao.yining@outlook.com>
" URL: https://www.github.com/vim/colorschemes
-" Last Change: 2026 Jan 23
+" Last Change: 2026 Jan 31
" Generated by Colortemplate v3.0.0-beta10
@@ -46,7 +46,7 @@ if &background == 'dark'
hi Conceal guifg=#7f849c guibg=NONE guisp=NONE gui=NONE ctermfg=102 ctermbg=NONE cterm=NONE term=NONE
hi Conditional guifg=#cba6f7 guibg=NONE guisp=NONE gui=NONE ctermfg=183 ctermbg=NONE cterm=NONE term=NONE
hi Constant guifg=#fab387 guibg=NONE guisp=NONE gui=NONE ctermfg=216 ctermbg=NONE cterm=NONE term=NONE
- hi CurSearch guifg=NONE guibg=#89556b guisp=NONE gui=NONE ctermfg=126 ctermbg=189 cterm=reverse term=reverse
+ hi CurSearch guifg=#cdd6f4 guibg=#89556b guisp=NONE gui=NONE ctermfg=189 ctermbg=126 cterm=NONE term=reverse
hi Cursor guifg=#1e1e2e guibg=#f5e0dc guisp=NONE gui=NONE ctermfg=233 ctermbg=224 cterm=NONE term=reverse
hi CursorColumn guifg=NONE guibg=#181825 guisp=NONE gui=NONE ctermfg=NONE ctermbg=232 cterm=NONE term=NONE
hi CursorIM guifg=#1e1e2e guibg=#cba6f7 guisp=NONE gui=NONE ctermfg=233 ctermbg=183 cterm=NONE term=NONE
@@ -121,13 +121,41 @@ if &background == 'dark'
hi VisualNOS guifg=NONE guibg=#45475a guisp=NONE gui=bold ctermfg=NONE ctermbg=240 cterm=bold term=NONE
hi WarningMsg guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=standout
hi WildMenu guifg=NONE guibg=#6c7086 guisp=NONE gui=NONE ctermfg=NONE ctermbg=59 cterm=NONE term=bold
+ hi csvCol0 guifg=#f38ba8 guibg=NONE guisp=NONE gui=NONE ctermfg=211 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol1 guifg=#fab387 guibg=NONE guisp=NONE gui=NONE ctermfg=216 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol2 guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol3 guifg=#a6e3a1 guibg=NONE guisp=NONE gui=NONE ctermfg=114 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol4 guifg=#89dceb guibg=NONE guisp=NONE gui=NONE ctermfg=116 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol5 guifg=#89b4fa guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol6 guifg=#b4befe guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol7 guifg=#cba6f7 guibg=NONE guisp=NONE gui=NONE ctermfg=183 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol8 guifg=#f5c2e7 guibg=NONE guisp=NONE gui=NONE ctermfg=225 ctermbg=NONE cterm=NONE term=NONE
hi debugBreakpoint guifg=#6c7086 guibg=#1e1e2e guisp=NONE gui=NONE ctermfg=59 ctermbg=233 cterm=NONE term=NONE
hi debugPC guifg=NONE guibg=#11111b guisp=NONE gui=NONE ctermfg=NONE ctermbg=16 cterm=NONE term=NONE
+ hi diffAdded guifg=#a6e3a1 guibg=NONE guisp=NONE gui=NONE ctermfg=114 ctermbg=NONE cterm=NONE term=NONE
+ hi diffChanged guifg=#89b4fa guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=NONE
+ hi diffFile guifg=#89b4fa guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=NONE
+ hi diffIndexLine guifg=#94e2d5 guibg=NONE guisp=NONE gui=NONE ctermfg=158 ctermbg=NONE cterm=NONE term=NONE
+ hi diffLine guifg=#6c7086 guibg=NONE guisp=NONE gui=NONE ctermfg=59 ctermbg=NONE cterm=NONE term=NONE
+ hi diffNewFile guifg=#fab387 guibg=NONE guisp=NONE gui=NONE ctermfg=216 ctermbg=NONE cterm=NONE term=NONE
+ hi diffOldFile guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
+ hi diffRemoved guifg=#f38ba8 guibg=NONE guisp=NONE gui=NONE ctermfg=211 ctermbg=NONE cterm=NONE term=NONE
hi lCursor guifg=#1e1e2e guibg=#f38ba8 guisp=NONE gui=NONE ctermfg=233 ctermbg=211 cterm=NONE term=NONE
+ hi markdownCode guifg=#f2cdcd guibg=NONE guisp=NONE gui=NONE ctermfg=181 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownCodeBlock guifg=#f2cdcd guibg=NONE guisp=NONE gui=NONE ctermfg=181 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH1 guifg=#f38ba8 guibg=NONE guisp=NONE gui=NONE ctermfg=211 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH2 guifg=#fab387 guibg=NONE guisp=NONE gui=NONE ctermfg=216 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH3 guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH4 guifg=#a6e3a1 guibg=NONE guisp=NONE gui=NONE ctermfg=114 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH5 guifg=#74c7ec guibg=NONE guisp=NONE gui=NONE ctermfg=117 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH6 guifg=#b4befe guibg=NONE guisp=NONE gui=NONE ctermfg=147 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownHeadingDelimiter guifg=#fab387 guibg=NONE guisp=NONE gui=bold ctermfg=216 ctermbg=NONE cterm=bold term=bold
+ hi markdownLinkText guifg=#89b4fa guibg=NONE guisp=NONE gui=underline ctermfg=111 ctermbg=NONE cterm=underline term=underline
+ hi qfFileName guifg=#89b4fa guibg=NONE guisp=NONE gui=NONE ctermfg=111 ctermbg=NONE cterm=NONE term=NONE
+ hi qfLineNr guifg=#f9e2af guibg=NONE guisp=NONE gui=NONE ctermfg=222 ctermbg=NONE cterm=NONE term=NONE
if s:tgc || s:t_Co >= 256
if s:tgc
- hi CurSearch cterm=NONE
hi QuickFixLine cterm=NONE
hi Visual cterm=NONE
endif
@@ -145,7 +173,7 @@ if &background == 'dark'
hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
hi Conditional ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
hi Constant ctermfg=DarkYellow ctermbg=NONE cterm=NONE
- hi CurSearch ctermfg=Red ctermbg=White cterm=reverse
+ hi CurSearch ctermfg=White ctermbg=Red cterm=NONE
hi Cursor ctermfg=Black ctermbg=Yellow cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=DarkGrey cterm=NONE
hi CursorIM ctermfg=Black ctermbg=DarkMagenta cterm=NONE
@@ -205,7 +233,7 @@ if &background == 'dark'
hi Structure ctermfg=Yellow ctermbg=NONE cterm=NONE
hi TabLine ctermfg=Grey ctermbg=Black cterm=NONE
hi TabLineFill ctermfg=NONE ctermbg=DarkGrey cterm=NONE
- hi TabLineSel ctermfg=White ctermbg=DarkGrey cterm=bold
+ hi TabLineSel ctermfg=White ctermbg=Black cterm=NONE
hi Tag ctermfg=LightGrey ctermbg=NONE cterm=bold
hi Title ctermfg=Blue ctermbg=NONE cterm=bold
hi TitleBar ctermfg=White ctermbg=DarkGrey cterm=NONE
@@ -220,9 +248,38 @@ if &background == 'dark'
hi VisualNOS ctermfg=NONE ctermbg=Black cterm=bold
hi WarningMsg ctermfg=Yellow ctermbg=NONE cterm=NONE
hi WildMenu ctermfg=NONE ctermbg=Grey cterm=NONE
+ hi csvCol0 ctermfg=Red ctermbg=NONE cterm=NONE
+ hi csvCol1 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi csvCol2 ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi csvCol3 ctermfg=Green ctermbg=NONE cterm=NONE
+ hi csvCol4 ctermfg=Cyan ctermbg=NONE cterm=NONE
+ hi csvCol5 ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi csvCol6 ctermfg=LightGrey ctermbg=NONE cterm=NONE
+ hi csvCol7 ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
+ hi csvCol8 ctermfg=Magenta ctermbg=NONE cterm=NONE
hi debugBreakpoint ctermfg=Grey ctermbg=Black cterm=NONE
hi debugPC ctermfg=NONE ctermbg=Black cterm=NONE
+ hi diffAdded ctermfg=Green ctermbg=NONE cterm=NONE
+ hi diffChanged ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi diffFile ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi diffIndexLine ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+ hi diffLine ctermfg=Grey ctermbg=NONE cterm=NONE
+ hi diffNewFile ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi diffOldFile ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi diffRemoved ctermfg=Red ctermbg=NONE cterm=NONE
hi lCursor ctermfg=Black ctermbg=Red cterm=NONE
+ hi markdownCode ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi markdownCodeBlock ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi markdownH1 ctermfg=Red ctermbg=NONE cterm=NONE
+ hi markdownH2 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi markdownH3 ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi markdownH4 ctermfg=Green ctermbg=NONE cterm=NONE
+ hi markdownH5 ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+ hi markdownH6 ctermfg=LightGrey ctermbg=NONE cterm=NONE
+ hi markdownHeadingDelimiter ctermfg=DarkYellow ctermbg=NONE cterm=bold
+ hi markdownLinkText ctermfg=Blue ctermbg=NONE cterm=underline
+ hi qfFileName ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi qfLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
finish
endif
@@ -237,7 +294,7 @@ if &background == 'dark'
hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
hi Conditional ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
hi Constant ctermfg=DarkYellow ctermbg=NONE cterm=NONE
- hi CurSearch ctermfg=Red ctermbg=White cterm=reverse
+ hi CurSearch ctermfg=White ctermbg=Red cterm=NONE
hi Cursor ctermfg=Black ctermbg=Yellow cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=DarkGrey cterm=NONE
hi CursorIM ctermfg=Black ctermbg=DarkMagenta cterm=NONE
@@ -312,9 +369,38 @@ if &background == 'dark'
hi VisualNOS ctermfg=NONE ctermbg=Black cterm=bold
hi WarningMsg ctermfg=Yellow ctermbg=NONE cterm=NONE
hi WildMenu ctermfg=NONE ctermbg=Grey cterm=NONE
+ hi csvCol0 ctermfg=Red ctermbg=NONE cterm=NONE
+ hi csvCol1 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi csvCol2 ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi csvCol3 ctermfg=Green ctermbg=NONE cterm=NONE
+ hi csvCol4 ctermfg=Cyan ctermbg=NONE cterm=NONE
+ hi csvCol5 ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi csvCol6 ctermfg=LightGrey ctermbg=NONE cterm=NONE
+ hi csvCol7 ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
+ hi csvCol8 ctermfg=Magenta ctermbg=NONE cterm=NONE
hi debugBreakpoint ctermfg=Grey ctermbg=Black cterm=NONE
hi debugPC ctermfg=NONE ctermbg=Black cterm=NONE
+ hi diffAdded ctermfg=Green ctermbg=NONE cterm=NONE
+ hi diffChanged ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi diffFile ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi diffIndexLine ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+ hi diffLine ctermfg=Grey ctermbg=NONE cterm=NONE
+ hi diffNewFile ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi diffOldFile ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi diffRemoved ctermfg=Red ctermbg=NONE cterm=NONE
hi lCursor ctermfg=Black ctermbg=Red cterm=NONE
+ hi markdownCode ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi markdownCodeBlock ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi markdownH1 ctermfg=Red ctermbg=NONE cterm=NONE
+ hi markdownH2 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi markdownH3 ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi markdownH4 ctermfg=Green ctermbg=NONE cterm=NONE
+ hi markdownH5 ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+ hi markdownH6 ctermfg=LightGrey ctermbg=NONE cterm=NONE
+ hi markdownHeadingDelimiter ctermfg=DarkYellow ctermbg=NONE cterm=bold
+ hi markdownLinkText ctermfg=Blue ctermbg=NONE cterm=underline
+ hi qfFileName ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi qfLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
finish
endif
@@ -346,7 +432,7 @@ if &background == 'light'
hi Conceal guifg=#8c8fa1 guibg=NONE guisp=NONE gui=NONE ctermfg=246 ctermbg=NONE cterm=NONE term=NONE
hi Conditional guifg=#8839ef guibg=NONE guisp=NONE gui=NONE ctermfg=93 ctermbg=NONE cterm=NONE term=NONE
hi Constant guifg=#fe640b guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE
- hi CurSearch guifg=NONE guibg=#fc8fc3 guisp=NONE gui=NONE ctermfg=211 ctermbg=236 cterm=reverse term=reverse
+ hi CurSearch guifg=#4c4f69 guibg=#fc8fc3 guisp=NONE gui=NONE ctermfg=236 ctermbg=211 cterm=NONE term=reverse
hi Cursor guifg=#eff1f5 guibg=#dc8a78 guisp=NONE gui=NONE ctermfg=231 ctermbg=174 cterm=NONE term=reverse
hi CursorColumn guifg=NONE guibg=#e6e9ef guisp=NONE gui=NONE ctermfg=NONE ctermbg=255 cterm=NONE term=NONE
hi CursorIM guifg=#eff1f5 guibg=#8839ef guisp=NONE gui=NONE ctermfg=231 ctermbg=93 cterm=NONE term=NONE
@@ -421,13 +507,41 @@ if &background == 'light'
hi VisualNOS guifg=NONE guibg=#bcc0cc guisp=NONE gui=bold ctermfg=NONE ctermbg=250 cterm=bold term=NONE
hi WarningMsg guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=standout
hi WildMenu guifg=NONE guibg=#9ca0b0 guisp=NONE gui=NONE ctermfg=NONE ctermbg=247 cterm=NONE term=bold
+ hi csvCol0 guifg=#d20f39 guibg=NONE guisp=NONE gui=NONE ctermfg=161 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol1 guifg=#fe640b guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol2 guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol3 guifg=#40a02b guibg=NONE guisp=NONE gui=NONE ctermfg=34 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol4 guifg=#04a5e5 guibg=NONE guisp=NONE gui=NONE ctermfg=39 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol5 guifg=#1e66f5 guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol6 guifg=#7287fd guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol7 guifg=#8839ef guibg=NONE guisp=NONE gui=NONE ctermfg=93 ctermbg=NONE cterm=NONE term=NONE
+ hi csvCol8 guifg=#ea76cb guibg=NONE guisp=NONE gui=NONE ctermfg=206 ctermbg=NONE cterm=NONE term=NONE
hi debugBreakpoint guifg=#9ca0b0 guibg=#eff1f5 guisp=NONE gui=NONE ctermfg=247 ctermbg=231 cterm=NONE term=NONE
hi debugPC guifg=NONE guibg=#dce0e8 guisp=NONE gui=NONE ctermfg=NONE ctermbg=254 cterm=NONE term=NONE
+ hi diffAdded guifg=#40a02b guibg=NONE guisp=NONE gui=NONE ctermfg=34 ctermbg=NONE cterm=NONE term=NONE
+ hi diffChanged guifg=#1e66f5 guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+ hi diffFile guifg=#1e66f5 guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+ hi diffIndexLine guifg=#179299 guibg=NONE guisp=NONE gui=NONE ctermfg=30 ctermbg=NONE cterm=NONE term=NONE
+ hi diffLine guifg=#9ca0b0 guibg=NONE guisp=NONE gui=NONE ctermfg=247 ctermbg=NONE cterm=NONE term=NONE
+ hi diffNewFile guifg=#fe640b guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE
+ hi diffOldFile guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE
+ hi diffRemoved guifg=#d20f39 guibg=NONE guisp=NONE gui=NONE ctermfg=161 ctermbg=NONE cterm=NONE term=NONE
hi lCursor guifg=#eff1f5 guibg=#d20f39 guisp=NONE gui=NONE ctermfg=231 ctermbg=161 cterm=NONE term=NONE
+ hi markdownCode guifg=#dd7878 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownCodeBlock guifg=#dd7878 guibg=NONE guisp=NONE gui=NONE ctermfg=167 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH1 guifg=#d20f39 guibg=NONE guisp=NONE gui=NONE ctermfg=161 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH2 guifg=#fe640b guibg=NONE guisp=NONE gui=NONE ctermfg=202 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH3 guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH4 guifg=#40a02b guibg=NONE guisp=NONE gui=NONE ctermfg=34 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH5 guifg=#209fb5 guibg=NONE guisp=NONE gui=NONE ctermfg=38 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownH6 guifg=#7287fd guibg=NONE guisp=NONE gui=NONE ctermfg=69 ctermbg=NONE cterm=NONE term=NONE
+ hi markdownHeadingDelimiter guifg=#fe640b guibg=NONE guisp=NONE gui=bold ctermfg=202 ctermbg=NONE cterm=bold term=bold
+ hi markdownLinkText guifg=#1e66f5 guibg=NONE guisp=NONE gui=underline ctermfg=27 ctermbg=NONE cterm=underline term=underline
+ hi qfFileName guifg=#1e66f5 guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
+ hi qfLineNr guifg=#df8e1d guibg=NONE guisp=NONE gui=NONE ctermfg=172 ctermbg=NONE cterm=NONE term=NONE
if s:tgc || s:t_Co >= 256
if s:tgc
- hi CurSearch cterm=NONE
hi QuickFixLine cterm=NONE
hi Visual cterm=NONE
endif
@@ -445,7 +559,7 @@ if &background == 'light'
hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
hi Conditional ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
hi Constant ctermfg=DarkYellow ctermbg=NONE cterm=NONE
- hi CurSearch ctermfg=Red ctermbg=Black cterm=reverse
+ hi CurSearch ctermfg=Black ctermbg=Red cterm=NONE
hi Cursor ctermfg=White ctermbg=Red cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=Grey cterm=NONE
hi CursorIM ctermfg=White ctermbg=DarkMagenta cterm=NONE
@@ -505,7 +619,7 @@ if &background == 'light'
hi Structure ctermfg=Yellow ctermbg=NONE cterm=NONE
hi TabLine ctermfg=DarkGrey ctermbg=Grey cterm=NONE
hi TabLineFill ctermfg=NONE ctermbg=Grey cterm=NONE
- hi TabLineSel ctermfg=Black ctermbg=Grey cterm=bold
+ hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE
hi Tag ctermfg=DarkBlue ctermbg=NONE cterm=bold
hi Title ctermfg=Blue ctermbg=NONE cterm=bold
hi TitleBar ctermfg=Black ctermbg=Grey cterm=NONE
@@ -520,9 +634,38 @@ if &background == 'light'
hi VisualNOS ctermfg=NONE ctermbg=White cterm=bold
hi WarningMsg ctermfg=Yellow ctermbg=NONE cterm=NONE
hi WildMenu ctermfg=NONE ctermbg=DarkGrey cterm=NONE
+ hi csvCol0 ctermfg=Red ctermbg=NONE cterm=NONE
+ hi csvCol1 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi csvCol2 ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi csvCol3 ctermfg=Green ctermbg=NONE cterm=NONE
+ hi csvCol4 ctermfg=Cyan ctermbg=NONE cterm=NONE
+ hi csvCol5 ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi csvCol6 ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+ hi csvCol7 ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
+ hi csvCol8 ctermfg=Magenta ctermbg=NONE cterm=NONE
hi debugBreakpoint ctermfg=DarkGrey ctermbg=White cterm=NONE
hi debugPC ctermfg=NONE ctermbg=Grey cterm=NONE
+ hi diffAdded ctermfg=Green ctermbg=NONE cterm=NONE
+ hi diffChanged ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi diffFile ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi diffIndexLine ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+ hi diffLine ctermfg=DarkGrey ctermbg=NONE cterm=NONE
+ hi diffNewFile ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi diffOldFile ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi diffRemoved ctermfg=Red ctermbg=NONE cterm=NONE
hi lCursor ctermfg=White ctermbg=Red cterm=NONE
+ hi markdownCode ctermfg=DarkRed ctermbg=NONE cterm=NONE
+ hi markdownCodeBlock ctermfg=DarkRed ctermbg=NONE cterm=NONE
+ hi markdownH1 ctermfg=Red ctermbg=NONE cterm=NONE
+ hi markdownH2 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi markdownH3 ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi markdownH4 ctermfg=Green ctermbg=NONE cterm=NONE
+ hi markdownH5 ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+ hi markdownH6 ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+ hi markdownHeadingDelimiter ctermfg=DarkYellow ctermbg=NONE cterm=bold
+ hi markdownLinkText ctermfg=Blue ctermbg=NONE cterm=underline
+ hi qfFileName ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi qfLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
finish
endif
@@ -537,7 +680,7 @@ if &background == 'light'
hi Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
hi Conditional ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
hi Constant ctermfg=DarkYellow ctermbg=NONE cterm=NONE
- hi CurSearch ctermfg=Red ctermbg=Black cterm=reverse
+ hi CurSearch ctermfg=Black ctermbg=Red cterm=NONE
hi Cursor ctermfg=White ctermbg=Red cterm=NONE
hi CursorColumn ctermfg=NONE ctermbg=Grey cterm=NONE
hi CursorIM ctermfg=White ctermbg=DarkMagenta cterm=NONE
@@ -612,9 +755,38 @@ if &background == 'light'
hi VisualNOS ctermfg=NONE ctermbg=White cterm=bold
hi WarningMsg ctermfg=Yellow ctermbg=NONE cterm=NONE
hi WildMenu ctermfg=NONE ctermbg=DarkGrey cterm=NONE
+ hi csvCol0 ctermfg=Red ctermbg=NONE cterm=NONE
+ hi csvCol1 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi csvCol2 ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi csvCol3 ctermfg=Green ctermbg=NONE cterm=NONE
+ hi csvCol4 ctermfg=Cyan ctermbg=NONE cterm=NONE
+ hi csvCol5 ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi csvCol6 ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+ hi csvCol7 ctermfg=DarkMagenta ctermbg=NONE cterm=NONE
+ hi csvCol8 ctermfg=Magenta ctermbg=NONE cterm=NONE
hi debugBreakpoint ctermfg=DarkGrey ctermbg=White cterm=NONE
hi debugPC ctermfg=NONE ctermbg=Grey cterm=NONE
+ hi diffAdded ctermfg=Green ctermbg=NONE cterm=NONE
+ hi diffChanged ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi diffFile ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi diffIndexLine ctermfg=DarkGreen ctermbg=NONE cterm=NONE
+ hi diffLine ctermfg=DarkGrey ctermbg=NONE cterm=NONE
+ hi diffNewFile ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi diffOldFile ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi diffRemoved ctermfg=Red ctermbg=NONE cterm=NONE
hi lCursor ctermfg=White ctermbg=Red cterm=NONE
+ hi markdownCode ctermfg=DarkRed ctermbg=NONE cterm=NONE
+ hi markdownCodeBlock ctermfg=DarkRed ctermbg=NONE cterm=NONE
+ hi markdownH1 ctermfg=Red ctermbg=NONE cterm=NONE
+ hi markdownH2 ctermfg=DarkYellow ctermbg=NONE cterm=NONE
+ hi markdownH3 ctermfg=Yellow ctermbg=NONE cterm=NONE
+ hi markdownH4 ctermfg=Green ctermbg=NONE cterm=NONE
+ hi markdownH5 ctermfg=DarkCyan ctermbg=NONE cterm=NONE
+ hi markdownH6 ctermfg=DarkBlue ctermbg=NONE cterm=NONE
+ hi markdownHeadingDelimiter ctermfg=DarkYellow ctermbg=NONE cterm=bold
+ hi markdownLinkText ctermfg=Blue ctermbg=NONE cterm=underline
+ hi qfFileName ctermfg=Blue ctermbg=NONE cterm=NONE
+ hi qfLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
finish
endif
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -817,8 +817,9 @@ A jump table for the options with a short description can be found at |Q_op|.
*'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'*
'autowriteall' 'awa' boolean (default off)
global
- Like 'autowrite', but also used for commands ":edit", ":enew", ":quit",
- ":qall", ":exit", ":xit", ":recover" and closing the Vim window.
+ Like 'autowrite', but also used for commands ":edit", ":enew",
+ ":quit", ":qall", ":exit", ":xit", ":recover" and closing the Vim
+ window.
Setting this option also implies that Vim behaves like 'autowrite' has
been set.
@@ -1836,8 +1837,9 @@ A jump table for the options with a short description can be found at |Q_op|.
This makes "y0" fail in the first column.
*cpo-f*
f When included, a ":read" command with a file name
- argument will set the file name for the current buffer,
- if the current buffer doesn't have a file name yet.
+ argument will set the file name for the current
+ buffer, if the current buffer doesn't have a file name
+ yet.
*cpo-F*
F When included, a ":write" command with a file name
argument will set the file name for the current
@@ -2219,8 +2221,8 @@ A jump table for the options with a short description can be found at |Q_op|.
hiddenoff Do not use diff mode for a buffer when it
becomes hidden.
- iblank Ignore changes where lines are all blank. Adds
- the "-B" flag to the "diff" command if
+ iblank Ignore changes where lines are all blank.
+ Adds the "-B" flag to the "diff" command if
'diffexpr' is empty. Check the documentation
of the "diff" command for what this does
exactly.
@@ -2746,9 +2748,9 @@ A jump table for the options with a short description can be found at |Q_op|.
edit a file, a check is done for the <EOL>:
1. If all lines end in <CR><NL>, and 'fileformats' includes "dos",
'fileformat' is set to "dos".
- 2. If a <NL> is found and 'fileformats' includes "unix", 'fileformat'
- is set to "unix". Note that when a <NL> is found without a
- preceding <CR>, "unix" is preferred over "dos".
+ 2. If a <NL> is found and 'fileformats' includes "unix",
+ 'fileformat' is set to "unix". Note that when a <NL> is found
+ without a preceding <CR>, "unix" is preferred over "dos".
3. If 'fileformat' has not yet been set, and if a <CR> is found, and
if 'fileformats' includes "mac", 'fileformat' is set to "mac".
This means that "mac" is only chosen when:
@@ -4221,8 +4223,8 @@ A jump table for the options with a short description can be found at |Q_op|.
*'makeencoding'* *'menc'*
'makeencoding' 'menc' string (default "")
global or local to buffer |global-local|
- Encoding used for reading the output of external commands. When empty,
- encoding is not converted.
+ Encoding used for reading the output of external commands. When
+ empty, encoding is not converted.
This is used for `:make`, `:lmake`, `:grep`, `:lgrep`, `:grepadd`,
`:lgrepadd`, `:cfile`, `:cgetfile`, `:caddfile`, `:lfile`, `:lgetfile`,
and `:laddfile`.
@@ -6404,9 +6406,10 @@ A jump table for the options with a short description can be found at |Q_op|.
highlighting is used, also for the statusline of non-current
windows.
* - Set highlight group to User{N}, where {N} is taken from the
- minwid field, e.g. %1*. Restore normal highlight with %* or %0*.
- The difference between User{N} and StatusLine will be applied to
- StatusLineNC for the statusline of non-current windows.
+ minwid field, e.g. %1*. Restore normal highlight with %* or
+ %0*. The difference between User{N} and StatusLine will be
+ applied to StatusLineNC for the statusline of non-current
+ windows.
The number N must be between 1 and 9. See |hl-User1..9|
When displaying a flag, Vim removes the leading comma, if any, when
@@ -6991,9 +6994,9 @@ A jump table for the options with a short description can be found at |Q_op|.
global or local to buffer |global-local|
Maximum number of changes that can be undone. Since undo information
is kept in memory, higher numbers will cause more memory to be used.
- Nevertheless, a single change can already use a large amount of memory.
- Set to 0 for Vi compatibility: One level of undo and "u" undoes
- itself: >vim
+ Nevertheless, a single change can already use a large amount of
+ memory. Set to 0 for Vi compatibility: One level of undo and "u"
+ undoes itself: >vim
set ul=0
< But you can also get Vi compatibility by including the 'u' flag in
'cpoptions', and still be able to use CTRL-R to repeat undo.
@@ -7246,10 +7249,11 @@ A jump table for the options with a short description can be found at |Q_op|.
'wildcharm' 'wcm' number (default 0)
global
'wildcharm' works exactly like 'wildchar', except that it is
- recognized when used inside a macro. You can find "spare" command-line
- keys suitable for this option by looking at |ex-edit-index|. Normally
- you'll never actually type 'wildcharm', just use it in mappings that
- automatically invoke completion mode, e.g.: >vim
+ recognized when used inside a macro. You can find "spare"
+ command-line keys suitable for this option by looking at
+ |ex-edit-index|. Normally you'll never actually type 'wildcharm',
+ just use it in mappings that automatically invoke completion mode,
+ e.g.: >vim
set wcm=<C-Z>
cnoremap ss so $vim/sessions/*.vim<C-Z>
< Then after typing :ss you can use CTRL-P & CTRL-N.
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
@@ -515,8 +515,8 @@ entries parsed from lines. The following shows how to use a custom
EXECUTE A COMMAND IN ALL THE BUFFERS IN QUICKFIX OR LOCATION LIST:
*:cdo*
-:cdo[!] {cmd} Execute {cmd} in each valid entry in the quickfix list.
- It works like doing this: >
+:cdo[!] {cmd} Execute {cmd} in each valid entry in the quickfix
+ list. It works like doing this: >
:cfirst
:{cmd}
:cnext
@@ -2022,9 +2022,9 @@ case they have to precede the letter, e.g. '%+A' or '%-G':
%- do not include the matching multi-line in any output
%+ include the whole matching line in the %m error string
-One prefix is only useful in combination with '+' or '-', namely %G. It parses
-over lines containing general information like compiler version strings or
-other headers that can be skipped.
+One prefix is only useful in combination with '+' or '-', namely %G. It
+parses over lines containing general information like compiler version strings
+or other headers that can be skipped.
%-G ignore this message
%+G general message
@@ -2190,8 +2190,8 @@ prints information about entering a directory in the form "Making all in dir".
Making all in dir2 ./dir1/dir2
Making all in dir2 ./dir1/dir2
- This can be solved by printing absolute directories in the "enter directory"
- message or by printing "leave directory" messages.
+ This can be solved by printing absolute directories in the "enter
+ directory" message or by printing "leave directory" messages.
To avoid this problem, ensure to print absolute directory names and "leave
directory" messages.
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
@@ -624,7 +624,8 @@ Additionally, these commands can be used:
*>bt*
*>backtrace*
*>where*
- backtrace Show the call stacktrace for current debugging session.
+ backtrace Show the call stacktrace for current debugging
+ session.
bt
where
*>frame*
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
@@ -887,9 +887,9 @@ Common arguments for the commands above:
When excluded, a match is ignored when the line is recognized as a
comment (according to 'comments'), or the match is in a C comment
(after "//" or inside `/* */`). Note that a match may be missed if a
- line is recognized as a comment, but the comment ends halfway the line.
- And if the line is a comment, but it is not recognized (according to
- 'comments') a match may be found in it anyway. Example: >
+ line is recognized as a comment, but the comment ends halfway the
+ line. And if the line is a comment, but it is not recognized
+ (according to 'comments') a match may be found in it anyway. Example: >
/* comment
foobar */
< A match for "foobar" is found, because this line is not recognized as
diff --git a/runtime/doc/vimfn.txt b/runtime/doc/vimfn.txt
@@ -12003,7 +12003,8 @@ win_gettype([{nr}]) *win_gettype()*
win_gotoid({expr}) *win_gotoid()*
Go to window with ID {expr}. This may also change the current
tabpage.
- Return TRUE if successful, FALSE if the window cannot be found.
+ Return TRUE if successful, FALSE if the window cannot be
+ found.
Parameters: ~
• {expr} (`integer`)
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
@@ -209,8 +209,9 @@ vim.o.aw = vim.o.autowrite
vim.go.autowrite = vim.o.autowrite
vim.go.aw = vim.go.autowrite
---- Like 'autowrite', but also used for commands ":edit", ":enew", ":quit",
---- ":qall", ":exit", ":xit", ":recover" and closing the Vim window.
+--- Like 'autowrite', but also used for commands ":edit", ":enew",
+--- ":quit", ":qall", ":exit", ":xit", ":recover" and closing the Vim
+--- window.
--- Setting this option also implies that Vim behaves like 'autowrite' has
--- been set.
---
@@ -1401,8 +1402,9 @@ vim.bo.ci = vim.bo.copyindent
--- This makes "y0" fail in the first column.
--- *cpo-f*
--- f When included, a ":read" command with a file name
---- argument will set the file name for the current buffer,
---- if the current buffer doesn't have a file name yet.
+--- argument will set the file name for the current
+--- buffer, if the current buffer doesn't have a file name
+--- yet.
--- *cpo-F*
--- F When included, a ":write" command with a file name
--- argument will set the file name for the current
@@ -1836,8 +1838,8 @@ vim.go.dex = vim.go.diffexpr
--- hiddenoff Do not use diff mode for a buffer when it
--- becomes hidden.
---
---- iblank Ignore changes where lines are all blank. Adds
---- the "-B" flag to the "diff" command if
+--- iblank Ignore changes where lines are all blank.
+--- Adds the "-B" flag to the "diff" command if
--- 'diffexpr' is empty. Check the documentation
--- of the "diff" command for what this does
--- exactly.
@@ -2451,9 +2453,9 @@ vim.bo.ff = vim.bo.fileformat
--- edit a file, a check is done for the <EOL>:
--- 1. If all lines end in <CR><NL>, and 'fileformats' includes "dos",
--- 'fileformat' is set to "dos".
---- 2. If a <NL> is found and 'fileformats' includes "unix", 'fileformat'
---- is set to "unix". Note that when a <NL> is found without a
---- preceding <CR>, "unix" is preferred over "dos".
+--- 2. If a <NL> is found and 'fileformats' includes "unix",
+--- 'fileformat' is set to "unix". Note that when a <NL> is found
+--- without a preceding <CR>, "unix" is preferred over "dos".
--- 3. If 'fileformat' has not yet been set, and if a <CR> is found, and
--- if 'fileformats' includes "mac", 'fileformat' is set to "mac".
--- This means that "mac" is only chosen when:
@@ -4251,8 +4253,8 @@ vim.o.mef = vim.o.makeef
vim.go.makeef = vim.o.makeef
vim.go.mef = vim.go.makeef
---- Encoding used for reading the output of external commands. When empty,
---- encoding is not converted.
+--- Encoding used for reading the output of external commands. When
+--- empty, encoding is not converted.
--- This is used for `:make`, `:lmake`, `:grep`, `:lgrep`, `:grepadd`,
--- `:lgrepadd`, `:cfile`, `:cgetfile`, `:caddfile`, `:lfile`, `:lgetfile`,
--- and `:laddfile`.
@@ -6850,9 +6852,10 @@ vim.wo.stc = vim.wo.statuscolumn
--- highlighting is used, also for the statusline of non-current
--- windows.
--- * - Set highlight group to User{N}, where {N} is taken from the
---- minwid field, e.g. %1*. Restore normal highlight with %* or %0*.
---- The difference between User{N} and StatusLine will be applied to
---- StatusLineNC for the statusline of non-current windows.
+--- minwid field, e.g. %1*. Restore normal highlight with %* or
+--- %0*. The difference between User{N} and StatusLine will be
+--- applied to StatusLineNC for the statusline of non-current
+--- windows.
--- The number N must be between 1 and 9. See `hl-User1..9`
---
--- When displaying a flag, Vim removes the leading comma, if any, when
@@ -7589,9 +7592,9 @@ vim.bo.udf = vim.bo.undofile
--- Maximum number of changes that can be undone. Since undo information
--- is kept in memory, higher numbers will cause more memory to be used.
---- Nevertheless, a single change can already use a large amount of memory.
---- Set to 0 for Vi compatibility: One level of undo and "u" undoes
---- itself:
+--- Nevertheless, a single change can already use a large amount of
+--- memory. Set to 0 for Vi compatibility: One level of undo and "u"
+--- undoes itself:
---
--- ```vim
--- set ul=0
@@ -7908,10 +7911,11 @@ vim.go.wildchar = vim.o.wildchar
vim.go.wc = vim.go.wildchar
--- 'wildcharm' works exactly like 'wildchar', except that it is
---- recognized when used inside a macro. You can find "spare" command-line
---- keys suitable for this option by looking at `ex-edit-index`. Normally
---- you'll never actually type 'wildcharm', just use it in mappings that
---- automatically invoke completion mode, e.g.:
+--- recognized when used inside a macro. You can find "spare"
+--- command-line keys suitable for this option by looking at
+--- `ex-edit-index`. Normally you'll never actually type 'wildcharm',
+--- just use it in mappings that automatically invoke completion mode,
+--- e.g.:
---
--- ```vim
--- set wcm=<C-Z>
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
@@ -10924,7 +10924,8 @@ function vim.fn.win_gettype(nr) end
--- Go to window with ID {expr}. This may also change the current
--- tabpage.
---- Return TRUE if successful, FALSE if the window cannot be found.
+--- Return TRUE if successful, FALSE if the window cannot be
+--- found.
---
--- @param expr integer
--- @return 0|1
diff --git a/runtime/syntax/qf.vim b/runtime/syntax/qf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Quickfix window
" Maintainer: The Vim Project <https://github.com/vim/vim>
-" Last Change: 2025 Feb 07
+" Last Change: 2026 Jan 31
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
" Quit when a syntax file was already loaded
@@ -15,8 +15,11 @@ syn match qfLineNr "[^|]*" contained nextgroup=qfSeparator2 contains=@qfType
syn match qfSeparator2 "|" contained nextgroup=qfText
syn match qfText ".*" contained
-syn match qfError "error" contained
-syn cluster qfType contains=qfError
+syn match qfError "error" contained
+syn match qfWarning "warning" contained
+syn match qfNote "note" contained
+syn match qfInfo "info" contained
+syn cluster qfType contains=qfError,qfWarning,qfNote,qfInfo
" The default highlighting.
hi def link qfFileName Directory
@@ -24,7 +27,6 @@ hi def link qfLineNr LineNr
hi def link qfSeparator1 Delimiter
hi def link qfSeparator2 Delimiter
hi def link qfText Normal
-
hi def link qfError Error
let b:current_syntax = "qf"
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
@@ -13222,7 +13222,8 @@ M.funcs = {
desc = [=[
Go to window with ID {expr}. This may also change the current
tabpage.
- Return TRUE if successful, FALSE if the window cannot be found.
+ Return TRUE if successful, FALSE if the window cannot be
+ found.
]=],
name = 'win_gotoid',
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
@@ -347,8 +347,9 @@ local options = {
abbreviation = 'awa',
defaults = false,
desc = [=[
- Like 'autowrite', but also used for commands ":edit", ":enew", ":quit",
- ":qall", ":exit", ":xit", ":recover" and closing the Vim window.
+ Like 'autowrite', but also used for commands ":edit", ":enew",
+ ":quit", ":qall", ":exit", ":xit", ":recover" and closing the Vim
+ window.
Setting this option also implies that Vim behaves like 'autowrite' has
been set.
]=],
@@ -1906,8 +1907,9 @@ local options = {
This makes "y0" fail in the first column.
*cpo-f*
f When included, a ":read" command with a file name
- argument will set the file name for the current buffer,
- if the current buffer doesn't have a file name yet.
+ argument will set the file name for the current
+ buffer, if the current buffer doesn't have a file name
+ yet.
*cpo-F*
F When included, a ":write" command with a file name
argument will set the file name for the current
@@ -2422,8 +2424,8 @@ local options = {
hiddenoff Do not use diff mode for a buffer when it
becomes hidden.
- iblank Ignore changes where lines are all blank. Adds
- the "-B" flag to the "diff" command if
+ iblank Ignore changes where lines are all blank.
+ Adds the "-B" flag to the "diff" command if
'diffexpr' is empty. Check the documentation
of the "diff" command for what this does
exactly.
@@ -3099,9 +3101,9 @@ local options = {
edit a file, a check is done for the <EOL>:
1. If all lines end in <CR><NL>, and 'fileformats' includes "dos",
'fileformat' is set to "dos".
- 2. If a <NL> is found and 'fileformats' includes "unix", 'fileformat'
- is set to "unix". Note that when a <NL> is found without a
- preceding <CR>, "unix" is preferred over "dos".
+ 2. If a <NL> is found and 'fileformats' includes "unix",
+ 'fileformat' is set to "unix". Note that when a <NL> is found
+ without a preceding <CR>, "unix" is preferred over "dos".
3. If 'fileformat' has not yet been set, and if a <CR> is found, and
if 'fileformats' includes "mac", 'fileformat' is set to "mac".
This means that "mac" is only chosen when:
@@ -5548,8 +5550,8 @@ local options = {
cb = 'did_set_encoding',
defaults = '',
desc = [=[
- Encoding used for reading the output of external commands. When empty,
- encoding is not converted.
+ Encoding used for reading the output of external commands. When
+ empty, encoding is not converted.
This is used for `:make`, `:lmake`, `:grep`, `:lgrep`, `:grepadd`,
`:lgrepadd`, `:cfile`, `:cgetfile`, `:caddfile`, `:lfile`, `:lgetfile`,
and `:laddfile`.
@@ -8912,9 +8914,10 @@ local options = {
highlighting is used, also for the statusline of non-current
windows.
* - Set highlight group to User{N}, where {N} is taken from the
- minwid field, e.g. %1*. Restore normal highlight with %* or %0*.
- The difference between User{N} and StatusLine will be applied to
- StatusLineNC for the statusline of non-current windows.
+ minwid field, e.g. %1*. Restore normal highlight with %* or
+ %0*. The difference between User{N} and StatusLine will be
+ applied to StatusLineNC for the statusline of non-current
+ windows.
The number N must be between 1 and 9. See |hl-User1..9|
When displaying a flag, Vim removes the leading comma, if any, when
@@ -9841,9 +9844,9 @@ local options = {
desc = [=[
Maximum number of changes that can be undone. Since undo information
is kept in memory, higher numbers will cause more memory to be used.
- Nevertheless, a single change can already use a large amount of memory.
- Set to 0 for Vi compatibility: One level of undo and "u" undoes
- itself: >vim
+ Nevertheless, a single change can already use a large amount of
+ memory. Set to 0 for Vi compatibility: One level of undo and "u"
+ undoes itself: >vim
set ul=0
< But you can also get Vi compatibility by including the 'u' flag in
'cpoptions', and still be able to use CTRL-R to repeat undo.
@@ -10240,10 +10243,11 @@ local options = {
defaults = 0,
desc = [=[
'wildcharm' works exactly like 'wildchar', except that it is
- recognized when used inside a macro. You can find "spare" command-line
- keys suitable for this option by looking at |ex-edit-index|. Normally
- you'll never actually type 'wildcharm', just use it in mappings that
- automatically invoke completion mode, e.g.: >vim
+ recognized when used inside a macro. You can find "spare"
+ command-line keys suitable for this option by looking at
+ |ex-edit-index|. Normally you'll never actually type 'wildcharm',
+ just use it in mappings that automatically invoke completion mode,
+ e.g.: >vim
set wcm=<C-Z>
cnoremap ss so $vim/sessions/*.vim<C-Z>
< Then after typing :ss you can use CTRL-P & CTRL-N.
