Mercurial > vim
comparison src/getchar.c @ 20701:fbee68c6aab1 v8.2.0904
patch 8.2.0904: assuming modifyOtherKeys for rhs of mapping
Commit: https://github.com/vim/vim/commit/46cd43bda102c3782bba1c4c629836e010734d77
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jun 4 22:22:11 2020 +0200
patch 8.2.0904: assuming modifyOtherKeys for rhs of mapping
Problem: Assuming modifyOtherKeys for rhs of mapping.
Solution: Ignore seenModifyOtherKeys for mapped characters. (closes https://github.com/vim/vim/issues/6200)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 04 Jun 2020 22:30:04 +0200 |
parents | 3609e842f822 |
children | 5ffe112b1afd |
comparison
equal
deleted
inserted
replaced
20700:f1f248c9b90d | 20701:fbee68c6aab1 |
---|---|
2353 // Only consider an entry if the first character matches and it is | 2353 // Only consider an entry if the first character matches and it is |
2354 // for the current state. | 2354 // for the current state. |
2355 // Skip ":lmap" mappings if keys were mapped. | 2355 // Skip ":lmap" mappings if keys were mapped. |
2356 if (mp->m_keys[0] == tb_c1 | 2356 if (mp->m_keys[0] == tb_c1 |
2357 && (mp->m_mode & local_State) | 2357 && (mp->m_mode & local_State) |
2358 && !(mp->m_simplified && seenModifyOtherKeys) | 2358 && !(mp->m_simplified && seenModifyOtherKeys |
2359 && typebuf.tb_maplen == 0) | |
2359 && ((mp->m_mode & LANGMAP) == 0 || typebuf.tb_maplen == 0)) | 2360 && ((mp->m_mode & LANGMAP) == 0 || typebuf.tb_maplen == 0)) |
2360 { | 2361 { |
2361 #ifdef FEAT_LANGMAP | 2362 #ifdef FEAT_LANGMAP |
2362 int nomap = nolmaplen; | 2363 int nomap = nolmaplen; |
2363 int c2; | 2364 int c2; |