summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/option.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 717812c9ce..1b581ed355 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1990,6 +1990,8 @@ do_set_option_string(
// Set the new value.
*(char_u **)(varp) = newval;
+ if (newval == NULL)
+ *(char_u **)(varp) = empty_option;
#if defined(FEAT_EVAL)
if (!starting
diff --git a/src/version.c b/src/version.c
index a6451cb6a1..c59a3a1df4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1311,
+/**/
1310,
/**/
1309,