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 <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6965fab5230e810dd56fc8583e2dfbdf54e1fa2b..be59bc0d5637b98de8289bd3aca1afc84264a0cb 100644 (file)
--- 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 0a9a72d9002627ea0d65bce3a49da4c7f33b1d76..91fc51718dcee43ed322bd3d6c0f419f541942b6 100644 (file)
--- 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 968ad9fed2fe86ba80ee7acc7797b4d32b4006e6..f236655fe2842a8f0fbd3c271f983e29e3b3985b 100644 (file)
--- 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,
 /**/