diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-03-02 18:43:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 18:43:52 -0500 |
| commit | bda12927be84f0e0e05e885f9acb40a7ac2c5524 (patch) | |
| tree | f4b493647eaea612ca3e0dca211ae3a2730a6132 /runtime/doc | |
| parent | c1fbc2ddf15b2f44b615f90b2511349ab974cb83 (diff) | |
| parent | 1edc0285c4e563b61d596fc2f8352010bd91cb38 (diff) | |
| download | rneovim-bda12927be84f0e0e05e885f9acb40a7ac2c5524.tar.gz rneovim-bda12927be84f0e0e05e885f9acb40a7ac2c5524.tar.bz2 rneovim-bda12927be84f0e0e05e885f9acb40a7ac2c5524.zip | |
Merge pull request #14041 from janlazo/vim-8.2.2560
vim-patch:8.1.{680,1901},8.2.{1043,2196,2236,2551.2559,2560}
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/insert.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index c4b93a2a27..6902ed5fd4 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -287,8 +287,7 @@ character is written at the end of each line. Thus if you want to insert a *i_CTRL-X* *insert_expand* CTRL-X enters a sub-mode where several commands can be used. Most of these -commands do keyword completion; see |ins-completion|. These are not available -when Vim was compiled without the |+insert_expand| feature. +commands do keyword completion; see |ins-completion|. Two commands can be used to scroll the window up or down, without exiting insert mode: @@ -592,9 +591,6 @@ In Insert and Replace mode, there are several commands to complete part of a keyword or line that has been typed. This is useful if you are using complicated keywords (e.g., function names with capitals and underscores). -These commands are not available when the |+insert_expand| feature was -disabled at compile time. - Completion can be done for: 1. Whole lines |i_CTRL-X_CTRL-L| diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index ce3788e0fc..c4d5df84cf 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4090,8 +4090,6 @@ A jump table for the options with a short description can be found at |Q_op|. In the "popup" model the right mouse button produces a pop-up menu. You need to define this first, see |popup-menu|. - In a terminal the popup menu works if Vim is compiled with the - |+insert_expand| option. Note that you can further refine the meaning of buttons with mappings. See |mouse-overview|. But mappings are NOT used for modeless selection. @@ -4858,7 +4856,9 @@ A jump table for the options with a short description can be found at |Q_op|. local to window Number of lines to scroll with CTRL-U and CTRL-D commands. Will be set to half the number of lines in the window when the window size - changes. If you give a count to the CTRL-U or CTRL-D command it will + changes. This may happen when enabling the |status-line| or + 'tabline' option after setting the 'scroll' option. + If you give a count to the CTRL-U or CTRL-D command it will be used as the new value for 'scroll'. Reset to half the window height with ":set scroll=0". |