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 /runtime | |
| 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 'runtime')
| -rw-r--r-- | runtime/filetype.vim | 25 | ||||
| -rw-r--r-- | runtime/scripts.vim | 4 |
2 files changed, 23 insertions, 6 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 1343a1fd0b..53fd66c4df 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -585,6 +585,9 @@ au BufNewFile,BufRead *.fan,*.fwt setf fan " Factor au BufNewFile,BufRead *.factor setf factor +" Fennel +autocmd BufRead,BufNewFile *.fnl setf fennel + " Fetchmail RC file au BufNewFile,BufRead .fetchmailrc setf fetchmail @@ -1169,9 +1172,10 @@ au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp " Password file au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd -" Pascal (also *.p) +" Pascal (also *.p, *.pp, *.inc) au BufNewFile,BufRead *.pas setf pascal +" Pascal or Puppet manifest au BufNewFile,BufRead *.pp call dist#ft#FTpp() " Delphi or Lazarus program file @@ -1262,7 +1266,7 @@ au BufNewFile,BufRead *.pov setf pov " Povray configuration au BufNewFile,BufRead .povrayrc setf povini -" Povray, PHP or assembly +" Povray, Pascal, PHP or assembly au BufNewFile,BufRead *.inc call dist#ft#FTinc() " Printcap and Termcap @@ -1271,13 +1275,19 @@ au BufNewFile,BufRead *printcap au BufNewFile,BufRead *termcap \ let b:ptcap_type = "term" | setf ptcap -" PCCTS / ANTRL -"au BufNewFile,BufRead *.g setf antrl +" PCCTS / ANTLR +"au BufNewFile,BufRead *.g setf antlr au BufNewFile,BufRead *.g setf pccts " PPWizard au BufNewFile,BufRead *.it,*.ih setf ppwiz +" Puppet +au BufNewFile,BufRead Puppetfile setf ruby + +" Embedded Puppet +au BufNewFile,BufRead *.epp setf epuppet + " Obj 3D file format " TODO: is there a way to avoid MS-Windows Object files? au BufNewFile,BufRead *.obj setf obj @@ -1427,8 +1437,8 @@ au BufNewFile,BufRead *.rb,*.rbw setf ruby " RubyGems au BufNewFile,BufRead *.gemspec setf ruby -" Rust -au BufNewFile,BufRead *.rs setf rust +" RBS (Ruby Signature) +au BufNewFile,BufRead *.rbs setf rbs " Rackup au BufNewFile,BufRead *.ru setf ruby @@ -1442,6 +1452,9 @@ au BufNewFile,BufRead *.builder,*.rxml,*.rjs setf ruby " Rantfile and Rakefile is like Ruby au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake setf ruby +" Rust +au BufNewFile,BufRead *.rs setf rust + " S-lang (or shader language, or SmallLisp) au BufNewFile,BufRead *.sl setf slang diff --git a/runtime/scripts.vim b/runtime/scripts.vim index 536993d485..3b3409bf4b 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -186,6 +186,10 @@ if s:line1 =~# "^#!" elseif s:name =~# 'instantfpc\>' set ft=pascal + " Fennel + elseif s:name =~# 'fennel\>' + set ft=fennel + endif unlet s:name |