patch 8.2.3873: go.mod files are not recognized

Problem:    go.mod files are not recognized.
Solution:   Check for the file name. (closes #9380)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 7740d8faa418919b27f51c0296080ab43315cf17..bd1d2e90570f5eab005dc2c56813336a77f257b6 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1091,7 +1091,9 @@ au BufNewFile,BufRead *.mmp                       setf mmp
 
 " Modsim III (or LambdaProlog)
 au BufNewFile,BufRead *.mod
-       \ if getline(1) =~ '\<module\>' |
+       \ if expand("<afile>") =~ '\<go.mod$' |
+       \   setf gomod |
+       \ elseif getline(1) =~ '\<module\>' |
        \   setf lprolog |
        \ else |
        \   setf modsim3 |

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index cd82e3814d6d98aa99677c5b0ff3bc86aa7049bb..719d690e8ee89ca8ce2e3762a4998c42b1788a3c 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -204,6 +204,7 @@ let s:filename_checks = {
     \ 'gnash': ['gnashrc', '.gnashrc', 'gnashpluginrc', '.gnashpluginrc'],
     \ 'gnuplot': ['file.gpi'],
     \ 'go': ['file.go'],
+    \ 'gomod': ['go.mod'],
     \ 'gp': ['file.gp', '.gprc'],
     \ 'gpg': ['/.gnupg/options', '/.gnupg/gpg.conf', '/usr/any/gnupg/options.skel', 'any/.gnupg/gpg.conf', 'any/.gnupg/options', 'any/usr/any/gnupg/options.skel'],
     \ 'grads': ['file.gs'],

diff --git a/src/version.c b/src/version.c
index 7a1fd69ed00f7b34ec6e188f11163596af437331..53d3b57e102f6f3fd5079c80fb0a5bb37e40313c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3873,
 /**/
     3872,
 /**/