Mercurial > vim

changeset 13788:a27d380b257f v8.0.1766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1766: expanding abbreviation doesn't work commit https://github.com/vim/vim/commit/c3c3e698966fac86dee94799b70947defb85440d Author: Bram Moolenaar <Bram@vim.org> Date: Thu Apr 26 22:30:33 2018 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Thu, 26 Apr 2018 22:45:07 +0200
parents 458d0b50ba95
children 2df62da42cac
files src/edit.c src/testdir/test_mapping.vim src/version.c
diffstat 3 files changed, 20 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/edit.c
+++ b/src/edit.c
@@ -10209,9 +10209,9 @@ ins_eol(int c)
     int	    i;
 
     if (echeck_abbr(c + ABBR_OFF))
-	return FALSE;
+	return OK;
     if (stop_arrow() == FAIL)
-	return TRUE;
+	return FAIL;
     undisplay_dollar();
 
     /*
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -198,3 +198,19 @@ func Test_map_timeout()
   set timeoutlen&
   delfunc ExitInsert
 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
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1766,
+/**/
     1765,
 /**/
     1764,