Merge #5643 from Shougo/vim-7.4.1686

vim-patch:7.4.1686, 7.4.2007

src/nvim/testdir/runtest.vim

@@ -59,6 +59,9 @@ lang mess C
 " Always use forward slashes.
 set shellslash
 
+" Make sure $HOME does not get read or written.
+let $HOME = '/does/not/exist'
+
 function RunTheTest(test)
   echo 'Executing ' . a:test
   if exists("*SetUp")
@@ -131,6 +134,9 @@ for s:test in sort(s:tests)
 
 endfor
 
+" Don't write viminfo on exit.
+set viminfo=
+
 if s:fail == 0
   " Success, create the .res file so that make knows it's done.
   exe 'split ' . fnamemodify(g:testname, ':r') . '.res'

src/nvim/version.c

@@ -435,7 +435,7 @@ static int included_patches[] = {
   // 2010,
   // 2009,
   // 2008,
-  // 2007,
+  2007,
   // 2006,
   // 2005,
   // 2004 NA
@@ -758,7 +758,7 @@ static int included_patches[] = {
   // 1689 NA
   // 1688 NA
   // 1687 NA
-  // 1686,
+  1686,
   // 1685,
   // 1684 NA
   // 1683 NA