diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-11 08:58:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 08:58:43 +0200 |
| commit | 384770556ba02433904baf78f499b9bb48010040 (patch) | |
| tree | 80624c11deb30d3ccb5e7b06109bd19c1e178bae | |
| parent | 2bf1aa5628674e4cda60ac9926bde57bc115e7b7 (diff) | |
| parent | 0cd786b9059f55f48602683af6b10e4bfe54cfa7 (diff) | |
| download | rneovim-384770556ba02433904baf78f499b9bb48010040.tar.gz rneovim-384770556ba02433904baf78f499b9bb48010040.tar.bz2 rneovim-384770556ba02433904baf78f499b9bb48010040.zip | |
Merge #9106 from janlazo/vim-8.0.1837
vim-patch:8.0.1837
| -rw-r--r-- | src/nvim/ex_getln.c | 24 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mapping.vim | 16 |
2 files changed, 37 insertions, 3 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 1ec00b1e25..247b9175aa 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -3522,10 +3522,28 @@ void gotocmdline(int clr) */ static int ccheck_abbr(int c) { - if (p_paste || no_abbr) /* no abbreviations or in paste mode */ - return FALSE; + int spos = 0; + + if (p_paste || no_abbr) { // no abbreviations or in paste mode + return false; + } + + // Do not consider '<,'> be part of the mapping, skip leading whitespace. + // Actually accepts any mark. + while (ascii_iswhite(ccline.cmdbuff[spos]) && spos < ccline.cmdlen) { + spos++; + } + if (ccline.cmdlen - spos > 5 + && ccline.cmdbuff[spos] == '\'' + && ccline.cmdbuff[spos + 2] == ',' + && ccline.cmdbuff[spos + 3] == '\'') { + spos += 5; + } else { + // check abbreviation from the beginning of the commandline + spos = 0; + } - return check_abbr(c, ccline.cmdbuff, ccline.cmdpos, 0); + return check_abbr(c, ccline.cmdbuff, ccline.cmdpos, spos); } static int sort_func_compare(const void *s1, const void *s2) diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index f4fe1c2705..071b8b369b 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -198,3 +198,19 @@ func Test_map_timeout() set timeoutlen& delfunc ExitInsert endfunc + +func Test_cabbr_visual_mode() + cabbr s su + call feedkeys(":s \<c-B>\"\<CR>", 'itx') + call assert_equal('"su ', getreg(':')) + call feedkeys(":'<,'>s \<c-B>\"\<CR>", 'itx') + let expected = '"'. "'<,'>su " + call assert_equal(expected, getreg(':')) + call feedkeys(": '<,'>s \<c-B>\"\<CR>", 'itx') + let expected = '" '. "'<,'>su " + call assert_equal(expected, getreg(':')) + call feedkeys(":'a,'bs \<c-B>\"\<CR>", 'itx') + let expected = '"'. "'a,'bsu " + call assert_equal(expected, getreg(':')) + cunabbr s +endfunc |