diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-01-25 21:20:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 21:20:14 -0500 |
| commit | 78f0f00cd5f6f09320851e51fe61eb818e595f39 (patch) | |
| tree | c1bc344f58b8176b9e117bba8e48ab69535d3f08 /src | |
| parent | 1a6d89eb903d7b5a52e0638d0a53f0d697d34435 (diff) | |
| parent | 687ff6566aa83ecb65af2ebe4f83161faa6e9bb6 (diff) | |
| download | rneovim-78f0f00cd5f6f09320851e51fe61eb818e595f39.tar.gz rneovim-78f0f00cd5f6f09320851e51fe61eb818e595f39.tar.bz2 rneovim-78f0f00cd5f6f09320851e51fe61eb818e595f39.zip | |
Merge pull request #13820 from janlazo/vim-8.2.2392
vim-patch:8.2.{2392,2399,2402}
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_fold.vim | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 815827e224..f9f0ade1f6 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -159,6 +159,7 @@ let s:filename_checks = { \ 'elinks': ['elinks.conf'], \ 'elm': ['file.elm'], \ 'elmfilt': ['filter-rules'], + \ 'epuppet': ['file.epp'], \ 'erlang': ['file.erl', 'file.hrl', 'file.yaws'], \ 'eruby': ['file.erb', 'file.rhtml'], \ 'esmtprc': ['anyesmtprc'], @@ -171,6 +172,7 @@ let s:filename_checks = { \ 'factor': ['file.factor'], \ 'falcon': ['file.fal'], \ 'fan': ['file.fan', 'file.fwt'], + \ 'fennel': ['file.fnl'], \ 'fetchmail': ['.fetchmailrc'], \ 'fgl': ['file.4gl', 'file.4gh', 'file.m4gl'], \ 'focexec': ['file.fex', 'file.focexec'], @@ -374,6 +376,7 @@ let s:filename_checks = { \ 'quake': ['anybaseq2/file.cfg', 'anyid1/file.cfg', 'quake3/file.cfg'], \ 'radiance': ['file.rad', 'file.mat'], \ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'], + \ 'rbs': ['file.rbs'], \ 'rc': ['file.rc', 'file.rch'], \ 'rcs': ['file,v'], \ 'readline': ['.inputrc', 'inputrc'], @@ -390,7 +393,7 @@ let s:filename_checks = { \ 'rpl': ['file.rpl'], \ 'rst': ['file.rst'], \ 'rtf': ['file.rtf'], - \ 'ruby': ['.irbrc', 'irbrc', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake'], + \ 'ruby': ['.irbrc', 'irbrc', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file', 'Puppetfile'], \ 'rust': ['file.rs'], \ 'samba': ['smb.conf'], \ 'sas': ['file.sas'], @@ -622,6 +625,7 @@ let s:script_checks = { \ ['// -*- C++ -*-']], \ 'yaml': [['%YAML 1.2']], \ 'pascal': [['#!/path/instantfpc']], + \ 'fennel': [['#!/path/fennel']], \ } " Various forms of "env" optional arguments. diff --git a/src/nvim/testdir/test_fold.vim b/src/nvim/testdir/test_fold.vim index 18f328acf4..2d058e8e32 100644 --- a/src/nvim/testdir/test_fold.vim +++ b/src/nvim/testdir/test_fold.vim @@ -827,7 +827,7 @@ func Test_fold_relative_move() set fdm=indent sw=2 wrap tw=80 let content = [ ' foo', ' bar', ' baz', - \ repeat('x', 100), + \ repeat('x', &columns + 1), \ ' foo', ' bar', ' baz' \ ] call append(0, content) |