diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2016-02-23 23:32:21 +0100 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2016-02-23 23:32:21 +0100 |
| commit | b10c9b4f5b28a50c752ddadc8dc4319546c9d039 (patch) | |
| tree | 2c544bc2c01abea43f59e9a48598f3d74df45760 /src/nvim/getchar.c | |
| parent | 18605d678517ca7347a8fae234e5f39f79fb6904 (diff) | |
| parent | 2a4ea9a54674b642c39fc0745c7feca11f14ec46 (diff) | |
| download | rneovim-b10c9b4f5b28a50c752ddadc8dc4319546c9d039.tar.gz rneovim-b10c9b4f5b28a50c752ddadc8dc4319546c9d039.tar.bz2 rneovim-b10c9b4f5b28a50c752ddadc8dc4319546c9d039.zip | |
Merge pull request #1817 from bfredl/bufmatch
support buffer-associated highlighting by external plugins
Diffstat (limited to 'src/nvim/getchar.c')
| -rw-r--r-- | src/nvim/getchar.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 73b3de0b5d..437495faa4 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -2915,9 +2915,9 @@ do_map ( did_it = TRUE; } } - if (mp->m_mode == 0) { /* entry can be deleted */ - map_free(mpp); - continue; /* continue with *mpp */ + if (mp->m_mode == 0) { // entry can be deleted + mapblock_free(mpp); + continue; // continue with *mpp } /* @@ -3012,7 +3012,7 @@ theend: * Delete one entry from the abbrlist or maphash[]. * "mpp" is a pointer to the m_next field of the PREVIOUS entry! */ -static void map_free(mapblock_T **mpp) +static void mapblock_free(mapblock_T **mpp) { mapblock_T *mp; @@ -3080,7 +3080,7 @@ int get_map_mode(char_u **cmdp, int forceit) * Clear all mappings or abbreviations. * 'abbr' should be FALSE for mappings, TRUE for abbreviations. */ -void map_clear(char_u *cmdp, char_u *arg, int forceit, int abbr) +void map_clear_mode(char_u *cmdp, char_u *arg, int forceit, int abbr) { int mode; int local; @@ -3132,8 +3132,8 @@ map_clear_int ( mp = *mpp; if (mp->m_mode & mode) { mp->m_mode &= ~mode; - if (mp->m_mode == 0) { /* entry can be deleted */ - map_free(mpp); + if (mp->m_mode == 0) { // entry can be deleted + mapblock_free(mpp); continue; } /* |