aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.1837: one character cmdline abbreviation not triggered after '<,'>

Browse Source 
Problem:    One character cmdline abbreviation not triggered after '<,'>.
Solution:   Skip over the special range. (Christian Brabandt, closes #2320)
This commit is contained in:
Bram Moolenaar
2018-05-13 18:36:27 +02:00
parent 25782a7ff4
commit 5e3423d192
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ex_getln.c
View File

@@ -3572,10 +3572,25 @@ gotocmdline(int clr)
static int
ccheck_abbr(int c)
{
int spos = 0;
if (p_paste || no_abbr) /* no abbreviations or in paste mode */
return FALSE;
return check_abbr(c, ccline.cmdbuff, ccline.cmdpos, 0);
/* Do not consider '<,'> be part of the mapping, skip leading whitespace.
* Actually accepts any mark. */
while (VIM_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, spos);
}
#if defined(FEAT_CMDL_COMPL) || defined(PROTO)