summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-06-28 19:33:43 +0000
committerBram Moolenaar <Bram@vim.org>2007-06-28 19:33:43 +0000
commit7f51474324cf1a31284f291e7097d989522f9d45 (patch)
tree4c99d522b3d8a543c4b9453c913eb6a18eb80c1e
parentf15f943e0c3daad54fc76c01a3dbbe2a4f8d2087 (diff)
updated for version 7.1-016v7.1.016
-rw-r--r--src/popupmnu.c2
-rw-r--r--src/quickfix.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
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
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 16,
+/**/
15,
/**/
14,