updated for version 7.1-016

diff --git a/src/popupmnu.c b/src/popupmnu.c
index 7d2e1379507564ec0bc477a4687dba66a695f45f..eb4631a4ce312685c3c8bffa15e35acd1a07683e 100644 (file)
--- 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 3b47132392e4c81338e60ce96434199a950e67c4..1ae175b55b9fc2e86e212ddf1ed109ad5057f7d4 100644 (file)
--- 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 b68beb09b7a98faf14eda0ab54ddd7872e5d271b..a69bbd2ffdd428ef5f184ac26248b579c96cf187 100644 (file)
--- 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,
 /**/