aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-03-31 19:20:16 +0200
committerChristian Clason <c.clason@uni-graz.at>2024-04-01 12:01:47 +0200
commit5cdbb22c348f196f59d55535cc4bfee5dc72d83c (patch)
tree2cebad876a033e425840347a1971d3c93a06179d
parentafc7a5611eef3c07154c34a60d3c2513e8afcdb7 (diff)
downloadrneovim-5cdbb22c348f196f59d55535cc4bfee5dc72d83c.tar.gz
rneovim-5cdbb22c348f196f59d55535cc4bfee5dc72d83c.tar.bz2
rneovim-5cdbb22c348f196f59d55535cc4bfee5dc72d83c.zip
vim-patch:9.1.0242: filetype: octave history files are not recognized
Problem: filetype: octave history files are not recognized Solution: Detect octave/history files as octave (Wu, Zhenyu) closes: vim/vim#14363 https://github.com/vim/vim/commit/be71ac694f623e162f1ecb7a182bdf2fd281591f Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
-rw-r--r--runtime/lua/vim/filetype.lua1
-rw-r--r--test/old/testdir/test_filetype.vim2
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 9e60877381..ba5c0add73 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1912,6 +1912,7 @@ local pattern = {
['.*%.[1-9]'] = detect.nroff,
['.*%.ml%.cppo'] = 'ocaml',
['.*%.mli%.cppo'] = 'ocaml',
+ ['.*/octave/history'] = 'octave',
['.*%.opam%.template'] = 'opam',
['.*/openvpn/.*/.*%.conf'] = 'openvpn',
['.*%.[Oo][Pp][Ll]'] = 'opl',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index 65a750c840..f9ea71f819 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -463,7 +463,7 @@ func s:GetFilenameChecks() abort
\ 'obse': ['file.obl', 'file.obse', 'file.oblivion', 'file.obscript'],
\ 'ocaml': ['file.ml', 'file.mli', 'file.mll', 'file.mly', '.ocamlinit', 'file.mlt', 'file.mlp', 'file.mlip', 'file.mli.cppo', 'file.ml.cppo'],
\ 'occam': ['file.occ'],
- \ 'octave': ['octaverc', '.octaverc', 'octave.conf'],
+ \ 'octave': ['octaverc', '.octaverc', 'octave.conf', 'any/.local/share/octave/history'],
\ 'odin': ['file.odin'],
\ 'omnimark': ['file.xom', 'file.xin'],
\ 'opam': ['opam', 'file.opam', 'file.opam.template'],