summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/getchar.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 49eb3d7df9..6602eeac53 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -254,7 +254,7 @@ delete_buff_tail(buffheader_T *buf, int slen)
{
int len;
- if (buf->bh_curr == NULL || buf->bh_curr->b_str == NULL)
+ if (buf->bh_curr == NULL)
return; // nothing to delete
len = (int)STRLEN(buf->bh_curr->b_str);
if (len >= slen)
diff --git a/src/version.c b/src/version.c
index 7247ca7537..49942b5e02 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4235,
+/**/
4234,
/**/
4233,