From b3a97c56b659f7b9bf1c021d654b3df0236171c7 Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Mon, 6 Sep 2021 18:05:05 +0100 Subject: vim-patch:8.2.3384: cannot disable modeline for an individual file Problem: Cannot disable modeline for an individual file. Solution: Recognize "nomodeline" in a modeline. (Hu Jialun, closes vim/vim#8798) https://github.com/vim/vim/commit/9dcd349ca85e1df1abd1cbf1c29c0f1574b70bf8 Cherry-pick missing modeline for test_modeline.vim (heh) from v8.2.1432. --- runtime/doc/options.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'runtime') diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 90ba3b86d9..1a703129d6 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 -- cgit From f46341fa43075443241fe641905656c74a9523ee Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Mon, 6 Sep 2021 20:13:40 +0100 Subject: vim-patch:8.2.3400: ":z!" is not supported MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: ":z!" is not supported. Solution: Make ":z!" work and add tests. (Dominique Pellé, closes vim/vim#8836) Use display height instead of current window height. https://github.com/vim/vim/commit/7f2dd1e90c1d4a30c791fae20014594641769a1e --- runtime/doc/various.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'runtime') 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. -- cgit