diff --git a/src/main.c b/src/main.c index 587081bda1..7718e97c8f 100644 --- a/src/main.c +++ b/src/main.c @@ -2245,7 +2245,12 @@ scripterror: /* Remember this argument has been added to the argument list. * Needed when 'encoding' is changed. */ used_file_arg(argv[0], parmp->literal, parmp->full_path, - parmp->diff_mode); +# ifdef FEAT_DIFF + parmp->diff_mode +# else + FALSE +# endif + ); } #endif } diff --git a/src/version.c b/src/version.c index cd69cfc022..f46ebda2c5 100644 --- a/src/version.c +++ b/src/version.c @@ -676,6 +676,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 12, /**/ 11, /**/