diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2026-04-11 19:07:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-12 07:07:16 +0800 |
| commit | 56fe6713ca14a88895af4e4072f873bf80ff337b (patch) | |
| tree | 7e9b05de10ca6572538c5382763df8dc1a94890c | |
| parent | 6f015cdcdf0b617c9b716e833823498ce7c001c8 (diff) | |
vim-patch:8.2.0904: assuming modifyOtherKeys for rhs of mapping (#38970)
Problem: Assuming modifyOtherKeys for rhs of mapping.
Solution: Ignore seenModifyOtherKeys for mapped characters. (closes vim/vim#6200)
https://github.com/vim/vim/commit/46cd43bda102c3782bba1c4c629836e010734d77
----
"getchar.c" changes depend on patch 8.1.2145.
Can't port it due to tests.
"test_gui.vim" doesn't depend on GUI for all tests.
----
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rwxr-xr-x | scripts/vim-patch.sh | 2 | ||||
| -rw-r--r-- | test/old/testdir/test_gui.vim | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 5e4848f365..c6c35f3dba 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -219,7 +219,7 @@ preprocess_patch() { 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git [ab]/src/testdir/\<\%('"${na_src_testdir}"'\)\>@exe "norm! d/\\v(^diff)|%$\r"' +w +q "$file" # Remove testdir/test_*.vim files - local na_src_testdir='balloon.*\|behave\.vim\|channel.*\|crypt\.vim\|cscope\.vim\|gui.*\|hardcopy\.vim\|job_fails\.vim\|json\.vim\|listener\.vim\|mzscheme\.vim\|netbeans.*\|paste\.vim\|popupwin.*\|python2\.vim\|pyx2\.vim\|restricted\.vim\|shortpathname\.vim\|sound\.vim\|tcl\.vim\|terminal.*\|xxd\.vim' + local na_src_testdir='balloon.*\|behave\.vim\|channel.*\|crypt\.vim\|cscope\.vim\|hardcopy\.vim\|job_fails\.vim\|json\.vim\|listener\.vim\|mzscheme\.vim\|netbeans.*\|paste\.vim\|popupwin.*\|python2\.vim\|pyx2\.vim\|restricted\.vim\|shortpathname\.vim\|sound\.vim\|tcl\.vim\|terminal.*\|xxd\.vim' 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git [ab]/src/testdir/\<test_\%('"${na_src_testdir}"'\)\>@exe "norm! d/\\v(^diff)|%$\r"' +w +q "$file" # Remove runtime/*/testdir/ files diff --git a/test/old/testdir/test_gui.vim b/test/old/testdir/test_gui.vim index f2136f58ac..9674cb43e2 100644 --- a/test/old/testdir/test_gui.vim +++ b/test/old/testdir/test_gui.vim @@ -44,6 +44,16 @@ func Test_colorscheme() redraw! endfunc +func Test_gui_recursive_mapping() + nmap ' <C-W> + nmap <C-W>a :let didit = 1<CR> + call feedkeys("'a", 'xt') + call assert_equal(1, didit) + + nunmap ' + nunmap <C-W>a +endfunc + " Test that Buffers menu generates the correct index for different buffer " names for sorting. func Test_Buffers_Menu() |