diff --git a/runtime/doc/Make_mvc.mak b/runtime/doc/Make_mvc.mak index 5bfe934e3d..a6af4baf8a 100644 --- a/runtime/doc/Make_mvc.mak +++ b/runtime/doc/Make_mvc.mak @@ -10,7 +10,7 @@ # TODO: to think about what to use instead of awk. PowerShell? #AWK = -# Correct the following line for the where executeable file vim is installed. +# Correct the following line for the where executable file vim is installed. # Please do not put the path in quotes. VIMPROG = D:\Programs\Vim\vim91\vim.exe diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index d32c09d2fb..67f447d7db 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1,4 +1,4 @@ -*builtin.txt* For Vim version 9.1. Last change: 2024 Nov 09 +*builtin.txt* For Vim version 9.1. Last change: 2024 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -467,9 +467,9 @@ prop_type_get({name} [, {props}]) prop_type_list([{props}]) List get list of property types pum_getpos() Dict position and size of pum if visible pumvisible() Number whether popup menu is visible -py3eval({expr}[, {locals}]) any evaluate |python3| expression -pyeval({expr}[, {locals}]) any evaluate |Python| expression -pyxeval({expr}[, {locals}]) any evaluate |python_x| expression +py3eval({expr} [, {locals}]) any evaluate |python3| expression +pyeval({expr} [, {locals}]) any evaluate |Python| expression +pyxeval({expr} [, {locals}]) any evaluate |python_x| expression rand([{expr}]) Number get pseudo-random number range({expr} [, {max} [, {stride}]]) List items from {expr} to {max} @@ -8127,7 +8127,7 @@ pumvisible() *pumvisible()* Return type: |Number| -py3eval({expr}[, {locals}]) *py3eval()* +py3eval({expr} [, {locals}]) *py3eval()* Evaluate Python expression {expr} and return its result converted to Vim data structures. If a {locals} |Dictionary| is given, it defines set of local @@ -8153,7 +8153,7 @@ py3eval({expr}[, {locals}]) *py3eval()* {only available when compiled with the |+python3| feature} *E858* *E859* -pyeval({expr}[, {locals}]) *pyeval()* +pyeval({expr} [, {locals}]) *pyeval()* Evaluate Python expression {expr} and return its result converted to Vim data structures. For {locals} see |py3eval()|. @@ -8172,7 +8172,7 @@ pyeval({expr}[, {locals}]) *pyeval()* {only available when compiled with the |+python| feature} -pyxeval({expr}[, {locals}]) *pyxeval()* +pyxeval({expr} [, {locals}]) *pyxeval()* Evaluate Python expression {expr} and return its result converted to Vim data structures. For {locals} see |py3eval()|. diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 37f0a181d1..48f192a7b8 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 9.1. Last change: 2024 Nov 07 +*quickfix.txt* For Vim version 9.1. Last change: 2024 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -361,7 +361,7 @@ processing a quickfix or location list command, it will be aborted. Example: > :g/mypattern/caddexpr expand("%") .. ":" .. line(".") .. ":" .. getline(".") < - *:lad* *:addd* *:laddexpr* + *:lad* *:ladd* *:laddexpr* :lad[dexpr] {expr} Same as ":caddexpr", except the location list for the current window is used instead of the quickfix list. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index eff99f7638..b0c77db1d4 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 9.1. Last change: 2024 Nov 09 +*syntax.txt* For Vim version 9.1. Last change: 2024 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2670,7 +2670,7 @@ To specify elements that should not be concealed, set the following variable: > :let g:pandoc#syntax#conceal#blacklist = [] -This is a list of the rules wich can be used here: +This is a list of the rules which can be used here: - titleblock - image diff --git a/runtime/doc/tags b/runtime/doc/tags index 6e5085a0d8..3039737f54 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2216,7 +2216,6 @@ $quote eval.txt /*$quote* :abo windows.txt /*:abo* :aboveleft windows.txt /*:aboveleft* :abstract vim9class.txt /*:abstract* -:addd quickfix.txt /*:addd* :al windows.txt /*:al* :all windows.txt /*:all* :am gui.txt /*:am* @@ -2736,6 +2735,7 @@ $quote eval.txt /*$quote* :lab quickfix.txt /*:lab* :labove quickfix.txt /*:labove* :lad quickfix.txt /*:lad* +:ladd quickfix.txt /*:ladd* :laddb quickfix.txt /*:laddb* :laddbuffer quickfix.txt /*:laddbuffer* :laddexpr quickfix.txt /*:laddexpr* diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 462232f728..e1e6c4ee7c 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2743,7 +2743,7 @@ do_ecmd( } if (buf == NULL) goto theend; - // autocommands try to edit a file that is goind to be removed, + // autocommands try to edit a file that is going to be removed, // abort if (buf_locked(buf)) { diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak index f567d88f8b..de0339743b 100644 --- a/src/po/Make_mvc.mak +++ b/src/po/Make_mvc.mak @@ -38,7 +38,7 @@ VIMRUNTIME = ..\..\runtime !ENDIF PACKAGE = vim -# Correct the following line for the where executeable file vim is +# Correct the following line for the where executable file vim is # installed. Please do not put the path in quotes. !IFNDEF VIMPROG VIMPROG = ..\vim.exe diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index a654b6dda0..bed795e1cc 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -2258,7 +2258,7 @@ func Test_diff_overlapped_diff_blocks_will_be_merged() call StopVimInTerminal(buf) endfunc -" switching windows in diff mode caused an unneccessary scroll +" switching windows in diff mode caused an unnecessary scroll func Test_diff_topline_noscroll() CheckScreendump diff --git a/src/version.c b/src/version.c index 2839e89808..7906b07e00 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 849, /**/ 848, /**/