aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.0806: 'langmap' works differently when there are modifiers

Browse Source 
Problem:    'langmap' works differently when there are modifiers.
Solution:   Only apply 'langmap' to a character where modifiers have no
            effect. (closes #11395, closes #11404)
This commit is contained in:
zeertzjq
2022-10-20 17:59:38 +01:00
committed by Bram Moolenaar
parent d0fab10ed2
commit 49660f5139
3 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/getchar.c
View File

@@ -2590,24 +2590,35 @@ handle_mapping(
{
#ifdef FEAT_LANGMAP
int nomap = nolmaplen;
int c2;
int modifiers = 0;
#endif
// find the match length of this mapping
for (mlen = 1; mlen < typebuf.tb_len; ++mlen)
{
int c2 = typebuf.tb_buf[typebuf.tb_off + mlen];
#ifdef FEAT_LANGMAP
c2 = typebuf.tb_buf[typebuf.tb_off + mlen];
if (nomap > 0)
{
if (nomap == 2 && c2 == KS_MODIFIER)
modifiers = 1;
else if (nomap == 1 && modifiers == 1)
modifiers = c2;
--nomap;
else if (c2 == K_SPECIAL)
nomap = 2;
}
else
LANGMAP_ADJUST(c2, TRUE);
if (mp->m_keys[mlen] != c2)
#else
if (mp->m_keys[mlen] !=
typebuf.tb_buf[typebuf.tb_off + mlen])
{
if (c2 == K_SPECIAL)
nomap = 2;
else if (merge_modifyOtherKeys(c2, &modifiers) == c2)
// Only apply 'langmap' if merging modifiers into
// the key will not result in another character,
// so that 'langmap' behaves consistently in
// different terminals and GUIs.
LANGMAP_ADJUST(c2, TRUE);
modifiers = 0;
}
#endif
if (mp->m_keys[mlen] != c2)
break;
}