thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1969: popup window filter is used in all modes

Browse Source 
Problem:    Popup window filter is used in all modes.
Solution:   Add the "filtermode" property.
This commit is contained in:
Bram Moolenaar
2019-09-03 22:08:33 +02:00
parent 27da7de7c5
commit 581ba39aef
8 changed files with 132 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/map.c
View File

@@ -897,20 +897,10 @@ map_clear_int(
}
#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Return TRUE if a map exists that has "str" in the rhs for mode "modechars".
* Recognize termcap codes in "str".
* Also checks mappings local to the current buffer.
*/
int
map_to_exists(char_u *str, char_u *modechars, int abbr)
mode_str2flags(char_u *modechars)
{
int mode = 0;
char_u *rhs;
char_u *buf;
int retval;
rhs = replace_termcodes(str, &buf, FALSE, TRUE, FALSE);
if (vim_strchr(modechars, 'n') != NULL)
mode |= NORMAL;
@@ -929,7 +919,24 @@ map_to_exists(char_u *str, char_u *modechars, int abbr)
if (vim_strchr(modechars, 'c') != NULL)
mode |= CMDLINE;
retval = map_to_exists_mode(rhs, mode, abbr);
return mode;
}
/*
* Return TRUE if a map exists that has "str" in the rhs for mode "modechars".
* Recognize termcap codes in "str".
* Also checks mappings local to the current buffer.
*/
int
map_to_exists(char_u *str, char_u *modechars, int abbr)
{
char_u *rhs;
char_u *buf;
int retval;
rhs = replace_termcodes(str, &buf, FALSE, TRUE, FALSE);
retval = map_to_exists_mode(rhs, mode_str2flags(modechars), abbr);
vim_free(buf);
return retval;