Merge remote-tracking branch 'upstream/master' into tabsidebar

.github/MAINTAINERS

@@ -273,6 +273,7 @@ runtime/ftplugin/scss.vim		@tpope
 runtime/ftplugin/sdoc.vim		@gpanders
 runtime/ftplugin/sed.vim		@dkearns
 runtime/ftplugin/sh.vim			@dkearns
+runtime/ftplugin/shaderslang.vim        @mTvare6
 runtime/ftplugin/slint.vim		@ribru17
 runtime/ftplugin/snakemake.vim		@ribru17
 runtime/ftplugin/solidity.vim		@cothi
@@ -291,6 +292,7 @@ runtime/ftplugin/tcsh.vim		@dkearns
 runtime/ftplugin/terraform.vim		@JannoTjarks
 runtime/ftplugin/tf.vim			@ribru17
 runtime/ftplugin/thrift.vim		@jiangyinzuo
+runtime/ftplugin/tiasm.vim		@Freed-Wu
 runtime/ftplugin/tidy.vim		@dkearns
 runtime/ftplugin/tmux.vim		@ericpruitt
 runtime/ftplugin/toml.vim		@averms
@@ -590,6 +592,7 @@ runtime/syntax/scss.vim			@tpope
 runtime/syntax/sdoc.vim			@gpanders
 runtime/syntax/sed.vim			@dkearns
 runtime/syntax/shared/debversions.vim	@jamessan
+runtime/syntax/shaderslang.vim          @mTvare6
 runtime/syntax/solidity.vim		@cothi
 runtime/syntax/spec.vim			@ignatenkobrain
 runtime/syntax/sqloracle.vim		@chrisbra
@@ -608,6 +611,7 @@ runtime/syntax/tcsh.vim			@dkearns
 runtime/syntax/teraterm.vim		@k-takata
 runtime/syntax/terraform.vim		@gpanders
 runtime/syntax/thrift.vim		@jiangyinzuo
+runtime/syntax/tiasm.vim		@Freed-Wu
 runtime/syntax/tidy.vim			@dkearns
 runtime/syntax/tmux.vim			@ericpruitt
 runtime/syntax/toml.vim			@averms

.github/workflows/ci.yml

@@ -215,21 +215,6 @@ jobs:
           sudo usermod -a -G audio "${USER}"
           sudo bash ci/setup-xvfb.sh
 
-      - name: Set up snd-dummy
-        if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
-        env:
-          DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
-        uses: tecolicom/actions-use-apt-tools@main
-        with:
-          tools: linux-modules-extra-${{ env.LINUX_VERSION }}
-          path: "${DEST_DIR}"
-
-      - name: modprobe snd-dummy
-        if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
-        run: |
-          sudo depmod --verbose
-          sudo modprobe --verbose snd-dummy || true
-
       - name: Check autoconf
         if: contains(matrix.extra, 'unittests')
         run: |

runtime/autoload/dist/ft.vim

@@ -3,7 +3,7 @@ vim9script
 # Vim functions for file type detection
 #
 # Maintainer:		The Vim Project <https://github.com/vim/vim>
-# Last Change:		2024 May 23
+# Last Change:		2025 Jan 11
 # Former Maintainer:	Bram Moolenaar <[email protected]>
 
 # These functions are moved here from runtime/filetype.vim to make startup
@@ -32,6 +32,10 @@ enddef
 # This function checks for the kind of assembly that is wanted by the user, or
 # can be detected from the first five lines of the file.
 export def FTasm()
+  # tiasm uses `* commment`
+  if join(getline(1, 10), "\n") =~ '\%(\%(^\|\n\)\*\|Texas Instruments Incorporated\)'
+    setf tiasm
+  endif
   # make sure b:asmsyntax exists
   if !exists("b:asmsyntax")
     b:asmsyntax = ""
@@ -433,7 +437,7 @@ export def FThtml()
 
   while n < 40 && n <= line("$")
     # Check for Angular
-    if getline(n) =~ '@\(if\|for\|defer\|switch\)\|\*\(ngIf\|ngFor\|ngSwitch\|ngTemplateOutlet\)\|ng-template\|ng-content\|{{.*}}'
+    if getline(n) =~ '@\(if\|for\|defer\|switch\)\|\*\(ngIf\|ngFor\|ngSwitch\|ngTemplateOutlet\)\|ng-template\|ng-content'
       setf htmlangular
       return
     endif
@@ -1003,6 +1007,14 @@ export def SQL()
   endif
 enddef
 
+export def FTsa()
+  if join(getline(1, 4), "\n") =~# '\%(^\|\n\);'
+    setf tiasm
+    return
+  endif
+  setf sather
+enddef
+
 # This function checks the first 25 lines of file extension "sc" to resolve
 # detection between scala and SuperCollider.
 # NOTE: We don't check for 'Class : Method', as this can easily be confused

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.1.  Last change: 2025 Jan 02
+*builtin.txt*	For Vim version 9.1.  Last change: 2025 Jan 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5002,12 +5002,12 @@ getstacktrace()						*getstacktrace()*
 		Returns the current stack trace of Vim scripts.
 		Stack trace is a |List|, of which each item is a |Dictionary|
 		with the following items:
-		    funcref	The funcref if the stack is at the function,
-				otherwise this item is not exist.
+		    funcref	The funcref if the stack is at a function,
+				otherwise this item is omitted.
 		    event	The string of the event description if the
-				stack is at autocmd event, otherwise this item
-				is not exist.
-		    lnum	The line number of the script on the stack.
+				stack is at an autocmd event, otherwise this
+				item is omitted.
+		    lnum	The line number in the script on the stack.
 		    filepath	The file path of the script on the stack.
 
 		Return type: list<dict<any>>
@@ -9038,7 +9038,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		's'	Set the ' mark at the previous location of the cursor
 		'w'	Wrap around the end of the file
 		'W'	don't Wrap around the end of the file
-		'z'	start searching at the cursor column instead of zero
+		'z'	start searching at the cursor column instead of Zero
 		If neither 'w' or 'W' is given, the 'wrapscan' option applies.
 
 		If the 's' flag is supplied, the ' mark is set, only if the

runtime/doc/helphelp.txt

@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 9.1.  Last change: 2024 Dec 26
+*helphelp.txt*	For Vim version 9.1.  Last change: 2025 Jan 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -247,10 +247,10 @@ command: >
 			(requires write permission there): >
 				:helptags $VIMRUNTIME/doc
 <
-					*:HelpToc* *help-TOC* *help-toc-install*
+		*:HelpToc* *help-TOC* *help-toc-install* *package-helptoc*
 
 If you want to access an interactive table of contents, from any position in
-the file, you can use the helptoc plugin.  Load the plugin with: >
+the file, you can use the helptoc plugin.  Load the plugin with: >vim
 
     packadd helptoc
 

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.1.  Last change: 2024 Dec 28
+*options.txt*	For Vim version 9.1.  Last change: 2025 Jan 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4348,7 +4348,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 				     #:TabLineSel,_:TabLineFill,!:CursorColumn,
 				     .:CursorLine,o:ColorColumn,q:QuickFixLine,
 				     z:StatusLineTerm,Z:StatusLineTermNC,
-				     g:MsgArea")
+				     g:MsgArea,h:ComplMatchIns")
 			global
 	This option can be used to set highlighting mode for various
 	occasions.  It is a comma-separated list of character pairs.  The
@@ -4368,6 +4368,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|hl-MoreMsg|	 m  |more-prompt|
 	|hl-ModeMsg|	 M  Mode (e.g., "-- INSERT --")
 	|hl-MsgArea|	 g  |Command-line| and message area
+	|hl-ComplMatchIns| h  matched text of currently inserted completion
 	|hl-LineNr|	 n  line number for ":number" and ":#" commands, and
 			    when 'number' or 'relativenumber' option is set.
 	|hl-LineNrAbove|   a  line number above the cursor for when the

runtime/doc/popup.txt

@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 9.1.  Last change: 2024 Dec 19
+*popup.txt*  For Vim version 9.1.  Last change: 2025 Jan 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -257,8 +257,8 @@ popup_clear([{force}])
 
 
 popup_close({id} [, {result}])				*popup_close()*
-		Close popup {id}.  The window and the associated buffer will
-		be deleted.
+		Close popup {id}.  The window will be deleted.  The associated
+		buffer will be deleted, if the popup created a new buffer.
 
 		If the popup has a callback it will be called just before the
 		popup window is deleted.  If the optional {result} is present

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 9.1.  Last change: 2024 Dec 27
+*quickfix.txt*  For Vim version 9.1.  Last change: 2025 Jan 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -550,9 +550,9 @@ EXECUTE A COMMAND IN ALL THE BUFFERS IN QUICKFIX OR LOCATION LIST:
 <			Otherwise it works the same as `:ldo`.
 
 FILTERING A QUICKFIX OR LOCATION LIST:
-				    *cfilter-plugin* *:Cfilter* *:Lfilter*
+		    *cfilter-plugin* *:Cfilter* *:Lfilter* *package-cfilter*
 If you have too many entries in a quickfix list, you can use the cfilter
-plugin to reduce the number of entries.  Load the plugin with: >
+plugin to reduce the number of entries.  Load the plugin with: >vim
 
     packadd cfilter
 

runtime/doc/tags

@@ -2143,6 +2143,7 @@ $quote	eval.txt	/*$quote*
 :GnatTags	ft_ada.txt	/*:GnatTags*
 :HelpToc	helphelp.txt	/*:HelpToc*
 :Hexplore	pi_netrw.txt	/*:Hexplore*
+:Justify	usr_25.txt	/*:Justify*
 :LP	pi_logipat.txt	/*:LP*
 :LPE	pi_logipat.txt	/*:LPE*
 :LPF	pi_logipat.txt	/*:LPF*
@@ -5581,6 +5582,7 @@ J	change.txt	/*J*
 Japanese	mbyte.txt	/*Japanese*
 Job	eval.txt	/*Job*
 Jobs	eval.txt	/*Jobs*
+Justify()	usr_25.txt	/*Justify()*
 K	various.txt	/*K*
 KDE	gui_x11.txt	/*KDE*
 KVim	gui_x11.txt	/*KVim*
@@ -8556,6 +8558,7 @@ jump-motions	motion.txt	/*jump-motions*
 jumplist	motion.txt	/*jumplist*
 jumplist-stack	motion.txt	/*jumplist-stack*
 jumpto-diffs	diff.txt	/*jumpto-diffs*
+justify	usr_25.txt	/*justify*
 k	motion.txt	/*k*
 kcc	uganda.txt	/*kcc*
 kde	gui_x11.txt	/*kde*
@@ -9402,9 +9405,17 @@ out_name	channel.txt	/*out_name*
 out_timeout	channel.txt	/*out_timeout*
 p	change.txt	/*p*
 pack-add	repeat.txt	/*pack-add*
+package-cfilter	quickfix.txt	/*package-cfilter*
+package-comment	usr_05.txt	/*package-comment*
 package-create	repeat.txt	/*package-create*
 package-doc	repeat.txt	/*package-doc*
 package-documentation	repeat.txt	/*package-documentation*
+package-editorconfig	usr_05.txt	/*package-editorconfig*
+package-helptoc	helphelp.txt	/*package-helptoc*
+package-justify	usr_25.txt	/*package-justify*
+package-matchit	usr_05.txt	/*package-matchit*
+package-nohlsearch	usr_05.txt	/*package-nohlsearch*
+package-termdebug	terminal.txt	/*package-termdebug*
 package-translate_example	repeat.txt	/*package-translate_example*
 package-translation	repeat.txt	/*package-translation*
 packages	repeat.txt	/*packages*

runtime/doc/terminal.txt

@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 9.1.  Last change: 2024 Dec 30
+*terminal.txt*	For Vim version 9.1.  Last change: 2025 Jan 11
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1254,7 +1254,7 @@ Alternatively, press "s" to swap the first and second dump. Do this several
 times so that you can spot the difference in the context of the text.
 
 ==============================================================================
-6. Debugging				*terminal-debug* *terminal-debugger*
+6. Debugging	*terminal-debug* *terminal-debugger* *package-termdebug*
 
 The Terminal debugging plugin can be used to debug a program with gdb and view
 the source code in a Vim window.  Since this is completely contained inside

runtime/doc/usr_02.txt

@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 9.1.  Last change: 2024 Oct 05
+*usr_02.txt*	For Vim version 9.1.  Last change: 2025 Jan 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -694,6 +694,13 @@ Summary:					*help-summary*  >
 	:help E128
 <    takes you to the |:function| command
 
+27) Documenction for packages distributed with Vim have the form package-<name>.
+     So >
+	:help package-comment
+<
+    will bring you to the help section for the included comment plugin and how to
+    enable it.
+
 
 ==============================================================================
 

runtime/doc/usr_05.txt

@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 9.1.  Last change: 2024 Oct 05
+*usr_05.txt*	For Vim version 9.1.  Last change: 2025 Jan 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -392,7 +392,7 @@ The ":map" command (with no arguments) lists your current mappings.  At
 least the ones for Normal mode.  More about mappings in section |40.1|.
 
 ==============================================================================
-*05.5*	Adding a package			*add-package* *matchit-install*
+*05.5*	Adding a package  *add-package* *matchit-install* *package-matchit*
 
 A package is a set of files that you can add to Vim.  There are two kinds of
 packages: optional and automatically loaded on startup.
@@ -427,7 +427,7 @@ an archive or as a repository.  For an archive you can follow these steps:
 	   Here "fancytext" is the name of the package, it can be anything
 	   else.
 
-Adding the editorconfig package				*editorconfig-install*
+Adding the editorconfig package *editorconfig-install* *package-editorconfig*
 
 Similar to the matchit package, to load the distributed editorconfig plugin
 when Vim starts, add the following line to your vimrc file: >
@@ -437,7 +437,7 @@ After restarting your Vim, the plugin is active and you can read about it at: >
 	:h editorconfig.txt
 
 
-Adding comment package					*comment-install*
+Adding comment package			*comment-install* *package-comment*
 
 Load the plugin with this command: >
 	packadd comment
@@ -450,7 +450,7 @@ the package loaded.  Once the package is loaded, read about it at: >
 	:h comment.txt
 
 
-Adding nohlsearch package				*nohlsearch-install*
+Adding nohlsearch package	*nohlsearch-install* *package-nohlsearch*
 
 Load the plugin with this command: >
 	packadd nohlsearch

runtime/doc/usr_25.txt

@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 9.1.  Last change: 2016 Mar 28
+*usr_25.txt*	For Vim version 9.1.  Last change: 2025 Jan 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -190,15 +190,15 @@ This results in the following:
 	story. ~
 
 
-JUSTIFYING TEXT
+JUSTIFYING TEXT			*justify* *:Justify* *Justify()* *package-justify*
 
 Vim has no built-in way of justifying text.  However, there is a neat macro
 package that does the job.  To use this package, execute the following
-command: >
+command: >vim
 
 	:packadd justify
 
-Or put this line in your |vimrc|: >
+Or put this line in your |vimrc|: >vim
 
 	packadd! justify
 

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2024 Dec 31
+" Last Change:	2025 Jan 08
 " Former Maintainer:	Bram Moolenaar <[email protected]>
 
 " Listen very carefully, I will say this only once
@@ -2185,7 +2185,7 @@ au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake	setf ruby
 au BufNewFile,BufRead *.rs			setf rust
 au BufNewFile,BufRead Cargo.lock,*/.cargo/config,*/.cargo/credentials	setf toml
 
-" S-lang (or shader language, or SmallLisp)
+" S-lang
 au BufNewFile,BufRead *.sl			setf slang
 
 " Sage
@@ -2200,15 +2200,18 @@ au BufNewFile,BufRead *.sas			setf sas
 " Sass
 au BufNewFile,BufRead *.sass			setf sass
 
-" Sather
-au BufNewFile,BufRead *.sa			setf sather
+" Sather, TI linear assembly
+au BufNewFile,BufRead *.sa			call dist#ft#FTsa()
 
 " Scala
 au BufNewFile,BufRead *.scala			setf scala
 
 " SBT - Scala Build Tool
 au BufNewFile,BufRead *.sbt			setf sbt
 
+" Slang Shading Language
+au BufNewFile,BufRead *.slang			setf shaderslang
+
 " Slint
 au BufNewFile,BufRead *.slint			setf slint