Commit: patch 9.1.0242: filetype: octave history files are not recognized

5 views
Skip to first unread message

Christian Brabandt

unread,
Mar 31, 2024, 1:30:12 PM3/31/24
to vim...@googlegroups.com
patch 9.1.0242: filetype: octave history files are not recognized

Commit: https://github.com/vim/vim/commit/be71ac694f623e162f1ecb7a182bdf2fd281591f
Author: Wu, Zhenyu <wuzh...@ustc.edu>
Date: Sun Mar 31 19:18:10 2024 +0200

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: #14363

Signed-off-by: Wu, Zhenyu <wuzh...@ustc.edu>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6965fab52..be59bc0d5 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1501,7 +1501,7 @@ au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit,*.mlt,*.mlp,*.mlip,*.mli
au BufNewFile,BufRead *.occ setf occam

" Octave
-au BufNewFile,BufRead octave.conf,.octaverc,octaverc setf octave
+au BufNewFile,BufRead octave.conf,.octaverc,octaverc,*/octave/history setf octave

" Odin
au BufNewFile,BufRead *.odin setf odin
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0a9a72d90..91fc51718 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -503,7 +503,7 @@ def s:GetFilenameChecks(): dict<list<string>>
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'],
diff --git a/src/version.c b/src/version.c
index 968ad9fed..f236655fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 242,
/**/
241,
/**/
Reply all
Reply to author
Forward
0 new messages