Merge #5872 justinmk/test_autochdir

5 files changed, 45 insertions, 9 deletions

diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 3bdb682a31..355a1da423 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.4.  Last change: 2013 May 18
+*mbyte.txt*     For Vim version 7.4.  Last change: 2016 Jul 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -849,6 +849,7 @@ text, you can use the 'keymap' option.  This will translate one or more
 (English) characters to another (non-English) character.  This only happens
 when typing text, not when typing Vim commands.  This avoids having to switch
 between two keyboard settings.
+{only available when compiled with the |+keymap| feature}
 
 The value of the 'keymap' option specifies a keymap file to use.  The name of
 this file is one of these two:
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index b44761cdb5..6cd2ada513 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.4.  Last change: 2016 Apr 05
+*repeat.txt*    For Vim version 7.4.  Last change: 2016 Jul 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -286,7 +286,9 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 				... not converted ...
 
 <			When conversion isn't supported by the system, there
-			is no error message and no conversion is done.
+			is no error message and no conversion is done.  When a
+			line can't be converted there is no error and the
+			original line is kept.
 
 			Don't use "ucs-2" or "ucs-4", scripts cannot be in
 			these encodings (they would contain NUL bytes).
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 4886828c82..6194a636b3 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1040,6 +1040,21 @@ This works immediately.
 
 CLOJURE							*ft-clojure-syntax*
 
+The default syntax groups can be augmented through the
+*g:clojure_syntax_keywords* and *b:clojure_syntax_keywords* variables. The
+value should be a |Dictionary| of syntax group names to a |List| of custom
+identifiers:
+>
+	let g:clojure_syntax_keywords = {
+	    \ 'clojureMacro': ["defproject", "defcustom"],
+	    \ 'clojureFunc': ["string/join", "string/replace"]
+	    \ }
+<
+Refer to the Clojure syntax script for valid syntax group names.
+
+If the |buffer-variable| *b:clojure_syntax_without_core_keywords* is set, only
+language constants and special forms are matched.
+
 Setting *g:clojure_fold* enables folding Clojure code via the syntax engine.
 Any list, vector, or map that extends over more than one line can be folded
 using the standard Vim |fold-commands|.
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 49fcdf0bb7..bf8d31fef9 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -592,7 +592,7 @@ String manipulation:					*string-functions*
 	match()			position where a pattern matches in a string
 	matchend()		position where a pattern match ends in a string
 	matchstr()		match of a pattern in a string
-	matchstrpos()		match and postions of a pattern in a string
+	matchstrpos()		match and positions of a pattern in a string
 	matchlist()		like matchstr() and also return submatches
 	stridx()		first index of a short string in a long string
 	strridx()		last index of a short string in a long string
@@ -799,6 +799,7 @@ Command line:					*command-line-functions*
 	setcmdpos()		set position of the cursor in the command line
 	getcmdtype()		return the current command-line type
 	getcmdwintype()		return the current command-line window type
+	getcompletion()		list of command-line completion matches
 
 Quickfix and location lists:			*quickfix-functions*
 	getqflist()		list of quickfix errors
@@ -896,6 +897,7 @@ Mappings:				    *mapping-functions*
 Testing:				    *test-functions*
 	assert_equal()		assert that two expressions values are equal
 	assert_notequal()	assert that two expressions values are not equal
+	assert_inrange()	assert that an expression is inside a range
 	assert_match()		assert that a pattern matches the value
 	assert_notmatch()	assert that a pattern does not match the value
 	assert_false()		assert that an expression is false
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index cdd616b6c1..7c9d383a01 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -77,12 +77,15 @@ Clipboard integration		|provider-clipboard|
 
 USER EXPERIENCE  ~
 
-A major goal of Nvim is to work intuitively and consistently. For example,
-Nvim does not have `-X`, a platform-specific option available in some Vim
-builds (with potential surprises: http://stackoverflow.com/q/14635295). Nvim
-avoids features that cannot be provided on all platforms--instead that is
-delegated to external plugins/extensions.
+Working intuitively and consistently is a major goal of Nvim. Examples:
 
+- Nvim does not have `-X`, a platform-specific option "sometimes" available in
+  Vim (with potential surprises: http://stackoverflow.com/q/14635295). Nvim
+  avoids features that cannot be provided on all platforms--instead that is
+  delegated to external plugins/extensions.
+
+- Test-only globals and functions such as test_autochdir(), test_settime(),
+  etc., are not exposed (because they don't exist).
 
 ARCHITECTURE ~
 
@@ -271,6 +274,19 @@ MS-DOS support:
 Highlight groups:
   |hl-VisualNOS|
 
+Test functions:
+  test_alloc_fail()
+  test_autochdir()
+  test_disable_char_avail()
+  test_garbagecollect_now()
+  test_null_channel()
+  test_null_dict()
+  test_null_job()
+  test_null_list()
+  test_null_partial()
+  test_null_string()
+  test_settime()
+
 Other options:
   'antialias'
   'cpoptions' ("g", "w", "H", "*", "-", "j", and all POSIX flags were removed)