# HG changeset patch # User Christian Brabandt # Date 1485377104 -3600 # Node ID 689e88afdd118c02979efab2bd2ba20461485eed # Parent 992b0ca524a936083020796894b400abf8dcfd6c patch 8.0.0238: bracketed paste does not disable autoindent commit https://github.com/vim/vim/commit/9e817c8a31232eda57963215eb16ee5b1ceefa7b Author: Bram Moolenaar Date: Wed Jan 25 21:36:17 2017 +0100 patch 8.0.0238: bracketed paste does not disable autoindent Problem: When using bracketed paste autoindent causes indent to be increased. Solution: Disable 'ai' and set 'paste' temporarily. (Ken Takata) diff --git a/src/edit.c b/src/edit.c --- a/src/edit.c +++ b/src/edit.c @@ -9463,12 +9463,17 @@ bracketed_paste(paste_mode_T mode, int d char_u *end = find_termcode((char_u *)"PE"); int ret_char = -1; int save_allow_keys = allow_keys; + int save_paste = p_paste; + int save_ai = curbuf->b_p_ai; /* If the end code is too long we can't detect it, read everything. */ if (STRLEN(end) >= NUMBUFLEN) end = NULL; ++no_mapping; allow_keys = 0; + p_paste = TRUE; + curbuf->b_p_ai = FALSE; + for (;;) { /* When the end is not defined read everything. */ @@ -9534,8 +9539,11 @@ bracketed_paste(paste_mode_T mode, int d } idx = 0; } + --no_mapping; allow_keys = save_allow_keys; + p_paste = save_paste; + curbuf->b_p_ai = save_ai; return ret_char; } diff --git a/src/testdir/test_paste.vim b/src/testdir/test_paste.vim --- a/src/testdir/test_paste.vim +++ b/src/testdir/test_paste.vim @@ -35,6 +35,16 @@ func Test_paste_insert_mode() call assert_equal('bar donfoo', getline(3)) call assert_equal('bar doneeb', getline(4)) call assert_equal('c', getline(5)) + + set ai et tw=10 + call setline(1, ['a', ' b', 'c']) + 2 + call feedkeys("A\[200~foo\ bar bar bar\[201~\", 'xt') + call assert_equal(' bfoo', getline(2)) + call assert_equal(' bar bar bar', getline(3)) + call assert_equal('c', getline(4)) + + set ai& et& tw=0 bwipe! endfunc diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 238, +/**/ 237, /**/ 236,