| To: vim_dev@googlegroups.com |
| Subject: Patch 7.4.552 |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| |
| Patch 7.4.552 |
| Problem: Langmap applies to Insert mode expression mappings. |
| Solution: Check for Insert mode. (Daniel Hahler) |
| Files: src/getchar.c, src/testdir/test_mapping.in, |
| src/testdir/test_mapping.ok |
| |
| |
| |
| |
| |
| *** 2145,2151 **** |
| nolmaplen = 2; |
| else |
| { |
| ! LANGMAP_ADJUST(c1, TRUE); |
| nolmaplen = 0; |
| } |
| #endif |
| --- 2145,2151 ---- |
| nolmaplen = 2; |
| else |
| { |
| ! LANGMAP_ADJUST(c1, (State & INSERT) == 0); |
| nolmaplen = 0; |
| } |
| #endif |
| |
| |
| |
| *** 8,13 **** |
| --- 8,22 ---- |
| :inoreab чкпр vim |
| GAчкпр |
| |
| + |
| + : " langmap should not get remapped in insert mode |
| + :inoremap { FAIL_ilangmap |
| + :set langmap=+{ langnoremap |
| + o+ |
| + : " expr mapping with langmap |
| + :inoremap <expr> { "FAIL_iexplangmap" |
| + o+ |
| + |
| :/^test/,$w! test.out |
| :qa! |
| ENDTEST |
| |
| |
| |
| *** 1,2 **** |
| --- 1,4 ---- |
| test starts here: |
| vim |
| + + |
| + + |
| |
| |
| |
| *** 743,744 **** |
| --- 743,746 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 552, |
| /**/ |
| |
| -- |
| Engineers are widely recognized as superior marriage material: intelligent, |
| dependable, employed, honest, and handy around the house. |
| (Scott Adams - The Dilbert principle) |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| \\\ an exciting new programming language -- http://www.Zimbu.org /// |
| \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |