Merge #8520 'Ex mode: always "improved" (gQ)'

3 files changed, 20 insertions, 22 deletions

diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index e7fb632de8..5c63d9e5e2 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -642,25 +642,12 @@ The command CTRL-\ CTRL-G or <C-\><C-G> can be used to go to Insert mode when
 make sure Vim is in the mode indicated by 'insertmode', without knowing in
 what mode Vim currently is.
 
-				    *Q* *mode-Ex* *Ex-mode* *Ex* *EX* *E501*
-Q			Switch to "Ex" mode.  This is a bit like typing ":"
-			commands one after another, except:
+				*gQ* *Q* *mode-Ex* *Ex-mode* *Ex* *EX* *E501*
+Q or gQ			Switch to Ex mode.  This is like typing ":" commands
+			one after another, except:
 			- You don't have to keep pressing ":".
 			- The screen doesn't get updated after each command.
-			- There is no normal command-line editing.
-			- Mappings and abbreviations are not used.
-			In fact, you are editing the lines with the "standard"
-			line-input editing commands (<Del> or <BS> to erase,
-			CTRL-U to kill the whole line).
-			Vim will enter this mode by default if it's invoked as
-			"ex" on the command-line.
-			Use the ":vi" command |:visual| to exit "Ex" mode.
-
-					*gQ*
-gQ			Switch to "Ex" mode like with "Q", but really behave
-			like typing ":" commands after another.  All command
-			line editing, completion etc. is available.
-			Use the ":vi" command |:visual| to exit "Ex" mode.
+			Use the ":vi" command |:visual| to exit this mode.
 
 ==============================================================================
 7. The window contents					*window-contents*
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index e89d72bce3..ad1077bcab 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -185,11 +185,12 @@ argument.
 		delete(), rename(), mkdir(), writefile(), libcall(),
 		jobstart(), etc.
 
-							*-e*
--e		Start Vim in Ex mode |Q|.
+-e							*-e* *-E*
+-E		Start Nvim in Ex mode |gQ|.
 
-							*-E*
--E		Start Vim in improved Ex mode |gQ|.
+		If stdin is not a TTY:
+		  -e reads stdin as Ex commands.
+		  -E reads stdin as text (into buffer 1).
 
 							*-es* *-Es*
 -es							*-s-ex* *silent-mode*
@@ -207,6 +208,11 @@ argument.
 <
 		User |init.vim| is skipped (unless given with |-u|).
 		|$TERM| is not used.
+
+		If stdin is not a TTY:
+		  -es reads stdin as Ex commands.
+		  -Es reads stdin as text (into buffer 1).
+
 		Example: >
 			printf "put ='foo'\n%%print\n" | nvim -es
 <
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 5394414947..0035e15be1 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -315,10 +315,15 @@ Macro/|recording| behavior
   macros and 'keymap' at the same time. This also means you can use |:imap| on
   the results of keys from 'keymap'.
 
+Normal commands:
+  |Q| is the same as |gQ|
+
 Options:
   'ttimeout', 'ttimeoutlen' behavior was simplified
 
 Startup:
+  |-e| and |-es| invoke the same "improved Ex mode" as -E and -Es.
+  |-E| and |-Es| reads stdin as text (into buffer 1).
   |-s| reads Normal commands from stdin if the script name is "-".
   Reading text (instead of commands) from stdin |--|:
     - works by default: "-" file is optional
@@ -465,4 +470,4 @@ TUI:
   always uses 7-bit control sequences.
 
 ==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:sw=2:noet:ft=help:norl: