summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/textobject.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/textobject.c b/src/textobject.c
index 9a8a91626..153c14ddd 100644
--- a/src/textobject.c
+++ b/src/textobject.c
@@ -1798,11 +1798,17 @@ current_quote(
// Find out if we have a quote in the selection.
while (i <= col_end)
+ {
+ // check for going over the end of the line, which can happen if
+ // the line was changed after the Visual area was selected.
+ if (line[i] == NUL)
+ break;
if (line[i++] == quotechar)
{
selected_quote = TRUE;
break;
}
+ }
}
if (!vis_empty && line[col_start] == quotechar)
diff --git a/src/version.c b/src/version.c
index b9b334785..df9d576ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5120,
+/**/
5119,
/**/
5118,