patch 9.0.0583: only recognizing .m3u8 files is inconsistent

Problem:    Only recognizing .m3u8 files is inconsistent.
Solution:   Also matc .m3u files. (issue #11204)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e537d93311f479a4653669f3b791b4e1e88065d7..06ffcfe4f34031519d8e8d9e1e321398ecbf422b 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -844,8 +844,8 @@ au BufNewFile,BufRead *.hex,*.h32           setf hex
 " Hjson
 au BufNewFile,BufRead *.hjson                  setf hjson
 
-" HLS Playlist
-au BufNewFile,BufRead *.m3u8                   setf hlsplaylist
+" HLS Playlist (or another form of playlist)
+au BufNewFile,BufRead *.m3u,*.m3u8             setf hlsplaylist
 
 " Hollywood
 au BufRead,BufNewFile *.hws                    setf hollywood

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index e2177e50372b3cbfbb3f933e64c63b118d0d3251..3b3d9a5b9aa825dcd54b0d1d0bca35ee506cc741 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -255,7 +255,7 @@ let s:filename_checks = {
     \ 'hex': ['file.hex', 'file.h32'],
     \ 'hgcommit': ['hg-editor-file.txt'],
     \ 'hjson': ['file.hjson'],
-    \ 'hlsplaylist': ['file.m3u8'],
+    \ 'hlsplaylist': ['file.m3u', 'file.m3u8'],
     \ 'hog': ['file.hog', 'snort.conf', 'vision.conf'],
     \ 'hollywood': ['file.hws'],
     \ 'hoon': ['file.hoon'],

diff --git a/src/version.c b/src/version.c
index 79dda65a3778b155e27c8b923c7f91d3a2a1340b..fdd6a239f68c959147f4f258c72ac55f038697a4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    583,
 /**/
     582,
 /**/