Mercurial > vim
changeset 34229:6be721794e1f v9.1.0060
patch 9.1.0060: Recorded register cannot be translated using keytrans()
Commit: https://github.com/vim/vim/commit/bf321806bf44d59f108fd7e5a0eaead04682701d
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sun Jan 28 19:03:00 2024 +0100
patch 9.1.0060: Recorded register cannot be translated using keytrans()
Problem: Recorded register cannot be translated using keytrans() when
it involves character search (iddqd505)
Solution: Record a K_IGNORE instead of a K_NOP (zeertzjq)
related: #13916
closes: #13925
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 28 Jan 2024 19:15:03 +0100 |
| parents | 734467c89330 |
| children | ac30e796797b |
| files | runtime/syntax/vim.vim src/getchar.c src/normal.c src/proto/getchar.pro src/testdir/test_registers.vim src/version.c |
| diffstat | 6 files changed, 15 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -13,7 +13,7 @@ " 2024 Jan 23 by Vim Project (add :[23]match commands) " 2024 Jan 25 by Vim Project (WinNewPre autocommand) " 2024 Jan 27 by Vim Project (add foreach() function) -" 2024 Jan 28 by Vim Project (improve line-continuation matching) +" 2024 Jan 28 by Vim Project (improve line-continuation matching & string interpolation) " Version: 9.0-25 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM " Automatically generated keyword lists: {{{1
--- a/src/getchar.c +++ b/src/getchar.c @@ -1339,12 +1339,12 @@ gotchars(char_u *chars, int len) } /* - * Record a <Nop> key. + * Record an <Ignore> key. */ void -gotchars_nop(void) +gotchars_ignore(void) { - char_u nop_buf[3] = { K_SPECIAL, KS_EXTRA, KE_NOP }; + char_u nop_buf[3] = { K_SPECIAL, KS_EXTRA, KE_IGNORE }; gotchars(nop_buf, 3); } @@ -3666,9 +3666,9 @@ vgetorpeek(int advance) #endif if (timedout && c == ESC) { - // When recording there will be no timeout. Add a <Nop> after the ESC - // to avoid that it forms a key code with following characters. - gotchars_nop(); + // When recording there will be no timeout. Add an <Ignore> after the + // ESC to avoid that it forms a key code with following characters. + gotchars_ignore(); } --vgetc_busy;
--- a/src/normal.c +++ b/src/normal.c @@ -568,10 +568,10 @@ normal_cmd_get_more_chars( ++no_mapping; // Vim may be in a different mode when the user types the next key, // but when replaying a recording the next key is already in the - // typeahead buffer, so record a <Nop> before that to prevent the - // vpeekc() above from applying wrong mappings when replaying. + // typeahead buffer, so record an <Ignore> before that to prevent + // the vpeekc() above from applying wrong mappings when replaying. ++no_u_sync; - gotchars_nop(); + gotchars_ignore(); --no_u_sync; } }
--- a/src/proto/getchar.pro +++ b/src/proto/getchar.pro @@ -30,7 +30,7 @@ int typebuf_changed(int tb_change_cnt); int typebuf_typed(void); int typebuf_maplen(void); void del_typebuf(int len, int offset); -void gotchars_nop(void); +void gotchars_ignore(void); void ungetchars(int len); int save_typebuf(void); void save_typeahead(tasave_T *tp);
--- a/src/testdir/test_registers.vim +++ b/src/testdir/test_registers.vim @@ -868,6 +868,8 @@ func Test_replay_charsearch_omap() call timer_start(10, {-> feedkeys(",bar\<Esc>q", 't')}) call feedkeys('qrct[', 'xt!') call assert_equal(',bar[blah]', getline(1)) + call assert_equal("ct[\<Ignore>,bar\<Esc>", @r) + call assert_equal('ct[<Ignore>,bar<Esc>', keytrans(@r)) undo call assert_equal('foo[blah]', getline(1)) call feedkeys('@r', 'xt!')