patch 9.0.0402: javascript module files are not recoginzed

Problem:    Javascript module files are not recoginzed.
Solution:   Recognize "*.jsm" files as Javascript. (Brett Holman,
            closes #11069)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c7670d08cae04f2dfeaf917a79c2930229afee60..e79bbba35e382f4b29da48cafc8d4e6e439f7fba 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -940,7 +940,7 @@ au BufNewFile,BufRead *.java,*.jav          setf java
 au BufNewFile,BufRead *.jj,*.jjt               setf javacc
 
 " JavaScript, ECMAScript, ES module script, CommonJS script
-au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs,*.cjs   setf javascript
+au BufNewFile,BufRead *.js,*.jsm,*.javascript,*.es,*.mjs,*.cjs   setf javascript
 
 " JavaScript with React
 au BufNewFile,BufRead *.jsx                    setf javascriptreact

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 551602fbe1d85466a6eb72877b712f9b93983579..9d2677c7fca5ac6e441e3f17a7a103837b88e302 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -275,7 +275,7 @@ let s:filename_checks = {
     \ 'jam': ['file.jpl', 'file.jpr', 'JAM-file.file', 'JAM.file', 'Prl-file.file', 'Prl.file'],
     \ 'java': ['file.java', 'file.jav'],
     \ 'javacc': ['file.jj', 'file.jjt'],
-    \ 'javascript': ['file.js', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs'],
+    \ 'javascript': ['file.js', 'file.jsm', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs'],
     \ 'javascript.glimmer': ['file.gjs'],
     \ 'javascriptreact': ['file.jsx'],
     \ 'jess': ['file.clp'],

diff --git a/src/version.c b/src/version.c
index 3d6a344e111691475b6e88e1015840e22019e10d..c06a43cf8e3598b1bef4d9ccce0d4f570fe58713 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -703,6 +703,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    402,
 /**/
     401,
 /**/