summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_getln.c7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index c823119ad..0c7dd8036 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3133,7 +3133,8 @@ cmdline_paste_str(s, literally)
else
#endif
c = *s++;
- if (cv == Ctrl_V || c == ESC || c == Ctrl_C || c == CAR || c == NL
+ if (cv == Ctrl_V || c == ESC || c == Ctrl_C
+ || c == CAR || c == NL || c == Ctrl_L
#ifdef UNIX
|| c == intr_char
#endif
@@ -4692,7 +4693,7 @@ ExpandFromContext(xp, pat, num_file, file, options)
if (tab[i].ic)
regmatch.rm_ic = TRUE;
ret = ExpandGeneric(xp, &regmatch, num_file, file,
- tab[i].func, tab[i].escaped);
+ tab[i].func, tab[i].escaped);
break;
}
}
@@ -5125,7 +5126,7 @@ ExpandRTDir(pat, num_file, file, dirnames)
vim_free(matches);
}
if (ga.ga_len == 0)
- return FAIL;
+ return FAIL;
/* Sort and remove duplicates which can happen when specifying multiple
* directories in dirnames. */
diff --git a/src/version.c b/src/version.c
index ebe198810..e798a87d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 574,
+/**/
573,
/**/
572,