diff --git a/src/popupmnu.c b/src/popupmnu.c
index 7d2e137950..eb4631a4ce 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -466,7 +466,7 @@ pum_set_selected(n, repeat)
 			set_option_value((char_u *)"bh", 0L,
 						 (char_u *)"wipe", OPT_LOCAL);
 			set_option_value((char_u *)"diff", 0L,
-						     (char_u *)"", OPT_LOCAL);
+							     NULL, OPT_LOCAL);
 		    }
 		}
 		if (res == OK)
diff --git a/src/quickfix.c b/src/quickfix.c
index 3b47132392..1ae175b55b 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2331,7 +2331,7 @@ ex_copen(eap)
 	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
 								   OPT_LOCAL);
 	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
-	    set_option_value((char_u *)"diff", 0L, (char_u *)"", OPT_LOCAL);
+	    set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL);
 	}
 
 	/* Only set the height when still in the same tab page and there is no
diff --git a/src/version.c b/src/version.c
index b68beb09b7..a69bbd2ffd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    16,
 /**/
     15,
 /**/