summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/edit.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c
index 22f4bbe1c..a030e537a 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -589,7 +589,7 @@ edit(
if (cmdchar == K_PS)
// Got here from normal mode when bracketed paste started.
c = K_PS;
- else if (cmdchar == 'v' && did_loop)
+ else if (cmdchar == 'v' && did_loop && count <= 0)
c = ESC; // in case the stuffed Esc was consumed already
else
do
diff --git a/src/version.c b/src/version.c
index 023548b87..d9fb76410 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 */
/**/
+ 1349,
+/**/
1348,
/**/
1347,