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

Patch 9.0.0427
Problem:    Drupal theme files are not recognized.
Solution:   Use php filetype for Drupl theme files.  Remove trailing spaces.
            (Rodrigo Aguilera, closes #11096)
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-9.0.0426/runtime/filetype.vim	2022-09-09 14:11:37.284559563 +0100
--- runtime/filetype.vim	2022-09-09 16:01:12.392061439 +0100
***************
*** 1323,1329 ****
  au BufNewFile,BufRead *.[Oo][Pp][Ll]			setf opl
  
  " OpenSCAD
! au BufNewFile,BufRead *.scad				setf openscad		
  
  " Oracle config file
  au BufNewFile,BufRead *.ora				setf ora
--- 1323,1329 ----
  au BufNewFile,BufRead *.[Oo][Pp][Ll]			setf opl
  
  " OpenSCAD
! au BufNewFile,BufRead *.scad				setf openscad
  
  " Oracle config file
  au BufNewFile,BufRead *.ora				setf ora
***************
*** 1398,1404 ****
  " Also Phtml (was used for PHP 2 in the past).
  " Also .ctp for Cake template file.
  " Also .phpt for php tests.
! au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp,*.phpt	setf php
  
  " PHP config
  au BufNewFile,BufRead php.ini-*			setf dosini
--- 1398,1405 ----
  " Also Phtml (was used for PHP 2 in the past).
  " Also .ctp for Cake template file.
  " Also .phpt for php tests.
! " Also .theme for Drupal theme files.
! au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp,*.phpt,*.theme	setf php
  
  " PHP config
  au BufNewFile,BufRead php.ini-*			setf dosini
*** ../vim-9.0.0426/src/testdir/test_filetype.vim	2022-09-09 14:11:37.288559555 +0100
--- src/testdir/test_filetype.vim	2022-09-09 16:01:12.392061439 +0100
***************
*** 410,416 ****
      \ 'perl': ['file.plx', 'file.al', 'file.psgi', 'gitolite.rc', '.gitolite.rc', 'example.gitolite.rc'],
      \ 'pf': ['pf.conf'],
      \ 'pfmain': ['main.cf'],
!     \ 'php': ['file.php', 'file.php9', 'file.phtml', 'file.ctp', 'file.phpt'],
      \ 'pike': ['file.pike', 'file.pmod'],
      \ 'pilrc': ['file.rcp'],
      \ 'pine': ['.pinerc', 'pinerc', '.pinercex', 'pinercex'],
--- 410,416 ----
      \ 'perl': ['file.plx', 'file.al', 'file.psgi', 'gitolite.rc', '.gitolite.rc', 'example.gitolite.rc'],
      \ 'pf': ['pf.conf'],
      \ 'pfmain': ['main.cf'],
!     \ 'php': ['file.php', 'file.php9', 'file.phtml', 'file.ctp', 'file.phpt', 'file.theme'],
      \ 'pike': ['file.pike', 'file.pmod'],
      \ 'pilrc': ['file.rcp'],
      \ 'pine': ['.pinerc', 'pinerc', '.pinercex', 'pinercex'],
***************
*** 535,541 ****
      \ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'],
      \ 'stp': ['file.stp'],
      \ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers', 'any/etc/sudoers.d/file'],
!     \ 'supercollider': ['file.quark'], 
      \ 'surface': ['file.sface'],
      \ 'svelte': ['file.svelte'],
      \ 'svg': ['file.svg'],
--- 535,541 ----
      \ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'],
      \ 'stp': ['file.stp'],
      \ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers', 'any/etc/sudoers.d/file'],
!     \ 'supercollider': ['file.quark'],
      \ 'surface': ['file.sface'],
      \ 'svelte': ['file.svelte'],
      \ 'svg': ['file.svg'],
***************
*** 1355,1361 ****
    unlet g:filetype_mod
    bwipe!
  
!   " RAPID header start with a line containing only "%%%", 
    " but is not always present.
    call writefile(['%%%'], 'modfile.mod')
    split modfile.mod
--- 1355,1361 ----
    unlet g:filetype_mod
    bwipe!
  
!   " RAPID header start with a line containing only "%%%",
    " but is not always present.
    call writefile(['%%%'], 'modfile.mod')
    split modfile.mod
***************
*** 1371,1377 ****
    bwipe!
    call delete('modfile.Mod')
  
!   " RAPID is not case sensitive, embedded spaces, sysmodule, 
    " file starts with empty line(s).
    call writefile(['', 'MODULE  rapidmödüle  (SYSMODULE,NOSTEPIN)'], 'modfile.MOD')
    split modfile.MOD
--- 1371,1377 ----
    bwipe!
    call delete('modfile.Mod')
  
!   " RAPID is not case sensitive, embedded spaces, sysmodule,
    " file starts with empty line(s).
    call writefile(['', 'MODULE  rapidmödüle  (SYSMODULE,NOSTEPIN)'], 'modfile.MOD')
    split modfile.MOD
***************
*** 1499,1505 ****
    unlet g:filetype_prg
    bwipe!
  
!   " RAPID header start with a line containing only "%%%", 
    " but is not always present.
    call writefile(['%%%'], 'prgfile.prg')
    split prgfile.prg
--- 1499,1505 ----
    unlet g:filetype_prg
    bwipe!
  
!   " RAPID header start with a line containing only "%%%",
    " but is not always present.
    call writefile(['%%%'], 'prgfile.prg')
    split prgfile.prg
***************
*** 1515,1521 ****
    bwipe!
    call delete('prgfile.Prg')
  
!   " RAPID is not case sensitive, embedded spaces, sysmodule, 
    " file starts with empty line(s).
    call writefile(['', 'MODULE  rapidmödüle  (SYSMODULE,NOSTEPIN)'], 'prgfile.PRG')
    split prgfile.PRG
--- 1515,1521 ----
    bwipe!
    call delete('prgfile.Prg')
  
!   " RAPID is not case sensitive, embedded spaces, sysmodule,
    " file starts with empty line(s).
    call writefile(['', 'MODULE  rapidmödüle  (SYSMODULE,NOSTEPIN)'], 'prgfile.PRG')
    split prgfile.PRG
***************
*** 1626,1632 ****
    unlet g:filetype_sys
    bwipe!
  
!   " RAPID header start with a line containing only "%%%", 
    " but is not always present.
    call writefile(['%%%'], 'sysfile.sys')
    split sysfile.sys
--- 1626,1632 ----
    unlet g:filetype_sys
    bwipe!
  
!   " RAPID header start with a line containing only "%%%",
    " but is not always present.
    call writefile(['%%%'], 'sysfile.sys')
    split sysfile.sys
***************
*** 1642,1648 ****
    bwipe!
    call delete('sysfile.Sys')
  
!   " RAPID is not case sensitive, embedded spaces, sysmodule, 
    " file starts with empty line(s).
    call writefile(['', 'MODULE  rapidmödüle  (SYSMODULE,NOSTEPIN)'], 'sysfile.SYS')
    split sysfile.SYS
--- 1642,1648 ----
    bwipe!
    call delete('sysfile.Sys')
  
!   " RAPID is not case sensitive, embedded spaces, sysmodule,
    " file starts with empty line(s).
    call writefile(['', 'MODULE  rapidmödüle  (SYSMODULE,NOSTEPIN)'], 'sysfile.SYS')
    split sysfile.SYS
*** ../vim-9.0.0426/src/version.c	2022-09-09 15:09:42.096814667 +0100
--- src/version.c	2022-09-09 16:02:42.419806273 +0100
***************
*** 705,706 ****
--- 705,708 ----
  {   /* Add new patch number below this line */
+ /**/
+     427,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
31. You code your homework in HTML and give your instructor the URL.

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