Merge remote-tracking branch 'vim/master'

Author: ychin

.cirrus.yml

@@ -21,3 +21,10 @@ freebsd_task:
     - pw useradd cirrus -m
     - chown -R cirrus:cirrus .
     - sudo -u cirrus make test
+  on_failure:
+    screendump_artifacts:
+      name: "Cirrus-CI-freebsd-failed-tests"
+      path: |
+        runtime/syntax/testdir/failed/*
+        src/testdir/failed/*
+      type: application/octet-stream

.github/MAINTAINERS

@@ -163,6 +163,7 @@ runtime/ftplugin/gitconfig.vim		@tpope
 runtime/ftplugin/gitignore.vim		@ObserverOfTime
 runtime/ftplugin/gitrebase.vim		@tpope
 runtime/ftplugin/gitsendemail.vim	@tpope
+runtime/ftplugin/gleam.vim		@trilowy
 runtime/ftplugin/go.vim			@dbarnett
 runtime/ftplugin/goaccess.vim		@meonkeys
 runtime/ftplugin/gomod.vim		@yu-yk
@@ -178,6 +179,7 @@ runtime/ftplugin/hgcommit.vim		@k-takata
 runtime/ftplugin/hlsplaylist.vim		@avidseeker
 runtime/ftplugin/hog.vim		@wtfbbqhax
 runtime/ftplugin/html.vim		@dkearns
+runtime/ftplugin/http.vim		@ribru17
 runtime/ftplugin/hyprlang.vim		@ribru17
 runtime/ftplugin/i3config.vim		@hiqua
 runtime/ftplugin/icon.vim		@dkearns
@@ -480,6 +482,7 @@ runtime/syntax/j.vim			@glts
 runtime/syntax/jargon.vim		@h3xx
 runtime/syntax/java.vim			@zzzyxwvut
 runtime/syntax/javascript.vim		@fleiner
+runtime/syntax/jinja.vim		@gpanders
 runtime/syntax/jj.vim			@gpanders
 runtime/syntax/json.vim		        @vito-c
 runtime/syntax/jsonc.vim		@izhakjakov
@@ -491,6 +494,7 @@ runtime/syntax/kotlin.vim		@udalov
 runtime/syntax/kdl.vim			@imsnif @jiangyinzuo
 runtime/syntax/krl.vim			@KnoP-01
 runtime/syntax/less.vim			@genoma
+runtime/syntax/lf.vim			@andis-sprinkis
 runtime/syntax/liquid.vim		@tpope
 runtime/syntax/lua.vim			@marcuscf
 runtime/syntax/lyrics.vim		@ObserverOfTime
@@ -550,6 +554,7 @@ runtime/syntax/rng.vim			@jhradilek
 runtime/syntax/routeros.vim		@zainin
 runtime/syntax/rst.vim			@marshallward
 runtime/syntax/ruby.vim			@dkearns
+runtime/syntax/salt.vim			@gpanders
 runtime/syntax/sass.vim			@tpope
 runtime/syntax/scala.vim		@derekwyatt
 runtime/syntax/scheme.vim		@evhan
@@ -608,6 +613,7 @@ runtime/tutor/tutor.ru.cp1251		@RestorerZ
 runtime/tutor/tutor.ru.utf-8		@RestorerZ
 src/iscygpty.*				@k-takata
 src/libvterm/				@leonerd
+src/po/am.po				@gagikh
 src/po/ca.po				@nfdisco
 src/po/de.po				@chrisbra
 src/po/eo.po				@dpelle

Makefile

@@ -61,6 +61,9 @@ indenttest:
 # Executable used for running the syntax tests.
 VIM_FOR_SYNTAXTEST = ../../src/vim
 
+# (For local testing only with GNU Make.)
+VIM_SYNTAX_TEST_FILTER =
+
 syntaxtest:
 	cd runtime/syntax && \
 		$(MAKE) clean && \
@@ -153,7 +156,7 @@ MINOR = 1
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   This creates the directory vim/vim90 and puts all files in there.
+#   This creates the directory vim/vim91 and puts all files in there.
 # Win32 console version build:
 # - See src/INSTALLpc.txt for installing the compiler and SDK.
 # - Set environment for Visual C++ 2015:
@@ -209,7 +212,7 @@ MINOR = 1
 #	gvimext64.dll in src/GvimExt
 #   gvimext64.dll can be obtained from:
 #   https://github.com/vim/vim-win32-installer/releases
-#	It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll.
+#	It is part of gvim_9.1.*_x64.zip as vim/vim91/GvimExt/gvimext64.dll.
 # - Make sure there is a diff.exe two levels up (get it from a previous Vim
 #   version).  Also put winpty32.dll and winpty-agent.exe there.
 # - go to ../nsis and do:
@@ -285,10 +288,10 @@ dist/$(COMMENT_RT): dist/comment
 	echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT)
 
 dist/$(COMMENT_W32): dist/comment
-	echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows NT/95" > dist/$(COMMENT_W32)
+	echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows" > dist/$(COMMENT_W32)
 
 dist/$(COMMENT_GVIM): dist/comment
-	echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows NT/95" > dist/$(COMMENT_GVIM)
+	echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows" > dist/$(COMMENT_GVIM)
 
 dist/$(COMMENT_OLE): dist/comment
 	echo "Vim - Vi IMproved - v$(VDOT) MS-Windows GUI binaries with OLE support" > dist/$(COMMENT_OLE)

READMEdir/README_amibin.txt

@@ -2,7 +2,7 @@ README_amibin.txt for version 9.1 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim90rt.tgz).
+These files are in the runtime archive (vim91rt.tgz).
 
 
 The Amiga "bin" archive contains the Vim executable for the Amiga.  It was

READMEdir/README_amisrc.txt

@@ -2,7 +2,7 @@ README_amisrc.txt for version 9.1 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim90rt.tgz).
+These files are in the runtime archive (vim91rt.tgz).
 
 
 The Amiga source archive contains the files needed to compile Vim on the

READMEdir/README_bindos.txt

@@ -2,15 +2,15 @@ README_bindos.txt for version 9.1 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim90rt.zip).
+These files are in the runtime archive (vim91rt.zip).
 
 
 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim91w32.zip	Windows 95/98/NT/etc. console version
-	gvim91.zip	Windows 95/98/NT/etc. GUI version
-	gvim91ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	vim91w32.zip	Windows console version
+	gvim91.zip	Windows GUI version
+	gvim91ole.zip	Windows GUI version with OLE
 
 You MUST also get the runtime archive (vim91rt.zip).
 The sources are also available (vim91src.zip).

READMEdir/README_dos.txt

@@ -120,30 +120,6 @@ Remarks:
   entry, you can remove it by running the "uninstall.exe".  See
   ":help win32-popup-menu".
 
-- In Windows 95/98/NT you can create a shortcut to Vim.  This works for all
-  DOS and Win32 console versions.  For the console version this gives you the
-  opportunity to set defaults for the Console where Vim runs in.
-
-  1. On the desktop, click right to get a menu.  Select New/Shortcut.
-  2. In the dialog, enter Command line: "C:\command.com".  Click "Next".
-  3. Enter any name.  Click "Finish".
-     The new shortcut will appear on the desktop.
-  4. With the mouse pointer on the new shortcut, click right to get a menu.
-     Select Properties.
-  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
-     Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim91\vim.exe
-	C:\command.com /c D:\editors\vim\vim91\vim.exe
-  6. Select the font, window size, etc. that you like.  If this isn't
-     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
-     mode".
-  7. Click OK.
-
-  For gvim, you can use a normal shortcut on the desktop, and set the size of
-  the Window in your $VIM/_gvimrc:
-	set lines=30 columns=90
-
-
 For further information, type one of these inside Vim:
 	:help dos
 	:help win32

READMEdir/README_extra.txt

@@ -29,7 +29,7 @@ src/gui_w32.*		Files for the Win32 GUI.
 src/gui_w48.*		Files for the Win32 and Win16 GUI.
 src/Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.
 
-src/if_ole.*		OLE automation interface, for MS Windows 95 and NT.
+src/if_ole.*		OLE automation interface, for MS Windows.
 
 src/GvimExt/*		DLL for the "Edit with Vim" context menu entry
 

READMEdir/README_ole.txt

@@ -3,7 +3,7 @@ README_ole.txt for version 9.1 of Vim: Vi IMproved.
 This archive contains gvim.exe with OLE interface.
 This version of gvim.exe can also load a number of interface dynamically (you
 can optionally install the .dll files for each interface).
-It is only for MS-Windows 95/98/ME/NT/2000/XP.
+It is only for MS-Windows.
 
 Also see the README_bindos.txt, README_dos.txt and README.txt files.
 

READMEdir/README_srcdos.txt

@@ -2,7 +2,7 @@ README_srcdos.txt for version 9.1 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-Windows.
-These files are in the runtime archive (vim90rt.zip).
+These files are in the runtime archive (vim91rt.zip).
 
 
 The DOS source archive contains the files needed to compile Vim on MS-Windows.