Merge remote-tracking branch 'vim/master'

.github/CODEOWNERS_vim

@@ -23,6 +23,7 @@ runtime/autoload/tar.vim		@cecamp
 runtime/autoload/vimball.vim		@cecamp
 runtime/autoload/xmlformat.vim		@chrisbra
 runtime/autoload/zip.vim		@cecamp
+runtime/autoload/dist/json.vim		@habamax
 runtime/colors/blue.vim			@habamax @romainl @neutaaaaan
 runtime/colors/darkblue.vim		@habamax @romainl @neutaaaaan
 runtime/colors/default.vim		@habamax @romainl @neutaaaaan

.github/dependabot.yml

@@ -4,3 +4,5 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    commit-message:
+      prefix: "CI"

.github/labeler.yml

@@ -1,106 +1,155 @@
 # list of labels and minimatch globs to match to apply the label.
 
 CI:
-- any: ['.cirrus.yml']
-- any: ['.github/dependabot.yml']
-- any: ['.github/labeler.yml']
-- any: ['.github/workflows/*']
-- any: ['.appveyor.yml']
-- any: ['.codecov.yml']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - '.cirrus.yml'
+        - '.github/dependabot.yml'
+        - '.github/labeler.yml'
+        - '.github/workflows/*'
+        - '.appveyor.yml'
+        - '.codecov.yml'
 
 documentation:
-- all: ['*/doc/*']
+  - all:
+    - changed-files:
+      - any-glob-to-all-files:
+        - '*/doc/*'
 
 translation:
-- any: ['src/po/*.po']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'src/po/*.po'
 
 if_lua:
-- any: ['src/if_lua.c']
-- any: ['src/proto/if_lua.pro']
-- any: ['runtime/doc/if_lua.txt']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'src/if_lua.c'
+        - 'src/proto/if_lua.pro'
+        - 'runtime/doc/if_lua.txt'
 
 if_mzscheme:
-- any: ['src/if_mzsch.c']
-- any: ['src/if_mzsch.h']
-- any: ['src/proto/if_mzsch.pro']
-- any: ['runtime/doc/if_mzsch.txt']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'src/if_mzsch.c'
+        - 'src/if_mzsch.h'
+        - 'src/proto/if_mzsch.pro'
+        - 'runtime/doc/if_mzsch.txt'
 
 if_perl:
-- any: ['src/if_perl.xs']
-- any: ['src/if_perlsfio.c']
-- any: ['src/proto/if_perl.pro']
-- any: ['src/proto/if_perlsfio.pro']
-- any: ['runtime/doc/if_perl.txt']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'src/if_perl.xs'
+        - 'src/if_perlsfio.c'
+        - 'src/proto/if_perl.pro'
+        - 'src/proto/if_perlsfio.pro'
+        - 'runtime/doc/if_perl.txt'
 
 if_python:
-- any: ['src/if_py_both.h']
-- any: ['runtime/doc/if_pyth.txt']
-- any: ['src/if_python.c']
-- any: ['src/if_python3.c']
-- any: ['src/proto/if_python.pro']
-- any: ['src/proto/if_python3.pro']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'src/if_py_both.h'
+        - 'runtime/doc/if_pyth.txt'
+        - 'src/if_python.c'
+        - 'src/if_python3.c'
+        - 'src/proto/if_python.pro'
+        - 'src/proto/if_python3.pro'
 
 if_ruby:
-- any: ['src/if_ruby.c']
-- any: ['src/proto/if_ruby.pro']
-- any: ['runtime/doc/if_ruby.txt']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'src/if_ruby.c'
+        - 'src/proto/if_ruby.pro'
+        - 'runtime/doc/if_ruby.txt'
 
 if_tcl:
-- any: ['src/if_tcl.c']
-- any: ['src/proto/if_tcl.pro']
-- any: ['runtime/doc/if_tcl.txt']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'src/if_tcl.c'
+        - 'src/proto/if_tcl.pro'
+        - 'runtime/doc/if_tcl.txt'
 
 installer:
-- any: ['nsis/**']
-- any: ['src/dosinst.*']
-- any: ['src/uninstall.c']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'nsis/**'
+        - 'src/dosinst.*'
+        - 'src/uninstall.c'
 
 platform-mac:
-- any: ['src/INSTALLmac.txt']
-- any: ['src/os_mac*']
-- any: ['src/proto/os_mac*']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'src/INSTALLmac.txt'
+        - 'src/os_mac*'
+        - 'src/proto/os_mac*'
 
 platform-windows:
-- any: ['nsis/**']
-- any: ['src/*.bat']
-- any: ['src/*.bmp']
-- any: ['src/*.ico']
-- any: ['src/GvimExt/*']
-- any: ['src/INSTALLpc.txt']
-- any: ['src/Make_cyg*.mak']
-- any: ['src/Make_ming.mak']
-- any: ['src/Make_mvc.mak']
-- any: ['src/dosinst.*']
-- any: ['src/gui_dwrite.*']
-- any: ['src/gui_w32*']
-- any: ['src/if_ole.*']
-- any: ['src/iid_ole.c']
-- any: ['src/os_mswin*']
-- any: ['src/os_w32*']
-- any: ['src/os_win32.*']
-- any: ['src/proto/gui_w32.pro']
-- any: ['src/proto/os_mswin.pro']
-- any: ['src/proto/os_win32.pro']
-- any: ['src/proto/winclip.pro']
-- any: ['src/uninstall.c']
-- any: ['src/vim.manifest']
-- any: ['src/vim.rc']
-- any: ['src/vimrun.c']
-- any: ['src/winclip.c']
-- any: ['src/xpm/**']
-- any: ['src/xpm_w32.*']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'nsis/**'
+        - 'src/*.bat'
+        - 'src/*.bmp'
+        - 'src/*.ico'
+        - 'src/GvimExt/*'
+        - 'src/INSTALLpc.txt'
+        - 'src/Make_cyg*.mak'
+        - 'src/Make_ming.mak'
+        - 'src/Make_mvc.mak'
+        - 'src/dosinst.*'
+        - 'src/gui_dwrite.*'
+        - 'src/gui_w32*'
+        - 'src/if_ole.*'
+        - 'src/iid_ole.c'
+        - 'src/os_mswin*'
+        - 'src/os_w32*'
+        - 'src/os_win32.*'
+        - 'src/proto/gui_w32.pro'
+        - 'src/proto/os_mswin.pro'
+        - 'src/proto/os_win32.pro'
+        - 'src/proto/winclip.pro'
+        - 'src/uninstall.c'
+        - 'src/vim.manifest'
+        - 'src/vim.rc'
+        - 'src/vimrun.c'
+        - 'src/winclip.c'
+        - 'src/xpm/**'
+        - 'src/xpm_w32.*'
 
 runtime:
-- any: ['runtime/ftplugin']
-- any: ['runtime/syntax']
-- any: ['runtime/indent']
-- any: ['runtime/pack/dist/opt/termdebug/plugin/termdebug.vim']
-
-termdebug: runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'runtime/ftplugin'
+        - 'runtime/syntax'
+        - 'runtime/indent'
+        - 'runtime/pack/dist/opt/termdebug/plugin/termdebug.vim'
+
+termdebug:
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'runtime/pack/dist/opt/termdebug/plugin/termdebug.vim'
 
 plugin-netrw:
-- any: ['runtime/plugin/netrwPlugin.vim']
-- any: ['runtime/autoload/netrw*']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'runtime/plugin/netrwPlugin.vim'
+        - 'runtime/autoload/netrw*'
 
 xxd:
-- any: ['src/xxd/*']
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - 'src/xxd/*'

.github/workflows/codeql-analysis.yml

@@ -48,7 +48,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -73,4 +73,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/label.yml

@@ -17,8 +17,6 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        configuration-path: .github/labeler.yml
-        sync-labels: ''

Filelist

@@ -4,7 +4,6 @@
 # source files for all source archives
 SRC_ALL =	\
 		.cirrus.yml \
-		.coveralls.yml \
 		.gitattributes \
 		.github/CODEOWNERS \
 		.github/ISSUE_TEMPLATE/bug_report.yml \
@@ -863,6 +862,7 @@ RT_DOS =	\
 		README_dos.txt \
 		runtime/doc/Make_mvc.mak \
 		runtime/tutor/Make_mvc.mak \
+		runtime/lang/Make_mvc.mak \
 		vimtutor.bat \
 
 # DOS runtime without CR-LF translation (also in the extra archive)
@@ -1073,7 +1073,6 @@ LANG_SRC = \
 # the language files for the Win32 lang archive
 LANG_DOS = \
 		src/po/*.mo \
-		runtime/lang/Make_mvc.mak \
 
 # Files in the repository that are deliberately not listed above, and will thus
 # be excluded from distribution tarballs and the like.

runtime/autoload/context.vim

@@ -3,7 +3,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2022 Sep 19
+# Latest Revision:    2023 Dec 26
 
 # Typesetting {{{
 import autoload './typeset.vim'

runtime/autoload/dist/ft.vim

@@ -1186,26 +1186,46 @@ export def FTv()
     # ":setf" will do nothing, bail out early
     return
   endif
+  if exists("g:filetype_v")
+    exe "setf " .. g:filetype_v
+    return
+  endif
 
-  for line in getline(1, 200)
-    if line[0] =~ '^\s*/'
+  var in_comment = 0
+  for lnum in range(1, min([line("$"), 200]))
+    var line = getline(lnum)
+    # Skip Verilog and V comments (lines and blocks).
+    if line =~ '^\s*/\*'
+      # start comment block
+      in_comment = 1
+    endif
+    if in_comment == 1
+      if line =~ '\*/'
+        # end comment block
+        in_comment = 0
+      endif
+      # skip comment-block line
+      continue
+    endif
+    if line =~ '^\s*//'
       # skip comment line
       continue
     endif
 
-    # Verilog: line ends with ';' followed by an optional variable number of
-    # spaces and an optional start of a comment.
-    # Example: " b <= a + 1; // Add 1".
-    if line =~ ';\(\s*\)\?\(/.*\)\?$'
-      setf verilog
+    # Coq: line ends with a '.' followed by an optional variable number of
+    # spaces or contains the start of a comment, but not inside a Verilog or V
+    # comment.
+    # Example: "Definition x := 10. (*".
+    if (line =~ '\.\s*$' && line !~ '/[/*]') || (line =~ '(\*' && line !~ '/[/*].*(\*')
+      setf coq
       return
     endif
 
-    # Coq: line ends with a '.' followed by an optional variable number of
+    # Verilog: line ends with ';' followed by an optional variable number of
     # spaces and an optional start of a comment.
-    # Example: "Definition x := 10. (*".
-    if line =~ '\.\(\s*\)\?\((\*.*\)\?$'
-      setf coq
+    # Example: " b <= a + 1; // Add 1".
+    if line =~ ';\s*\(/[/*].*\)\?$'
+      setf verilog
       return
     endif
   endfor