Skip to content

Commit

Permalink
Update runtime files
Browse files Browse the repository at this point in the history
  • Loading branch information
brammool committed Oct 23, 2021
1 parent 06ca48a commit 079ba76
Show file tree
Hide file tree
Showing 19 changed files with 520 additions and 280 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -169,6 +169,7 @@ runtime/plugin/vimballPlugin.vim @cecamp
runtime/plugin/zipPlugin.vim @cecamp
runtime/syntax/aidl.vim @dpelle
runtime/syntax/amiga.vim @cecamp
runtime/syntax/arduino.vim @johshoff
runtime/syntax/asm.vim @dkearns
runtime/syntax/asmh8300.vim @dkearns
runtime/syntax/asterisk.vim @jaunis
Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/eval.txt
@@ -1,4 +1,4 @@
*eval.txt* For Vim version 8.2. Last change: 2021 Oct 14
*eval.txt* For Vim version 8.2. Last change: 2021 Oct 20


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down
4 changes: 2 additions & 2 deletions runtime/doc/insert.txt
@@ -1,4 +1,4 @@
*insert.txt* For Vim version 8.2. Last change: 2021 Aug 31
*insert.txt* For Vim version 8.2. Last change: 2021 Oct 18


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -893,7 +893,7 @@ Groß): >
endif
endfunc
if has('patch-8.2.3520')
if exists('+thesaurusfunc')
set thesaurusfunc=Thesaur
endif
Expand Down
5 changes: 4 additions & 1 deletion runtime/doc/map.txt
@@ -1,4 +1,4 @@
*map.txt* For Vim version 8.2. Last change: 2021 Sep 12
*map.txt* For Vim version 8.2. Last change: 2021 Oct 19


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -1004,6 +1004,9 @@ Also note that the 'clipboard' option is temporarily emptied to avoid
clobbering the `"*` or `"+` registers, if its value contains the item `unnamed`
or `unnamedplus`.

The `mode()` function will return the state as it will be after applying the
operator.

==============================================================================
2. Abbreviations *abbreviations* *Abbreviations*

Expand Down
5 changes: 3 additions & 2 deletions runtime/doc/options.txt
@@ -1,4 +1,4 @@
*options.txt* For Vim version 8.2. Last change: 2021 Sep 21
*options.txt* For Vim version 8.2. Last change: 2021 Oct 20


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -717,7 +717,8 @@ A jump table for the options with a short description can be found at |Q_op|.
"double": Use twice the width of ASCII characters.
*E834* *E835*
The value "double" cannot be used if 'listchars' or 'fillchars'
contains a character that would be double width.
contains a character that would be double width. These errors may
also be given when calling setcellwidths().

The values are overruled for characters specified with
|setcellwidths()|.
Expand Down
3 changes: 2 additions & 1 deletion runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
*quickref.txt* For Vim version 8.2. Last change: 2021 Mar 29
*quickref.txt* For Vim version 8.2. Last change: 2021 Oct 17


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -732,6 +732,7 @@ Short explanation of each option: *option-list*
'guifontset' 'gfs' GUI: Names of multibyte fonts to be used
'guifontwide' 'gfw' list of font names for double-wide characters
'guiheadroom' 'ghr' GUI: pixels room for window decorations
'guiligatures' 'gli' GTK GUI: ASCII characters that can form shapes
'guioptions' 'go' GUI: Which components and options are used
'guipty' GUI: try to use a pseudo-tty for ":!" commands
'guitablabel' 'gtl' GUI: custom label for a tab page
Expand Down
8 changes: 8 additions & 0 deletions runtime/doc/tags
Expand Up @@ -302,6 +302,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
'gfs' options.txt /*'gfs'*
'gfw' options.txt /*'gfw'*
'ghr' options.txt /*'ghr'*
'gli' options.txt /*'gli'*
'go' options.txt /*'go'*
'go-!' options.txt /*'go-!'*
'go-A' options.txt /*'go-A'*
Expand Down Expand Up @@ -339,6 +340,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
'guifontset' options.txt /*'guifontset'*
'guifontwide' options.txt /*'guifontwide'*
'guiheadroom' options.txt /*'guiheadroom'*
'guiligatures' options.txt /*'guiligatures'*
'guioptions' options.txt /*'guioptions'*
'guipty' options.txt /*'guipty'*
'guitablabel' options.txt /*'guitablabel'*
Expand Down Expand Up @@ -1138,6 +1140,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
'tgc' options.txt /*'tgc'*
'tgst' options.txt /*'tgst'*
'thesaurus' options.txt /*'thesaurus'*
'thesaurusfunc' options.txt /*'thesaurusfunc'*
'tildeop' options.txt /*'tildeop'*
'timeout' options.txt /*'timeout'*
'timeoutlen' options.txt /*'timeoutlen'*
Expand Down Expand Up @@ -2077,6 +2080,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
:XMLent insert.txt /*:XMLent*
:XMLns insert.txt /*:XMLns*
:[range] motion.txt /*:[range]*
:[vV\x16] autocmd.txt /*:[vV\\x16]*
:\bar cmdline.txt /*:\\bar*
:_! cmdline.txt /*:_!*
:_# cmdline.txt /*:_#*
Expand Down Expand Up @@ -3992,6 +3996,7 @@ E1233 eval.txt /*E1233*
E1237 map.txt /*E1237*
E1239 eval.txt /*E1239*
E124 eval.txt /*E124*
E1243 options.txt /*E1243*
E125 eval.txt /*E125*
E126 eval.txt /*E126*
E127 eval.txt /*E127*
Expand Down Expand Up @@ -5930,6 +5935,8 @@ compl-omni-filetypes insert.txt /*compl-omni-filetypes*
compl-spelling insert.txt /*compl-spelling*
compl-stop insert.txt /*compl-stop*
compl-tag insert.txt /*compl-tag*
compl-thesaurus insert.txt /*compl-thesaurus*
compl-thesaurusfunc insert.txt /*compl-thesaurusfunc*
compl-vim insert.txt /*compl-vim*
compl-whole-line insert.txt /*compl-whole-line*
complete() eval.txt /*complete()*
Expand Down Expand Up @@ -9826,6 +9833,7 @@ try-echoerr eval.txt /*try-echoerr*
try-finally eval.txt /*try-finally*
try-nested eval.txt /*try-nested*
try-nesting eval.txt /*try-nesting*
tsrfu' options.txt /*tsrfu'*
tutor usr_01.txt /*tutor*
twice if_cscop.txt /*twice*
two-engines pattern.txt /*two-engines*
Expand Down
4 changes: 1 addition & 3 deletions runtime/doc/todo.txt
@@ -1,4 +1,4 @@
*todo.txt* For Vim version 8.2. Last change: 2021 Oct 15
*todo.txt* For Vim version 8.2. Last change: 2021 Oct 16


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -38,8 +38,6 @@ browser use: https://github.com/vim/vim/issues/1234
*known-bugs*
-------------------- Known bugs and current work -----------------------

Remove s:flaky_tests from runtest.vim, set g:test_is_flaky in each test.

Vim9 - Make everything work:
- "filter #pat# ls" should work, #pat# is not a comment
vim9script
Expand Down
26 changes: 16 additions & 10 deletions runtime/ftplugin/changelog.vim
Expand Up @@ -2,7 +2,7 @@
" Language: generic Changelog file
" Maintainer: Martin Florian <marfl@posteo.de>
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2015-10-25
" Latest Revision: 2021-10-17
" Variables:
" g:changelog_timeformat (deprecated: use g:changelog_dateformat instead) -
" description: the timeformat used in ChangeLog entries.
Expand Down Expand Up @@ -55,7 +55,7 @@ if &filetype == 'changelog'
elseif $EMAIL_ADDRESS != ""
return $EMAIL_ADDRESS
endif

let login = s:login()
return printf('%s <%s@%s>', s:name(login), login, s:hostname())
endfunction
Expand Down Expand Up @@ -223,12 +223,6 @@ if &filetype == 'changelog'
let &paste = save_paste
endfunction

if exists(":NewChangelogEntry") != 2
nnoremap <buffer> <silent> <Leader>o :<C-u>call <SID>new_changelog_entry('')<CR>
xnoremap <buffer> <silent> <Leader>o :<C-u>call <SID>new_changelog_entry('')<CR>
command! -nargs=0 NewChangelogEntry call s:new_changelog_entry('')
endif

let b:undo_ftplugin = "setl com< fo< et< ai<"

setlocal comments=
Expand All @@ -241,14 +235,26 @@ if &filetype == 'changelog'
let b:undo_ftplugin .= " tw<"
endif

if !exists("no_plugin_maps") && !exists("no_changelog_maps") && exists(":NewChangelogEntry") != 2
nnoremap <buffer> <silent> <Leader>o :<C-u>call <SID>new_changelog_entry('')<CR>
xnoremap <buffer> <silent> <Leader>o :<C-u>call <SID>new_changelog_entry('')<CR>
command! -buffer -nargs=0 NewChangelogEntry call s:new_changelog_entry('')
let b:undo_ftplugin .= " | sil! exe 'nunmap <buffer> <Leader>o'" .
\ " | sil! exe 'vunmap <buffer> <Leader>o'" .
\ " | sil! delc NewChangelogEntry"
endif

let &cpo = s:cpo_save
unlet s:cpo_save
else
let s:cpo_save = &cpo
set cpo&vim

" Add the Changelog opening mapping
nnoremap <silent> <Leader>o :call <SID>open_changelog()<CR>
if !exists("no_plugin_maps") && !exists("no_changelog_maps")
" Add the Changelog opening mapping
nnoremap <silent> <Leader>o :call <SID>open_changelog()<CR>
let b:undo_ftplugin .= " | silent! exe 'nunmap <buffer> <Leader>o"
endif

function! s:open_changelog()
let path = expand('%:p:h')
Expand Down
4 changes: 2 additions & 2 deletions runtime/ftplugin/nsis.vim
Expand Up @@ -3,7 +3,7 @@
" Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-nsis
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Last Change: 2018-01-26
" Last Change: 2021-10-18

if exists("b:did_ftplugin")
finish
Expand All @@ -15,7 +15,6 @@ set cpo&vim
let b:did_ftplugin = 1

let b:undo_ftplugin = "setl com< cms< fo< def< inc<"
\ " | unlet! b:match_ignorecase b:match_words"

setlocal comments=s1:/*,mb:*,ex:*/,b:#,:; commentstring=;\ %s
setlocal formatoptions-=t formatoptions+=croql
Expand All @@ -37,6 +36,7 @@ if exists("loaded_matchit")
\ '\${MementoSection}:\${MementoSectionEnd},' .
\ '!if\%(\%(macro\)\?n\?def\)\?\>:!else\>:!endif\>,' .
\ '!macro\>:!macroend\>'
let b:undo_ftplugin .= " | unlet! b:match_ignorecase b:match_words"
endif

let &cpo = s:cpo_save
Expand Down
4 changes: 3 additions & 1 deletion runtime/indent/dosbatch.vim
Expand Up @@ -2,7 +2,7 @@
" Language: MSDOS batch file (with NT command extensions)
" Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-dosbatch-indent
" Last Change: 2017 May 10
" Last Change: 2021-10-18
" Filenames: *.bat
" License: VIM License

Expand All @@ -17,6 +17,8 @@ setlocal indentexpr=GetDosBatchIndent(v:lnum)
setlocal indentkeys=!^F,o,O
setlocal indentkeys+=0=)

let b:undo_indent = "setl ai< inde< indk< si<"

if exists("*GetDosBatchIndent")
finish
endif
Expand Down
4 changes: 3 additions & 1 deletion runtime/indent/nsis.vim
Expand Up @@ -2,7 +2,7 @@
" Language: NSIS script
" Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-nsis
" Last Change: 2018-01-21
" Last Change: 2021-10-18
" Filenames: *.nsi
" License: VIM License

Expand All @@ -17,6 +17,8 @@ setlocal indentexpr=GetNsisIndent(v:lnum)
setlocal indentkeys=!^F,o,O
setlocal indentkeys+==~${Else,=~${EndIf,=~${EndUnless,=~${AndIf,=~${AndUnless,=~${OrIf,=~${OrUnless,=~${Case,=~${Default,=~${EndSelect,=~${EndSwith,=~${Loop,=~${Next,=~${MementoSectionEnd,=~FunctionEnd,=~SectionEnd,=~SectionGroupEnd,=~PageExEnd,0=~!macroend,0=~!if,0=~!else,0=~!endif

let b:undo_indent = "setl ai< inde< indk< si<"

if exists("*GetNsisIndent")
finish
endif
Expand Down
4 changes: 3 additions & 1 deletion runtime/indent/teraterm.vim
Expand Up @@ -3,7 +3,7 @@
" Based on Tera Term Version 4.100
" Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-teraterm
" Last Change: 2018-08-31
" Last Change: 2021-10-18
" Filenames: *.ttl
" License: VIM License

Expand All @@ -18,6 +18,8 @@ setlocal indentexpr=GetTeraTermIndent(v:lnum)
setlocal indentkeys=!^F,o,O,e
setlocal indentkeys+==elseif,=endif,=loop,=next,=enduntil,=endwhile

let b:undo_indent = "setl ai< inde< indk< si<"

if exists("*GetTeraTermIndent")
finish
endif
Expand Down
7 changes: 6 additions & 1 deletion runtime/optwin.vim
@@ -1,7 +1,7 @@
" These commands create the option window.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2020 Oct 27
" Last Change: 2021 Oct 17

" If there already is an option window, jump to that one.
let buf = bufnr('option-window')
Expand Down Expand Up @@ -652,6 +652,8 @@ if has("gui")
endif
call <SID>AddOption("guiheadroom", gettext("room (in pixels) left above/below the window"))
call append("$", " \tset ghr=" . &ghr)
call <SID>AddOption("guiligatures", gettext("list of ASCII characters that can be combined into complesshapes"))
call <SID>OptionG("gli", &gli)
endif
if has("directx")
call <SID>AddOption("renderoptions", gettext("options for text rendering"))
Expand Down Expand Up @@ -840,6 +842,9 @@ if has("insert_expand")
call <SID>AddOption("thesaurus", gettext("list of thesaurus files for keyword completion"))
call append("$", "\t" .. s:global_or_local)
call <SID>OptionG("tsr", &tsr)
call <SID>AddOption("thesaurusfunc", gettext("function used for thesaurus completion"))
call append("$", "\t" .. s:global_or_local)
call <SID>OptionG("tsrfu", &tsrfu)
endif
call <SID>AddOption("infercase", gettext("adjust case of a keyword completion match"))
call append("$", "\t" .. s:local_to_buffer)
Expand Down

0 comments on commit 079ba76

Please sign in to comment.