patch 8.2.1725: not all Pascal files are recognized

Problem:    Not all Pascal files are recognized.
Solution:   Add filetype patterns. (Doug Kearns)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 5d4d77609a45409f65fc8fccf9973e63eaea3b15..65102dd46a215a4a8d342d087a84d45b8c7b50a4 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1162,10 +1162,10 @@ au BufNewFile,BufRead *.papp,*.pxml,*.pxsl      setf papp
 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 *.pas,*.pp               setf pascal
 
-" Delphi project file
-au BufNewFile,BufRead *.dpr                    setf pascal
+" Delphi or Lazarus program file
+au BufNewFile,BufRead *.dpr,*.lpr              setf pascal
 
 " PDF
 au BufNewFile,BufRead *.pdf                    setf pdf
@@ -1736,7 +1736,7 @@ au BufNewFile,BufRead *.texinfo,*.texi,*.txi      setf texinfo
 au BufNewFile,BufRead texmf.cnf                        setf texmf
 
 " Tidy config
-au BufNewFile,BufRead .tidyrc,tidyrc           setf tidy
+au BufNewFile,BufRead .tidyrc,tidyrc,tidy.conf setf tidy
 
 " TF mud client
 au BufNewFile,BufRead *.tf,.tfrc,tfrc          setf tf

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 5d37a866f20455207712cbce0b30f1b3277cd102..8e41b1e43b218dee122466fd8661df443b299fba 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -327,7 +327,7 @@ let s:filename_checks = {
     \ 'pamconf': ['/etc/pam.conf'],
     \ 'pamenv': ['/etc/security/pam_env.conf', '/home/user/.pam_environment'],
     \ 'papp': ['file.papp', 'file.pxml', 'file.pxsl'],
-    \ 'pascal': ['file.pas', 'file.dpr'],
+    \ 'pascal': ['file.pas', 'file.pp', 'file.dpr', 'file.lpr'],
     \ 'passwd': ['any/etc/passwd', 'any/etc/passwd-', 'any/etc/passwd.edit', 'any/etc/shadow', 'any/etc/shadow-', 'any/etc/shadow.edit', 'any/var/backups/passwd.bak', 'any/var/backups/shadow.bak'],
     \ 'pccts': ['file.g'],
     \ 'pdf': ['file.pdf'],
@@ -456,7 +456,7 @@ let s:filename_checks = {
     \ 'texmf': ['texmf.cnf'],
     \ 'text': ['file.text', 'README'],
     \ 'tf': ['file.tf', '.tfrc', 'tfrc'],
-    \ 'tidy': ['.tidyrc', 'tidyrc'],
+    \ 'tidy': ['.tidyrc', 'tidyrc', 'tidy.conf'],
     \ 'tilde': ['file.t.html'],
     \ 'tli': ['file.tli'],
     \ 'tmux': ['tmuxfile.conf', '.tmuxfile.conf'],

diff --git a/src/version.c b/src/version.c
index 5f1767b47819d9552ead4deb7a6e08f2c6f67df4..ca91b2b11b4d156df468edbd2206454952507ee2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1725,
 /**/
     1724,
 /**/