diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-11 19:50:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-11 19:50:37 +0200 |
| commit | 1ccd8fff8acfbd5df0fc0e9b4d288af84e51233e (patch) | |
| tree | 909b2433229aa72e87bd9d23bd88db9e1e8a9f57 /runtime/doc/intro.txt | |
| parent | 05aafed54b50b602315ae55d83a7d089804cecb0 (diff) | |
Update runtime files.
Diffstat (limited to 'runtime/doc/intro.txt')
| -rw-r--r-- | runtime/doc/intro.txt | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 9e62251b25..27f0cc668f 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 8.0. Last change: 2017 Jul 30 +*intro.txt* For Vim version 8.0. Last change: 2017 Aug 05 VIM REFERENCE MANUAL by Bram Moolenaar @@ -530,7 +530,7 @@ examples and use them directly. Or type them literally, including the '<' and ============================================================================== 5. Modes, introduction *vim-modes-intro* *vim-modes* -Vim has six BASIC modes: +Vim has seven BASIC modes: *Normal* *Normal-mode* *command-mode* Normal mode In Normal mode you can enter all the normal editor @@ -566,6 +566,11 @@ Ex mode Like Command-line mode, but after entering a command you remain in Ex mode. Very limited editing of the command line. |Ex-mode| +Terminal-Job mode Interacting with a job in a terminal window. Typed + keys go to the job and the job output is displayed in + the terminal window. See |terminal| about how to + switch to other modes. + There are seven ADDITIONAL modes. These are variants of the BASIC modes: *Operator-pending* *Operator-pending-mode* @@ -592,10 +597,9 @@ Insert Normal mode Entered when CTRL-O given in Insert mode. This is If the 'showmode' option is on "-- (insert) --" is shown at the bottom of the window. -Terminal Normal mode Using Normal mode in a terminal window. Making - changes is impossible. Use a insert command, such as - "a" or "i", to return control to the job running in - the terminal. Also called |Terminal-mode|. +Terminal-Normal mode Using Normal mode in a terminal window. Making + changes is impossible. Use an insert command, such as + "a" or "i", to return to Terminal-Job mode. Insert Visual mode Entered when starting a Visual selection from Insert mode, e.g., by using CTRL-O and then "v", "V" or @@ -671,6 +675,8 @@ Normal mode from any other mode. This can be used to make sure Vim is in Normal mode, without causing a beep like <Esc> would. However, this does not work in Ex mode. When used after a command that takes an argument, such as |f| or |m|, the timeout set with 'ttimeoutlen' applies. +When focus is in a terminal window, CTRL-\ CTRL-N goes to Normal mode for only +one command, see |t_CTRL-\_CTRL-N|. *CTRL-\_CTRL-G* *i_CTRL-\_CTRL-G* *c_CTRL-\_CTRL-G* *v_CTRL-\_CTRL-G* The command CTRL-\ CTRL-G or <C-\><C-G> can be used to go to Insert mode when |