IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.2084

Browse Source 
Problem:    New digraph test makes testing hang.
Solution:   Don't set "nocp".

6008433381
This commit is contained in:
lonerover 2017-01-04 12:23:00 +08:00 committed by James McCoy
parent fb177c2c48
commit 775dfc6000
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/testdir/test_digraph.vim
View File

@ -4,6 +4,8 @@ if !has("digraphs") || !has("multi_byte")
finish finish
endif endif
scriptencoding utf-8
func! Put_Dig(chars) func! Put_Dig(chars)
exe "norm! o\<c-k>".a:chars exe "norm! o\<c-k>".a:chars
endfu endfu
@ -14,7 +16,7 @@ endfu
func! Test_digraphs() func! Test_digraphs()
let _enc = &enc let _enc = &enc
set nocp enc=utf8 set enc=utf8
new new
call Put_Dig("00") call Put_Dig("00")
call assert_equal("∞", getline('.')) call assert_equal("∞", getline('.'))
@ -222,7 +224,7 @@ func! Test_digraphs_option()
let _enc=&enc let _enc=&enc
" reset whichwrap option, so that testing <esc><bs>A works, " reset whichwrap option, so that testing <esc><bs>A works,
" without moving up a line " without moving up a line
set nocp enc=utf8 digraph ww= set enc=utf8 digraph ww=
new new
call Put_Dig_BS("0","0") call Put_Dig_BS("0","0")
call assert_equal("∞", getline('.')) call assert_equal("∞", getline('.'))

2
src/nvim/version.c
View File

@ -356,7 +356,7 @@ static int included_patches[] = {
// 2087, // 2087,
2086, 2086,
// 2085, // 2085,
// 2084, 2084,
// 2083, // 2083,
2082, 2082,
2081, 2081,