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