summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-24 19:08:15 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-24 19:08:15 +0100
commit48c9f3b123364f368472564a66a9b71dc383558b (patch)
tree79f25764d490921de1e26503f676d491993572f6
parent076e502199b19e6141e4c1e659ff3f21b71934e1 (diff)
patch 8.0.0232: paste does not work when 'esckeys' is offv8.0.0232
Problem: Pasting in Insert mode does not work when bracketed paste is used and 'esckeys' is off. Solution: When 'esckeys' is off disable bracketed paste in Insert mode.
-rw-r--r--src/edit.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index 9e6cc3e8bf..2e1aa2beac 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -534,6 +534,10 @@ edit(
revins_legal = 0;
revins_scol = -1;
#endif
+ if (!p_ek)
+ /* Disable bracketed paste mode, we won't recognize the escape
+ * sequences. */
+ out_str(T_BD);
/*
* Handle restarting Insert mode.
@@ -8623,6 +8627,9 @@ ins_esc(
#ifdef CURSOR_SHAPE
ui_cursor_shape(); /* may show different cursor shape */
#endif
+ if (!p_ek)
+ /* Re-enable bracketed paste mode. */
+ out_str(T_BE);
/*
* When recording or for CTRL-O, need to display the new mode.
diff --git a/src/version.c b/src/version.c
index 190a67dad1..c7ef2bec56 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 232,
+/**/
231,
/**/
230,