summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-24 17:50:52 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-24 17:50:52 +0100
commit915350edec02f0326ecbe49f3b6cf2cbcd105f7d (patch)
tree76497fbf2f6f16f623407c96b61a03969be3b8af
parent24a2d416ec261829ff7fd29f7b66739c96dd6513 (diff)
patch 8.0.0230: bracketed paste does not support line breaksv8.0.0230
Problem: When using bracketed paste line breaks are not respected. Solution: Turn CR characters into a line break if the text is being inserted. (closes #1404)
-rw-r--r--src/edit.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c
index 61d92170f4..ce6abaf209 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -9498,7 +9498,11 @@ bracketed_paste(paste_mode_T mode, int drop, garray_T *gap)
case PASTE_INSERT:
if (stop_arrow() == OK)
{
- ins_char_bytes(buf, idx);
+ c = buf[0];
+ if (idx == 1 && (c == CAR || c == K_KENTER || c == NL))
+ ins_eol(c);
+ else
+ ins_char_bytes(buf, idx);
AppendToRedobuffLit(buf, idx);
}
break;
diff --git a/src/version.c b/src/version.c
index 829b3b94c8..c7528b7d97 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 */
/**/
+ 230,
+/**/
229,
/**/
228,