diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-28 19:47:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-28 19:47:40 +0800 |
| commit | dde2cc65fd2ac89ad88b19df08dc03cf1da50316 (patch) | |
| tree | 8a4f3e3165e071639598fed73981ffa05b1c4b0d /runtime | |
| parent | 346a6390286cf58d8a618fd9d803523e497c8af1 (diff) | |
| parent | 2f638c0ac6275bebacd12671481642fa43d7ba10 (diff) | |
| download | rneovim-dde2cc65fd2ac89ad88b19df08dc03cf1da50316.tar.gz rneovim-dde2cc65fd2ac89ad88b19df08dc03cf1da50316.tar.bz2 rneovim-dde2cc65fd2ac89ad88b19df08dc03cf1da50316.zip | |
Merge pull request #28044 from luukvbaal/vim-9.1.0211
vim-patch:9.1.{0211,0215}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/options.txt | 8 | ||||
| -rw-r--r-- | runtime/lua/vim/_meta/options.lua | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 3cc5b6af64..b0583d306d 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5693,8 +5693,8 @@ A jump table for the options with a short description can be found at |Q_op|. highlighted with |hl-NonText|. You may also want to add "lastline" to the 'display' option to show as much of the last line as possible. - NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y - and scrolling with the mouse. + NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y, + CTRL-D, CTRL-U, CTRL-F, CTRL-B and scrolling with the mouse. *'softtabstop'* *'sts'* 'softtabstop' 'sts' number (default 0) @@ -7164,8 +7164,8 @@ A jump table for the options with a short description can be found at |Q_op|. will scroll 'window' minus two lines, with a minimum of one. When 'window' is equal to 'lines' minus one CTRL-F and CTRL-B scroll in a much smarter way, taking care of wrapping lines. - When resizing the Vim window, the value is smaller than 1 or more than - or equal to 'lines' it will be set to 'lines' minus 1. + When resizing the Vim window, and the value is smaller than 1 or more + than or equal to 'lines' it will be set to 'lines' minus 1. Note: Do not confuse this with the height of the Vim window, use 'lines' for that. diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index e8e56e86b2..adc42f9659 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -6075,8 +6075,8 @@ vim.go.sta = vim.go.smarttab --- highlighted with `hl-NonText`. --- You may also want to add "lastline" to the 'display' option to show as --- much of the last line as possible. ---- NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y ---- and scrolling with the mouse. +--- NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y, +--- CTRL-D, CTRL-U, CTRL-F, CTRL-B and scrolling with the mouse. --- --- @type boolean vim.o.smoothscroll = false @@ -7861,8 +7861,8 @@ vim.wo.winbl = vim.wo.winblend --- will scroll 'window' minus two lines, with a minimum of one. --- When 'window' is equal to 'lines' minus one CTRL-F and CTRL-B scroll --- in a much smarter way, taking care of wrapping lines. ---- When resizing the Vim window, the value is smaller than 1 or more than ---- or equal to 'lines' it will be set to 'lines' minus 1. +--- When resizing the Vim window, and the value is smaller than 1 or more +--- than or equal to 'lines' it will be set to 'lines' minus 1. --- Note: Do not confuse this with the height of the Vim window, use --- 'lines' for that. --- |