From f96dfae52fe5ec211f6cfdf539882f2d10806374 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 19 Oct 2016 15:43:04 +0200
Subject: doc; vim-patch.sh

Also include missing changes from:
https://github.com/vim/vim/commit/06d2d38ab7564e1f784b1058a4ef4580cd6d1810
https://github.com/vim/vim/commit/26852128a2b713ef49341a0c18daba928444e7eb
---
 runtime/doc/options.txt  | 3 +++
 runtime/doc/repeat.txt   | 5 +++++
 runtime/doc/starting.txt | 3 ++-
 runtime/doc/vim_diff.txt | 7 +++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'runtime/doc')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bfbf3e5ee5..fb886f34ac 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4943,6 +4943,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  keymap/	key mapping files |mbyte-keymap|
 	  lang/		menu translations |:menutrans|
 	  menu.vim	GUI menus |menu.vim|
+	  pack/		packages |:packadd|
 	  plugin/	plugin scripts |write-plugin|
 	  print/	files for printing |postscript-print-encoding|
 	  spell/	spell checking files |spell|
@@ -4969,6 +4970,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   ordering.  This is for preferences to overrule or add to the 
 	   distributed defaults or system-wide settings (rarely needed).
 
+	More entries are added when using |packages|.
+
 	Note that, unlike 'path', no wildcards like "**" are allowed.  Normal
 	wildcards are allowed, but can significantly slow down searching for
 	runtime files.  For speed, use as few items as possible and avoid
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index e84bbe5439..b44761cdb5 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -223,6 +223,8 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 				pack/*/opt/{name} ~
 			The directory is added to 'runtimepath' if it wasn't
 			there yet.
+			If the directory pack/*/opt/{name}/after exists it is
+			added at the end of 'runtimepath'.
 
 			Note that {name} is the directory name, not the name
 			of the .vim file.  All the files matching the pattern
@@ -492,6 +494,9 @@ To load packages earlier, so that 'runtimepath' gets updated: >
 This also works when loading plugins is disabled.  The automatic loading will
 only happen once.
 
+If the package has an "after" directory, that directory is added to the end of
+'runtimepath', so that anything there will be loaded later.
+
 
 Using a single plugin and loading it automatically ~
 
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index dccbe2562e..bbc0260ffa 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -198,7 +198,8 @@ argument.
 -Z		Restricted mode.  All commands that make use of an external
 		shell are disabled.  This includes suspending with CTRL-Z,
 		":sh", filtering, the system() function, backtick expansion,
-		delete(), rename(), mkdir(), writefile(), libcall(), etc.
+		delete(), rename(), mkdir(), writefile(), libcall(),
+		jobstart(), etc.
 
 							*-e*
 -e		Start Vim in Ex mode |Q|.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index bb1f993ab6..b4df069f21 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -105,6 +105,10 @@ Some `CTRL-SHIFT-...` key chords are distinguished from `CTRL-...` variants
 
 Options:
   'statusline' supports unlimited alignment sections
+  'tabline' %@Func@foo%X can call any function on mouse-click
+
+Variables:
+  |v:windowid| is always available (for use by external UIs)
 
 Commands:
   |:CheckHealth|
@@ -112,7 +116,10 @@ Commands:
   |:Man| is available by default, with many improvements such as completion
 
 Functions:
+  |dictwatcheradd()| notifies a callback whenever a |Dict| is modified
+  |dictwatcherdel()|
   |execute()| works with |:redir|
+  |msgpackdump()|, |msgpackparse()| provide msgpack de/serialization
 
 Events:
   |TabNew|
-- 
cgit