To: vim_dev@googlegroups.com
Subject: Patch 8.2.2402
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2402
Problem:    Some filetypes not detected.
Solution:   Detect Ruby Signature and Puppet related files. (Doug Kearns)
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-8.2.2401/runtime/filetype.vim	2021-01-22 20:54:30.934838333 +0100
--- runtime/filetype.vim	2021-01-24 15:23:15.793757791 +0100
***************
*** 1176,1184 ****
  " 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)
  au BufNewFile,BufRead *.pas			setf pascal
  
  au BufNewFile,BufRead *.pp			call dist#ft#FTpp()
  
  " Delphi or Lazarus program file
--- 1176,1185 ----
  " 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, *.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
***************
*** 1269,1275 ****
  " Povray configuration
  au BufNewFile,BufRead .povrayrc			setf povini
  
! " Povray, PHP or assembly
  au BufNewFile,BufRead *.inc			call dist#ft#FTinc()
  
  " Printcap and Termcap
--- 1270,1276 ----
  " Povray configuration
  au BufNewFile,BufRead .povrayrc			setf povini
  
! " Povray, Pascal, PHP or assembly
  au BufNewFile,BufRead *.inc			call dist#ft#FTinc()
  
  " Printcap and Termcap
***************
*** 1278,1290 ****
  au BufNewFile,BufRead *termcap
  	\ let b:ptcap_type = "term" | setf ptcap
  
! " PCCTS / ANTRL
! "au BufNewFile,BufRead *.g			setf antrl
  au BufNewFile,BufRead *.g			setf pccts
  
  " PPWizard
  au BufNewFile,BufRead *.it,*.ih			setf ppwiz
  
  " Obj 3D file format
  " TODO: is there a way to avoid MS-Windows Object files?
  au BufNewFile,BufRead *.obj			setf obj
--- 1279,1297 ----
  au BufNewFile,BufRead *termcap
  	\ let b:ptcap_type = "term" | setf ptcap
  
! " 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,1434 ****
  " RubyGems
  au BufNewFile,BufRead *.gemspec			setf ruby
  
! " Rust
! au BufNewFile,BufRead *.rs			setf rust
  
  " Rackup
  au BufNewFile,BufRead *.ru			setf ruby
--- 1434,1441 ----
  " RubyGems
  au BufNewFile,BufRead *.gemspec			setf ruby
  
! " RBS (Ruby Signature)
! au BufNewFile,BufRead *.rbs			setf rbs
  
  " Rackup
  au BufNewFile,BufRead *.ru			setf ruby
***************
*** 1442,1447 ****
--- 1449,1457 ----
  " 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
  
*** ../vim-8.2.2401/src/testdir/test_filetype.vim	2021-01-22 20:54:30.934838333 +0100
--- src/testdir/test_filetype.vim	2021-01-24 15:23:15.797757778 +0100
***************
*** 162,167 ****
--- 162,168 ----
      \ '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', 'esmtprc', 'some-esmtprc'],
***************
*** 391,396 ****
--- 392,398 ----
      \ 'quake': ['anybaseq2/file.cfg', 'anyid1/file.cfg', 'quake3/file.cfg', 'baseq2/file.cfg', 'id1/file.cfg', 'quake1/file.cfg', 'some-baseq2/file.cfg', 'some-id1/file.cfg', 'some-quake1/file.cfg'],
      \ 'radiance': ['file.rad', 'file.mat'],
      \ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'],
+     \ 'rbs': ['file.rbs'],
      \ 'rc': ['file.rc', 'file.rch'],
      \ 'rcs': ['file,v'],
      \ 'readline': ['.inputrc', 'inputrc'],
***************
*** 407,413 ****
      \ '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', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file'],
      \ 'rust': ['file.rs'],
      \ 'samba': ['smb.conf'],
      \ 'sas': ['file.sas'],
--- 409,415 ----
      \ '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', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file', 'Puppetfile'],
      \ 'rust': ['file.rs'],
      \ 'samba': ['smb.conf'],
      \ 'sas': ['file.sas'],
*** ../vim-8.2.2401/src/version.c	2021-01-24 13:34:15.007739955 +0100
--- src/version.c	2021-01-24 15:24:33.229528527 +0100
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2402,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
225. You sign up for free subscriptions for all the computer magazines

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///