aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-09-25 13:59:11 +0200
committerGitHub <noreply@github.com>2022-09-25 13:59:11 +0200
commit2a5692c64628ee0af3ef4931a774a2eb0a7e046f (patch)
treee82e27668d38f73552dcfac019df0e889f1c7613
parent2a3cb0893b03aeff4d8c0b2116cbddda53bba5a2 (diff)
downloadrneovim-2a5692c64628ee0af3ef4931a774a2eb0a7e046f.tar.gz
rneovim-2a5692c64628ee0af3ef4931a774a2eb0a7e046f.tar.bz2
rneovim-2a5692c64628ee0af3ef4931a774a2eb0a7e046f.zip
vim-patch:9.0.0583: only recognizing .m3u8 files is inconsistent (#20342)
Problem: Only recognizing .m3u8 files is inconsistent. Solution: Also matc .m3u files. (issue vim/vim#11204) https://github.com/vim/vim/commit/b9725bc7f6427654eb4e35874034b0ec1b6b96b3
-rw-r--r--runtime/filetype.vim4
-rw-r--r--runtime/lua/vim/filetype.lua1
-rw-r--r--src/nvim/testdir/test_filetype.vim2
3 files changed, 4 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a78478ec9e..11536adf69 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -845,8 +845,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/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index d8ede33dfa..bd317baae9 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -473,6 +473,7 @@ local extension = {
hex = 'hex',
['h32'] = 'hex',
hjson = 'hjson',
+ m3u = 'hlsplaylist',
m3u8 = 'hlsplaylist',
hog = 'hog',
hws = 'hollywood',
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 516a764f45..4755d39cd3 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/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'],