summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-09-25 12:35:49 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-25 12:35:49 +0100
commitb9725bc7f6427654eb4e35874034b0ec1b6b96b3 (patch)
tree128701395c7d012f99350299968b5cbbef6fe056
parentec1238b4068d0d6d9d02ac1a8e61720224a1be73 (diff)
downloadvim-git-b9725bc7f6427654eb4e35874034b0ec1b6b96b3.tar.gz
patch 9.0.0583: only recognizing .m3u8 files is inconsistentv9.0.0583
Problem: Only recognizing .m3u8 files is inconsistent. Solution: Also matc .m3u files. (issue #11204)
-rw-r--r--runtime/filetype.vim4
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e537d9331..06ffcfe4f 100644
--- 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 e2177e503..3b3d9a5b9 100644
--- 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 79dda65a3..fdd6a239f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 583,
+/**/
582,
/**/
581,