diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-09-17 09:39:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 09:39:36 -0400 |
| commit | 1ec3d37192194d6961621f17fc5a185356586339 (patch) | |
| tree | f8d5b2a694bcccbce4aae1284abea9ec86eb7c90 /runtime | |
| parent | 5f144efefa66c9694123b679bab52992279a6015 (diff) | |
| parent | f46341fa43075443241fe641905656c74a9523ee (diff) | |
| download | rneovim-1ec3d37192194d6961621f17fc5a185356586339.tar.gz rneovim-1ec3d37192194d6961621f17fc5a185356586339.tar.bz2 rneovim-1ec3d37192194d6961621f17fc5a185356586339.zip | |
Merge pull request #15580 from seandewar/vim-8.2.3378
vim-patch:8.2.{3378,3379,3384,3386,3398,3400}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/options.txt | 9 | ||||
| -rw-r--r-- | runtime/doc/various.txt | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 4eb367258f..cc7524988d 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -435,6 +435,15 @@ chance that a normal word like "lex:" is caught. There is one exception: version 3.0). Using "ex:" at the start of the line will be ignored (this could be short for "example:"). +If the modeline is disabled within a modeline, subsequent modelines will be +ignored. This is to allow turning off modeline on a per-file basis. This is +useful when a line looks like a modeline but isn't. For example, it would be +good to start a YAML file containing strings like "vim:" with + # vim: nomodeline ~ +so as to avoid modeline misdetection. Following options on the same line +after modeline deactivation, if any, are still evaluated (but you would +normally not have any). + *modeline-local* The options are set like with ":setlocal": The new value only applies to the buffer and window that contain the file. Although it's possible to set global diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 29bd6e5e64..b06fa7518c 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -166,9 +166,13 @@ 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#* - Like ":z", but number the lines. - {not in all versions of Vi, not with these arguments} + *:z!* +:[range]z![+-^.=][count] + Like ":z:", but when [count] is not specified, it + defaults to the Vim window height minus one. + +:[range]z[!]#[+-^.=][count] *:z#* + Like ":z" or ":z!", but number the lines. *:=* := [flags] Print the last line number. |