IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8499 from janlazo/vim-8.0.0533

Browse Source
This commit is contained in:
Justin M. Keyes 2018-06-10 14:30:19 +02:00 committed by GitHub
commit 23d172a948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/edit.c
View File

@ -7547,9 +7547,7 @@ static bool ins_bs(int c, int mode, int *inserted_space_p)
curwin->w_cursor.coladd = 0; curwin->w_cursor.coladd = 0;
} }
/* // Delete newline!
* delete newline!
*/
if (curwin->w_cursor.col == 0) { if (curwin->w_cursor.col == 0) {
lnum = Insstart.lnum; lnum = Insstart.lnum;
if (curwin->w_cursor.lnum == lnum || revins_on) { if (curwin->w_cursor.lnum == lnum || revins_on) {
@ -7558,7 +7556,7 @@ static bool ins_bs(int c, int mode, int *inserted_space_p)
return false; return false;
} }
Insstart.lnum--; Insstart.lnum--;
Insstart.col = MAXCOL; Insstart.col = (colnr_T)STRLEN(ml_get(Insstart.lnum));
} }
/* /*
* In replace mode: * In replace mode:

11
src/nvim/testdir/test_mapping.vim
View File

@ -161,6 +161,17 @@ func Test_map_meta_quotes()
iunmap <M-"> iunmap <M-">
endfunc endfunc
func Test_abbr_after_line_join()
new
abbr foo bar
set backspace=indent,eol,start
exe "normal o\<BS>foo "
call assert_equal("bar ", getline(1))
bwipe!
unabbr foo
set backspace&
endfunc
func Test_map_timeout() func Test_map_timeout()
nnoremap aaaa :let got_aaaa = 1<CR> nnoremap aaaa :let got_aaaa = 1<CR>
nnoremap bb :let got_bb = 1<CR> nnoremap bb :let got_bb = 1<CR>