diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/builtin.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/lsp.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/lua.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/treesitter.txt | 10 | ||||
| -rw-r--r-- | runtime/lua/vim/_meta/vimfn.lua | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 2 | ||||
| -rw-r--r-- | runtime/lua/vim/lsp.lua | 2 | ||||
| -rw-r--r-- | runtime/nvim.desktop | 1 |
8 files changed, 11 insertions, 12 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 6d4003caa9..f1d8cc8526 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1263,7 +1263,7 @@ executable({expr}) *executable()* On MS-Windows the ".exe", ".bat", etc. can optionally be included. Then the extensions in $PATHEXT are tried. Thus if "foo.exe" does not exist, "foo.exe.bat" can be found. If - $PATHEXT is not set then ".exe;.com;.bat;.cmd" is used. A dot + $PATHEXT is not set then ".com;.exe;.bat;.cmd" is used. A dot by itself can be used in $PATHEXT to try using the name without an extension. When 'shell' looks like a Unix shell, then the name is also tried without adding an extension. diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt index c6664215c3..7f5ae06030 100644 --- a/runtime/doc/lsp.txt +++ b/runtime/doc/lsp.txt @@ -765,7 +765,7 @@ formatexpr({opts}) *vim.lsp.formatexpr()* function. Currently only supports a single client. This can be set via - `setlocal formatexpr=v:lua.vim.lsp.formatexpr()` but will typically or in + `setlocal formatexpr=v:lua.vim.lsp.formatexpr()` or (more typically) in `on_attach` via `vim.bo[bufnr].formatexpr = 'v:lua.vim.lsp.formatexpr(#{timeout_ms:250})'`. diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt index 01535a4e41..f071d67030 100644 --- a/runtime/doc/lua.txt +++ b/runtime/doc/lua.txt @@ -2674,7 +2674,7 @@ vim.filetype.add({filetypes}) *vim.filetype.add()* ['.*/etc/foo/.*%.conf'] = { 'dosini', { priority = 10 } }, -- A pattern containing an environment variable ['${XDG_CONFIG_HOME}/foo/git'] = 'git', - ['README.(%a+)$'] = function(path, bufnr, ext) + ['.*README.(%a+)'] = function(path, bufnr, ext) if ext == 'md' then return 'markdown' elseif ext == 'rst' then diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt index 50b2037af3..041adbf828 100644 --- a/runtime/doc/treesitter.txt +++ b/runtime/doc/treesitter.txt @@ -22,11 +22,9 @@ search for in the `parser` runtime directory. Nvim includes these parsers: -- Bash - C - Lua - Markdown -- Python - Vimscript - Vimdoc - Treesitter query files |ft-query-plugin| @@ -550,9 +548,9 @@ the exact definition): @keyword.coroutine keywords related to coroutines (e.g. `go` in Go, `async/await` in Python) @keyword.function keywords that define a function (e.g. `func` in Go, `def` in Python) @keyword.operator operators that are English words (e.g. `and`, `or`) -@keyword.import keywords for including modules (e.g. `import`, `from` in Python) -@keyword.type keywords defining composite types (e.g. `struct`, `enum`) -@keyword.modifier keywords defining type modifiers (e.g. `const`, `static`, `public`) +@keyword.import keywords for including or exporting modules (e.g. `import`, `from` in Python) +@keyword.type keywords describing namespaces and composite types (e.g. `struct`, `enum`) +@keyword.modifier keywords modifying other constructs (e.g. `const`, `static`, `public`) @keyword.repeat keywords related to loops (e.g. `for`, `while`) @keyword.return keywords like `return` and `yield` @keyword.debug keywords related to debugging @@ -608,7 +606,7 @@ the exact definition): @diff.delta changed text (for diff files) @tag XML-style tag names (e.g. in XML, HTML, etc.) -@tag.builtin XML-style tag names (e.g. HTML5 tags) +@tag.builtin builtin tag names (e.g. HTML5 tags) @tag.attribute XML-style tag attributes @tag.delimiter XML-style tag delimiters diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua index 54ac60e272..a4a6df8633 100644 --- a/runtime/lua/vim/_meta/vimfn.lua +++ b/runtime/lua/vim/_meta/vimfn.lua @@ -1593,7 +1593,7 @@ function vim.fn.eventhandler() end --- On MS-Windows the ".exe", ".bat", etc. can optionally be --- included. Then the extensions in $PATHEXT are tried. Thus if --- "foo.exe" does not exist, "foo.exe.bat" can be found. If ---- $PATHEXT is not set then ".exe;.com;.bat;.cmd" is used. A dot +--- $PATHEXT is not set then ".com;.exe;.bat;.cmd" is used. A dot --- by itself can be used in $PATHEXT to try using the name --- without an extension. When 'shell' looks like a Unix shell, --- then the name is also tried without adding an extension. diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 71a49445de..d3c33c9564 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -2518,7 +2518,7 @@ end --- ['.*/etc/foo/.*%.conf'] = { 'dosini', { priority = 10 } }, --- -- A pattern containing an environment variable --- ['${XDG_CONFIG_HOME}/foo/git'] = 'git', ---- ['README.(%a+)$'] = function(path, bufnr, ext) +--- ['.*README.(%a+)'] = function(path, bufnr, ext) --- if ext == 'md' then --- return 'markdown' --- elseif ext == 'rst' then diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index 97f78d3009..60677554ce 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -1031,7 +1031,7 @@ end --- Provides an interface between the built-in client and a `formatexpr` function. --- --- Currently only supports a single client. This can be set via ---- `setlocal formatexpr=v:lua.vim.lsp.formatexpr()` but will typically or in `on_attach` +--- `setlocal formatexpr=v:lua.vim.lsp.formatexpr()` or (more typically) in `on_attach` --- via `vim.bo[bufnr].formatexpr = 'v:lua.vim.lsp.formatexpr(#{timeout_ms:250})'`. --- ---@param opts? vim.lsp.formatexpr.Opts diff --git a/runtime/nvim.desktop b/runtime/nvim.desktop index 224353c6ad..f9feae926d 100644 --- a/runtime/nvim.desktop +++ b/runtime/nvim.desktop @@ -4,6 +4,7 @@ GenericName=Text Editor GenericName[ckb]=دەستکاریکەری دەق GenericName[de]=Texteditor GenericName[fr]=Éditeur de texte +GenericName[pl]=Edytor tekstu GenericName[ru]=Текстовый редактор GenericName[sr]=Едитор текст GenericName[tr]=Metin Düzenleyici |