aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/eval.c4
-rw-r--r--src/nvim/version.c29
2 files changed, 33 insertions, 0 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 1dab9df9cb..d6a8351330 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -5418,6 +5418,10 @@ list_join_inner (
*/
static int list_join(garray_T *gap, list_T *l, char_u *sep, int echo_style, int copyID)
{
+ if (l->lv_len < 1) {
+ return OK;
+ }
+
garray_T join_ga;
int retval;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 49f374bce4..bccce50ece 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -67,6 +67,35 @@ static char *features[] = {
// clang-format off
static int included_patches[] = {
+ 702,
+ //701,
+ //700,
+ //699,
+ //698,
+ //697,
+ //696,
+ //695,
+ //694,
+ //693,
+ //692,
+ //691,
+ //690,
+ //689,
+ //688,
+ //687,
+ //686,
+ //685,
+ //684,
+ //683,
+ //682,
+ //681,
+ //680,
+ //679,
+ //678,
+ //677,
+ //676,
+ //675,
+ //674,
673,
//672,
//671,