summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2007-06-28 19:33:43 +0000
committervimboss <devnull@localhost>2007-06-28 19:33:43 +0000
commitfb565feffbaf304487065ee28338869d2bf4e0ca (patch)
tree4c99d522b3d8a543c4b9453c913eb6a18eb80c1e
parentf5907ef2d90c20bb398c52bc92cb7e6836d98067 (diff)
downloadvim-fb565feffbaf304487065ee28338869d2bf4e0ca.tar.gz
updated for version 7.1-016v7.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 7d2e1379..eb4631a4 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 3b471323..1ae175b5 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 b68beb09..a69bbd2f 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,