Merge remote-tracking branch 'vim/master'

Author: splhack

src/testdir/test_packadd.vim

@@ -73,7 +73,7 @@ func Test_packadd_symlink_dir()
   endif
   let top2_dir = s:topdir . '/Xdir2'
   let real_dir = s:topdir . '/Xsym'
-  silent !ln -s real_dir top2_dir
+  exec "silent !ln -s" real_dir top2_dir
   let &rtp = top2_dir . ',' . top2_dir . '/after'
   let &packpath = &rtp
 
@@ -98,6 +98,7 @@ func Test_packadd_symlink_dir()
 
   set rtp&
   let rtp = &rtp
+  exec "silent !rm" top2_dir
 endfunc
 
 " Check command-line completion for 'packadd'

src/version.c

@@ -779,6 +779,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    326,
+/**/
+    325,
 /**/
     324,
 /**/