vim-patch:7.4.2293 (#6307)

The original patch makes all the modeline comments consistent, but these
have been removed in the neovim source. However there as a correction of
a comment included in the patch that we can use.

edf3f97ae2

src/nvim/eval.c

@@ -4196,7 +4196,7 @@ static int eval7(
   // string and free a string that isn't there.
   rettv->v_type = VAR_UNKNOWN;
 
-  // Skip '!' and '-' characters.  They are handled later.
+  // Skip '!', '-' and '+' characters.  They are handled later.
   start_leader = *arg;
   while (**arg == '!' || **arg == '-' || **arg == '+') {
     *arg = skipwhite(*arg + 1);

src/nvim/version.c

@@ -148,7 +148,7 @@ static int included_patches[] = {
   // 2296,
   2295,
   2294,
-  // 2293,
+  2293,
   2292,
   // 2291,
   // 2290 NA