mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.0.1766: expanding abbreviation doesn't work
Problem: Expanding abbreviation doesn't work. (Tooth Pik) Solution: Return OK instead of FALSE and FAIL instead of TRUE. (Christian Brabandt)
This commit is contained in:
parent
db0eedec16
commit
c3c3e69896
@ -10209,9 +10209,9 @@ ins_eol(int c)
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (echeck_abbr(c + ABBR_OFF))
|
if (echeck_abbr(c + ABBR_OFF))
|
||||||
return FALSE;
|
return OK;
|
||||||
if (stop_arrow() == FAIL)
|
if (stop_arrow() == FAIL)
|
||||||
return TRUE;
|
return FAIL;
|
||||||
undisplay_dollar();
|
undisplay_dollar();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -198,3 +198,19 @@ func Test_map_timeout()
|
|||||||
set timeoutlen&
|
set timeoutlen&
|
||||||
delfunc ExitInsert
|
delfunc ExitInsert
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_abbreviation_CR()
|
||||||
|
new
|
||||||
|
func Eatchar(pat)
|
||||||
|
let c = nr2char(getchar(0))
|
||||||
|
return (c =~ a:pat) ? '' : c
|
||||||
|
endfunc
|
||||||
|
iabbrev <buffer><silent> ~~7 <c-r>=repeat('~', 7)<CR><c-r>=Eatchar('\s')<cr>
|
||||||
|
call feedkeys("GA~~7 \<esc>", 'xt')
|
||||||
|
call assert_equal('~~~~~~~', getline('$'))
|
||||||
|
%d
|
||||||
|
call feedkeys("GA~~7\<cr>\<esc>", 'xt')
|
||||||
|
call assert_equal(['~~~~~~~', ''], getline(1,'$'))
|
||||||
|
delfunc Eatchar
|
||||||
|
bw!
|
||||||
|
endfunc
|
||||||
|
@ -761,6 +761,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 */
|
||||||
|
/**/
|
||||||
|
1766,
|
||||||
/**/
|
/**/
|
||||||
1765,
|
1765,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user