1
0
forked from aniani/vim

patch 9.1.0765: No test for patches 6.2.418 and 7.3.489

Problem:  No test for patches 6.2.418 and 7.3.489
Solution: Add a test.  Fix some whitespace problems in test_mapping.vim.
          Document the behavior (zeertzjq).

closes: #15815

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-10-07 21:05:06 +02:00
committed by Christian Brabandt
parent 4f51f3a573
commit 5df3cb2898
5 changed files with 54 additions and 28 deletions

View File

@@ -1,4 +1,4 @@
*map.txt* For Vim version 9.1. Last change: 2024 Sep 26 *map.txt* For Vim version 9.1. Last change: 2024 Oct 07
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -84,6 +84,8 @@ modes.
where the map command applies. Disallow mapping of where the map command applies. Disallow mapping of
{rhs}, to avoid nested and recursive mappings. Often {rhs}, to avoid nested and recursive mappings. Often
used to redefine a command. used to redefine a command.
Note: Keys in {rhs} also won't trigger abbreviation,
with the exception of |i_CTRL-]| and |c_CTRL-]|.
Note: When <Plug> appears in the {rhs} this part is Note: When <Plug> appears in the {rhs} this part is
always applied even if remapping is disallowed. always applied even if remapping is disallowed.

View File

@@ -3920,7 +3920,7 @@ func Test_ex_command_completion()
set cpo-=* set cpo-=*
endfunc endfunc
func Test_cd_bslsh_completion_windows() func Test_cd_bslash_completion_windows()
CheckMSWindows CheckMSWindows
let save_shellslash = &shellslash let save_shellslash = &shellslash
set noshellslash set noshellslash

View File

@@ -7,40 +7,62 @@ source term_util.vim
import './vim9.vim' as v9 import './vim9.vim' as v9
func Test_abbreviation() func Test_abbreviation()
new
" abbreviation with 0x80 should work " abbreviation with 0x80 should work
inoreab чкпр vim inoreab чкпр vim
call feedkeys("Goчкпр \<Esc>", "xt") call feedkeys("Goчкпр \<Esc>", "xt")
call assert_equal('vim ', getline('$')) call assert_equal('vim ', getline('$'))
iunab чкпр iunab чкпр
set nomodified bwipe!
endfunc
func Test_abbreviation_with_noremap()
nnoremap <F2> :echo "cheese"
cabbr cheese xxx
call feedkeys(":echo \"cheese\"\<C-B>\"\<CR>", 'tx')
call assert_equal('"echo "xxx"', @:)
call feedkeys("\<F2>\<C-B>\"\<CR>", 'tx')
call assert_equal('"echo "cheese"', @:)
nnoremap <F2> :echo "cheese<C-]>"
call feedkeys("\<F2>\<C-B>\"\<CR>", 'tx')
call assert_equal('"echo "xxx"', @:)
nunmap <F2>
cunabbr cheese
new
inoremap <buffer> ( <C-]>()
iabbr <buffer> fnu fun
call feedkeys("ifnu(", 'tx')
call assert_equal('fun()', getline(1))
bwipe!
endfunc endfunc
func Test_abclear() func Test_abclear()
abbrev foo foobar abbrev foo foobar
iabbrev fooi foobari iabbrev fooi foobari
cabbrev fooc foobarc cabbrev fooc foobarc
call assert_equal("\n\n" call assert_equal("\n\n"
\ .. "c fooc foobarc\n" \ .. "c fooc foobarc\n"
\ .. "i fooi foobari\n" \ .. "i fooi foobari\n"
\ .. "! foo foobar", execute('abbrev')) \ .. "! foo foobar", execute('abbrev'))
iabclear iabclear
call assert_equal("\n\n" call assert_equal("\n\n"
\ .. "c fooc foobarc\n" \ .. "c fooc foobarc\n"
\ .. "c foo foobar", execute('abbrev')) \ .. "c foo foobar", execute('abbrev'))
abbrev foo foobar abbrev foo foobar
iabbrev fooi foobari iabbrev fooi foobari
cabclear cabclear
call assert_equal("\n\n" call assert_equal("\n\n"
\ .. "i fooi foobari\n" \ .. "i fooi foobari\n"
\ .. "i foo foobar", execute('abbrev')) \ .. "i foo foobar", execute('abbrev'))
abbrev foo foobar abbrev foo foobar
cabbrev fooc foobarc cabbrev fooc foobarc
abclear abclear
call assert_equal("\n\nNo abbreviation found", execute('abbrev')) call assert_equal("\n\nNo abbreviation found", execute('abbrev'))
call assert_fails('%abclear', 'E481:') call assert_fails('%abclear', 'E481:')
endfunc endfunc
func Test_abclear_buffer() func Test_abclear_buffer()
@@ -161,7 +183,7 @@ func Test_map_langmap()
imap a c imap a c
call feedkeys("Go\<C-R>a\<Esc>", "xt") call feedkeys("Go\<C-R>a\<Esc>", "xt")
call assert_equal('bbbb', getline('$')) call assert_equal('bbbb', getline('$'))
" langmap should not apply in Command-line mode " langmap should not apply in Command-line mode
set langmap=+{ nolangremap set langmap=+{ nolangremap
call feedkeys(":call append(line('$'), '+')\<CR>", "xt") call feedkeys(":call append(line('$'), '+')\<CR>", "xt")

View File

@@ -6581,8 +6581,8 @@ func Test_cbuffer_range()
call XbufferTests_range('l') call XbufferTests_range('l')
endfunc endfunc
" Test for displaying fname pass from setqflist when the name " Test for displaying fname passed from setqflist() when the names include
" are hard links to prevent seemly duplicate entries. " hard links to prevent seemingly duplicate entries.
func Xtest_hardlink_fname(cchar) func Xtest_hardlink_fname(cchar)
call s:setup_commands(a:cchar) call s:setup_commands(a:cchar)
%bwipe %bwipe

View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
765,
/**/ /**/
764, 764,
/**/ /**/