mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.0.0127
Problem: Cancelling completion still inserts text when formatting is done for 'textwidth'. (lacygoill) Solution: Don't format when CTRL-E was typed. (Hirohito Higashi, closes #1312)
This commit is contained in:
@@ -3875,7 +3875,7 @@ ins_compl_prep(int c)
|
|||||||
if (prev_col > 0)
|
if (prev_col > 0)
|
||||||
dec_cursor();
|
dec_cursor();
|
||||||
/* only format when something was inserted */
|
/* only format when something was inserted */
|
||||||
if (!arrow_used && !ins_need_undo)
|
if (!arrow_used && !ins_need_undo && c != Ctrl_E)
|
||||||
insertchar(NUL, 0, -1);
|
insertchar(NUL, 0, -1);
|
||||||
if (prev_col > 0
|
if (prev_col > 0
|
||||||
&& ml_get_curline()[curwin->w_cursor.col] != NUL)
|
&& ml_get_curline()[curwin->w_cursor.col] != NUL)
|
||||||
|
@@ -464,4 +464,22 @@ func Test_completefunc_with_scratch_buffer()
|
|||||||
set completeopt&
|
set completeopt&
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
" <C-E> - select original typed text before the completion started without
|
||||||
|
" auto-wrap text.
|
||||||
|
func Test_completion_ctrl_e_without_autowrap()
|
||||||
|
new
|
||||||
|
let tw_save=&tw
|
||||||
|
set tw=78
|
||||||
|
let li = [
|
||||||
|
\ '" zzz',
|
||||||
|
\ '" zzzyyyyyyyyyyyyyyyyyyy']
|
||||||
|
call setline(1, li)
|
||||||
|
0
|
||||||
|
call feedkeys("A\<C-X>\<C-N>\<C-E>\<Esc>", "tx")
|
||||||
|
call assert_equal(li, getline(1, '$'))
|
||||||
|
|
||||||
|
let &tw=tw_save
|
||||||
|
q!
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -764,6 +764,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
127,
|
||||||
/**/
|
/**/
|
||||||
126,
|
126,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user