diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-01 19:03:43 -0400 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-01 22:29:02 -0400 |
commit | 0c93005383daacaa32d2c615716dc3a8c06d573f (patch) | |
tree | eb9920bf1317fb4f4716d87c51bd1e246376992c /runtime/doc | |
parent | 2ebd1f6286211bc67cc83e3ad912d28b372ea4b6 (diff) | |
download | rneovim-0c93005383daacaa32d2c615716dc3a8c06d573f.tar.gz rneovim-0c93005383daacaa32d2c615716dc3a8c06d573f.tar.bz2 rneovim-0c93005383daacaa32d2c615716dc3a8c06d573f.zip |
vim-patch:4466ad6baa22
Update runtime files
https://github.com/vim/vim/commit/4466ad6baa22485abb1147aca3340cced4778a66
Omit vim9 references in autocmd.txt.
Omit matchfuzzypos().
Diffstat (limited to 'runtime/doc')
-rw-r--r-- | runtime/doc/change.txt | 2 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 19 | ||||
-rw-r--r-- | runtime/doc/map.txt | 13 | ||||
-rw-r--r-- | runtime/doc/syntax.txt | 2 | ||||
-rw-r--r-- | runtime/doc/various.txt | 22 |
5 files changed, 35 insertions, 23 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index cd73e118e3..30183caf2b 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1785,6 +1785,8 @@ found here: |sort()|, |uniq()|. When /{pattern}/ is specified and there is no [r] flag the text matched with {pattern} is skipped, so that you sort on what comes after the match. + 'ignorecase' applies to the pattern, but 'smartcase' + is not used. Instead of the slash any non-letter can be used. For example, to sort on the second comma-separated field: > diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 0c5e42a92b..55ffe2f189 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2863,8 +2863,8 @@ byteidx({expr}, {nr}) *byteidx()* Return byte index of the {nr}'th character in the string {expr}. Use zero for the first character, it then returns zero. - This function is only useful when there are multibyte - characters, otherwise the returned value is equal to {nr}. + If there are no multibyte characters the returned value is + equal to {nr}. Composing characters are not counted separately, their byte length is added to the preceding base character. See |byteidxcomp()| below for counting composing characters @@ -7189,11 +7189,16 @@ search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) *search()* 'ignorecase', 'smartcase' and 'magic' are used. - When the 'z' flag is not given, searching always starts in - column zero and then matches before the cursor are skipped. - When the 'c' flag is present in 'cpo' the next search starts - after the match. Without the 'c' flag the next search starts - one column further. + When the 'z' flag is not given, forward searching always + starts in column zero and then matches before the cursor are + skipped. When the 'c' flag is present in 'cpo' the next + search starts after the match. Without the 'c' flag the next + search starts one column further. This matters for + overlapping matches. + When searching backwards and the 'z' flag is given then the + search starts in column zero, thus no match in the current + line will be found (unless wrapping around the end of the + file). When the {stopline} argument is given then the search stops after searching this line. This is useful to restrict the diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index b97838e75c..ce5e4dc73c 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -306,14 +306,17 @@ preserved, so tricks with |gv| are not needed. Commands can be invoked directly in cmdline-mode (which would otherwise require timer hacks). Unlike <expr> mappings, there are no special restrictions on the <Cmd> -command: it is executed as if an (unrestricted) |autocmd| was invoked or an -async event event was processed. +command: it is executed as if an (unrestricted) |autocommand| was invoked +or an async event event was processed. Note: - Because <Cmd> avoids mode-changes (unlike ":") it does not trigger |CmdlineEnter| and |CmdlineLeave| events. This helps performance. - For the same reason, |keycodes| like <C-R><C-W> are interpreted as plain, unmapped keys. +- The command is not echo'ed, no need for <silent>. +- In Visual mode you can use `line('v')` and `col('v')` to get one end of the + Visual area, the cursor is at the other end. - In select-mode, |:map| and |:vmap| command mappings are executed in visual-mode. Use |:smap| to handle select-mode. @@ -1122,9 +1125,9 @@ Otherwise, using "<SID>" outside of a script context is an error. If you need to get the script number to use in a complicated script, you can use this function: > - function s:SID() - return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$') - endfun + func s:ScriptNumber() + return matchstr(expand('<SID>'), '<SNR>\zs\d\+\ze_') + endfunc The "<SNR>" will be shown when listing functions and mappings. This is useful to find out what they are defined to. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index a13d9f5190..7a1f19eeeb 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -2974,7 +2974,7 @@ vimrc file: > (Adapted from the html.vim help text by Claudio Fleiner <claudio@fleiner.com>) - *ft-posix-synax* *ft-dash-syntax* + *ft-posix-syntax* *ft-dash-syntax* SH *sh.vim* *ft-sh-syntax* *ft-bash-syntax* *ft-ksh-syntax* This covers syntax highlighting for the older Unix (Bourne) sh, and newer diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index f8d8dbd294..db8e793680 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -134,15 +134,17 @@ g8 Print the hex values of the bytes used in the quit < *:z* *E144* -:{range}z[+-^.=]{count} Display several lines of text surrounding the line - specified with {range}, or around the current line - if there is no {range}. If there is a {count}, that's - how many lines you'll see; if there is no {count} and - only one window then twice the value of the 'scroll' - option is used, otherwise the current window height - minus 3 is used. - - If there is a {count} the 'window' option is set to +:[range]z[+-^.=][count] Display several lines of text surrounding the line + specified with [range], or around the current line + if there is no [range]. + + If there is a [count], that's how many lines you'll + see; if there is no [count] and only one window then + twice the value of the 'scroll' option is used, + otherwise the current window height minus 3 is used. + This is the value of "scr" in the table below. + + If there is a [count] the 'window' option is set to its value. :z can be used either alone or followed by any of @@ -160,7 +162,7 @@ g8 Print the hex values of the bytes used in the If the mark is "=", a line of dashes is printed around the current line. -:{range}z#[+-^.=]{count} *:z#* +:[range]z#[+-^.=][count] *:z#* Like ":z", but number the lines. {not in all versions of Vi, not with these arguments} |