Mercurial > vim

diff runtime/doc/intro.txt @ 12045:444ad56c0cac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update runtime files. commit https://github.com/vim/vim/commit/1ccd8fff8acfbd5df0fc0e9b4d288af84e51233e Author: Bram Moolenaar <Bram@vim.org> Date: Fri Aug 11 19:50:37 2017 +0200 Update runtime files.
author Christian Brabandt <cb@256bit.org>
date Fri, 11 Aug 2017 20:00:05 +0200
parents 4f7081eb1e26
children 8d76a56861ec
line wrap: on
line diff
--- 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
 ==============================================================================
 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 af
 			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 g
 			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 c
 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