patch 8.1.1187: cannot recognize Pipfile

Problem:    Cannot recognize Pipfile.
Solution:   Use existing filetypes. (Charles Ross, closes #4280)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6d68c7152a323d76ed3a8bef69013b182d501da5..d1f3884bdf5a2feaa0e64bfdfa38016c0ec2393d 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2019 Mar 26
+" Last Change: 2019 Apr 19
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1174,6 +1174,10 @@ au BufNewFile,BufRead *.rcp                      setf pilrc
 " Pine config
 au BufNewFile,BufRead .pinerc,pinerc,.pinercex,pinercex                setf pine
 
+" Pipenv Pipfiles
+au BufNewFile,BufRead Pipfile                  setf config
+au BufNewFile,BufRead Pipfile.lock             setf json
+
 " PL/1, PL/I
 au BufNewFile,BufRead *.pli,*.pl1              setf pli
 
@@ -1863,7 +1867,8 @@ au BufNewFile,BufRead *.xmi                       setf xml
 au BufNewFile,BufRead *.csproj,*.csproj.user   setf xml
 
 " Qt Linguist translation source and Qt User Interface Files are XML
-au BufNewFile,BufRead *.ts,*.ui                        setf xml
+" However, for .ts Typescript is more common.
+au BufNewFile,BufRead *.ui                     setf xml
 
 " TPM's are RDF-based descriptions of TeX packages (Nikolai Weibull)
 au BufNewFile,BufRead *.tpm                    setf xml

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index fe6a0a1514c0556fc5ef50c7667244108028159a..0783d3ef6689e194a58195df0de0d9b93ac82a2c 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -102,7 +102,7 @@ let s:filename_checks = {
     \ 'coco': ['file.atg'],
     \ 'conaryrecipe': ['file.recipe'],
     \ 'conf': ['auto.master'],
-    \ 'config': ['configure.in', 'configure.ac'],
+    \ 'config': ['configure.in', 'configure.ac', 'Pipfile'],
     \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi'],
     \ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh'],
     \ 'crm': ['file.crm'],
@@ -223,7 +223,7 @@ let s:filename_checks = {
     \ 'jgraph': ['file.jgr'],
     \ 'jovial': ['file.jov', 'file.j73', 'file.jovial'],
     \ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx'],
-    \ 'json': ['file.json', 'file.jsonp', 'file.webmanifest'],
+    \ 'json': ['file.json', 'file.jsonp', 'file.webmanifest', 'Pipfile.lock'],
     \ 'jsp': ['file.jsp'],
     \ 'kconfig': ['Kconfig', 'Kconfig.debug'],
     \ 'kivy': ['file.kv'],

diff --git a/src/version.c b/src/version.c
index 0b9a5dfa2e8ac8e29a42fa6b6035c0d7032bf669..f9b53b0c74640c2bcf91a5d021217149d523bf3f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1187,
 /**/
     1186,
 /**/