Merge remote-tracking branch 'upstream/master'

1 files changed, 12 insertions, 1 deletions

diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 7f1e5ce543..2f031c0b1f 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -129,7 +129,6 @@ Commands:
 Functions:
   |dictwatcheradd()| notifies a callback whenever a |Dict| is modified
   |dictwatcherdel()|
-  |execute()| works with |:redir|
   |menu_get()|
   |msgpackdump()|, |msgpackparse()| provide msgpack de/serialization
 
@@ -147,6 +146,14 @@ Highlight groups:
   |hl-TermCursorNC|
   |hl-Whitespace| highlights 'listchars' whitespace
 
+UI:
+		*E5408* *E5409* *g:Nvim_color_expr* *g:Nvim_color_cmdline*
+  Command-line coloring is supported. Only |input()| and |inputdialog()| may
+  be colored. For testing purposes expressions (e.g. |i_CTRL-R_=|) and regular
+  command-line (|:|) are colored by callbacks defined in `g:Nvim_color_expr`
+  and `g:Nvim_color_cmdline` respectively (these callbacks are for testing
+  only, and will be removed in a future version). 
+
 ==============================================================================
 4. Changed features					 *nvim-features-changed*
 
@@ -174,6 +181,8 @@ one.  It does not attempt to mix data from the two.
 
 |system()| does not support writing/reading "backgrounded" commands. |E5677|
 
+|:redir| nested in |execute()| works.
+
 Nvim may throttle (skip) messages from shell commands (|:!|, |:grep|, |:make|)
 if there is too much output. No data is lost, this only affects display and
 makes things faster. |:terminal| output is never throttled.
@@ -265,6 +274,8 @@ Lua interface (|if_lua.txt|):
 on cancel and completion respectively) via dictionary argument (replaces all 
 other arguments if used).
 
+|input()| and |inputdialog()| now support user-defined cmdline highlighting.
+
 ==============================================================================
 5. Missing legacy features				 *nvim-features-missing*