Merge remote-tracking branch 'vim/master'

Author: ychin

.github/MAINTAINERS

@@ -13,6 +13,7 @@ nsis/lang/russian.nsi			@RestorerZ
 runtime/autoload/freebasic.vim		@dkearns
 runtime/autoload/hare.vim		@selenebun
 runtime/autoload/haskell.vim		@alx741
+runtime/autoload/hcl.vim		@gpanders
 runtime/autoload/javascript.vim		@jsit
 runtime/autoload/modula2.vim		@dkearns
 runtime/autoload/php.vim		@david-szabo97
@@ -170,6 +171,7 @@ runtime/ftplugin/haml.vim		@tpope
 runtime/ftplugin/hare.vim		@selenebun
 runtime/ftplugin/haredoc.vim		@selenebun
 runtime/ftplugin/heex.vim		@cvincent
+runtime/ftplugin/hcl.vim		@gpanders
 runtime/ftplugin/hgcommit.vim		@k-takata
 runtime/ftplugin/hlsplaylist.vim		@avidseeker
 runtime/ftplugin/hog.vim		@wtfbbqhax
@@ -213,6 +215,7 @@ runtime/ftplugin/nginx.vim		@chr4
 runtime/ftplugin/nim.vim		@ribru17
 runtime/ftplugin/nroff.vim		@a-vrma
 runtime/ftplugin/nsis.vim		@k-takata
+runtime/ftplugin/nu.vim		@mrcjkb
 runtime/ftplugin/octave.vim		@dkearns
 runtime/ftplugin/ondir.vim		@jparise
 runtime/ftplugin/openvpn.vim		@ObserverOfTime
@@ -315,6 +318,7 @@ runtime/indent/go.vim			@dbarnett
 runtime/indent/gyp.vim			@ObserverOfTime
 runtime/indent/haml.vim			@tpope
 runtime/indent/hare.vim			@selenebun
+runtime/indent/hcl.vim			@gpanders
 runtime/indent/hog.vim			@wtfbbqhax
 runtime/indent/idlang.vim		@dkearns
 runtime/indent/j.vim			@glts
@@ -359,6 +363,7 @@ runtime/indent/systemverilog.vim	@Kocha
 runtime/indent/tcl.vim			@dkearns
 runtime/indent/tcsh.vim			@dkearns
 runtime/indent/teraterm.vim		@k-takata
+runtime/indent/terraform.vim		@gpanders
 runtime/indent/thrift.vim		@jiangyinzuo
 runtime/indent/typescript.vim		@HerringtonDarkholme
 runtime/indent/typst.vim		@gpanders
@@ -458,6 +463,7 @@ runtime/syntax/haml.vim			@tpope
 runtime/syntax/hare.vim			@selenebun
 runtime/syntax/haredoc.vim		@selenebun
 runtime/syntax/haskell.vim		@coot
+runtime/syntax/hcl.vim			@gpanders
 runtime/syntax/help_ru.vim		@RestorerZ
 runtime/syntax/hgcommit.vim		@k-takata
 runtime/syntax/hitest.vim		@lacygoill
@@ -565,6 +571,7 @@ runtime/syntax/systemverilog.vim	@Kocha
 runtime/syntax/tap.vim			@petdance
 runtime/syntax/tcsh.vim			@dkearns
 runtime/syntax/teraterm.vim		@k-takata
+runtime/syntax/terraform.vim		@gpanders
 runtime/syntax/thrift.vim		@jiangyinzuo
 runtime/syntax/tidy.vim			@dkearns
 runtime/syntax/tmux.vim			@ericpruitt

runtime/autoload/getscript.vim

@@ -6,6 +6,9 @@
 "  Version:	36
 "  Installing:	:help glvs-install
 "  Usage:	:help glvs
+"  Last Change:	{{{1
+"   2024 Sep 08 by Vim Project: several small fixes
+"  }}}
 "
 " GetLatestVimScripts: 642 1 :AutoInstall: getscript.vim
 "redraw!|call inputsave()|call input("Press <cr> to continue")|call inputrestore()
@@ -64,7 +67,7 @@ if !exists("g:GetLatestVimScripts_options")
  if g:GetLatestVimScripts_wget == "wget"
   let g:GetLatestVimScripts_options= "-q -O"
  elseif g:GetLatestVimScripts_wget == "curl"
-  let g:GetLatestVimScripts_options= "-s -O"
+  let g:GetLatestVimScripts_options= "-s -o"
  else
   let g:GetLatestVimScripts_options= ""
  endif
@@ -77,7 +80,11 @@ endif
 
 " set up default scriptaddr address
 if !exists("g:GetLatestVimScripts_scriptaddr")
- let g:GetLatestVimScripts_scriptaddr = 'http://vim.sourceforge.net/script.php?script_id='
+ let g:GetLatestVimScripts_scriptaddr = 'https://www.vim.org/scripts/script.php?script_id='
+endif
+
+if !exists("g:GetLatestVimScripts_downloadaddr")
+  let g:GetLatestVimScripts_downloadaddr = 'https://www.vim.org/scripts/download_script.php?src_id='
 endif
 
 "" For debugging:
@@ -89,11 +96,11 @@ endif
 let s:autoinstall= ""
 if g:GetLatestVimScripts_allowautoinstall
 
- if (has("win32") || has("gui_win32") || has("gui_win32s") || has("win16") || has("win64") || has("win32unix") || has("win95")) && &shell != "bash"
+ if (has("win32") || has("gui_win32") || has("gui_win32s") || has("win16") || has("win64") || has("win32unix") || has("win95")) && &shell !~ '\cbash\|pwsh\|powershell'
   " windows (but not cygwin/bash)
   let s:dotvim= "vimfiles"
   if !exists("g:GetLatestVimScripts_mv")
-   let g:GetLatestVimScripts_mv= "ren"
+   let g:GetLatestVimScripts_mv= "move"
   endif
 
  else
@@ -208,9 +215,10 @@ fun! getscript#GetLatestVimScripts()
 "  call Decho("searching plugins for GetLatestVimScripts dependencies")
   let lastline    = line("$")
 "  call Decho("lastline#".lastline)
-  let firstdir    = substitute(&rtp,',.*$','','')
+  let firstdir    = substitute(&rtp,',.{-}$','','')
   let plugins     = split(globpath(firstdir,"plugin/**/*.vim"),'\n')
-  let plugins     = plugins + split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
+  let plugins     += split(globpath(firstdir,"ftplugin/**/*.vim"),'\n')
+  let plugins     += split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
   let foundscript = 0
 
   " this loop updates the GetLatestVimScripts.dat file
@@ -515,11 +523,11 @@ fun! s:GetOneScript(...)
 "   call Decho(".downloading new <".sname.">")
    echomsg ".downloading new <".sname.">"
    if has("win32") || has("win16") || has("win95")
-"    call Decho(".new|exe silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id='.latestsrcid)."|q")
-    new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id='.latestsrcid)|q
+"    call Decho(".new|exe silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)."|q")
+    new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)|q
    else
-"    call Decho(".exe silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id='))
-    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id=').latestsrcid
+"    call Decho(".exe silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr).latestsrcid
+    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr).latestsrcid
    endif
 
    " --------------------------------------------------------------------------
@@ -573,7 +581,7 @@ fun! s:GetOneScript(...)
 "      call Decho("no decompression needed")
      endif
 
-     " distribute archive(.zip, .tar, .vba, ...) contents
+     " distribute archive(.zip, .tar, .vba, .vmb, ...) contents
      if sname =~ '\.zip$'
 "      call Decho("dearchive: attempt to unzip ".sname)
       exe "silent !unzip -o ".shellescape(sname)
@@ -592,7 +600,7 @@ fun! s:GetOneScript(...)
      elseif sname =~ '\.txz$'
 "      call Decho("dearchive: attempt to untar+xz ".sname)
       exe "silent !tar -Jxvf ".shellescape(sname)
-     elseif sname =~ '\.vba$'
+     elseif sname =~ '\.vba$\|\.vmb$'
 "      call Decho("dearchive: attempt to handle a vimball: ".sname)
       silent 1split
       if exists("g:vimball_home")

runtime/autoload/hcl.vim

@@ -0,0 +1,40 @@
+" Language:    HCL
+" Maintainer:  Gregory Anders
+" Last Change: 2024-09-03
+" Based on:    https://github.com/hashivim/vim-terraform
+
+function! hcl#indentexpr(lnum)
+  " Beginning of the file should have no indent
+  if a:lnum == 0
+    return 0
+  endif
+
+  " Usual case is to continue at the same indent as the previous non-blank line.
+  let prevlnum = prevnonblank(a:lnum-1)
+  let thisindent = indent(prevlnum)
+
+  " If that previous line is a non-comment ending in [ { (, increase the
+  " indent level.
+  let prevline = getline(prevlnum)
+  if prevline !~# '^\s*\(#\|//\)' && prevline =~# '[\[{\(]\s*$'
+    let thisindent += &shiftwidth
+  endif
+
+  " If the current line ends a block, decrease the indent level.
+  let thisline = getline(a:lnum)
+  if thisline =~# '^\s*[\)}\]]'
+    let thisindent -= &shiftwidth
+  endif
+
+  " If the previous line starts a block comment /*, increase by one
+  if prevline =~# '/\*'
+    let thisindent += 1
+  endif
+
+  " If the previous line ends a block comment */, decrease by one
+  if prevline =~# '\*/'
+    let thisindent -= 1
+  endif
+
+  return thisindent
+endfunction

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 9.1.  Last change: 2024 Aug 23
+*insert.txt*    For Vim version 9.1.  Last change: 2024 Aug 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1191,9 +1191,10 @@ items:
 			to the completion items
 	kind_hlgroup	an additional highlight group specifically for setting
 			the highlight attributes of the completion kind. When
-			this field is present, it will override the |hl-PmenuKind|
-			highlight group, allowing for the customization of
-			ctermfd and guifg properties for the completion kind
+			this field is present, it will override the
+			|hl-PmenuKind| highlight group, allowing for the
+			customization of ctermfg and guifg properties for the
+			completion kind
 
 All of these except "icase", "equal", "dup" and "empty" must be a string.  If
 an item does not meet these requirements then an error message is given and

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 9.1.  Last change: 2024 Jul 11
+*map.txt*       For Vim version 9.1.  Last change: 2024 Aug 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1624,12 +1624,14 @@ completion can be enabled:
 
 	-complete=arglist	file names in argument list
 	-complete=augroup	autocmd groups
+	-complete=behave	|:behave| suboptions
+	-complete=breakpoint	|:breakadd| suboptions
 	-complete=buffer	buffer names
-	-complete=behave	:behave suboptions
 	-complete=color		color schemes
 	-complete=command	Ex command (and arguments)
 	-complete=compiler	compilers
 	-complete=cscope	|:cscope| suboptions
+	-complete=diff_buffer	diff buffer names
 	-complete=dir		directory names
 	-complete=dir_in_path	directory names in |'cdpath'|
 	-complete=environment	environment variable names
@@ -1641,7 +1643,7 @@ completion can be enabled:
 	-complete=function	function name
 	-complete=help		help subjects
 	-complete=highlight	highlight groups
-	-complete=history	:history suboptions
+	-complete=history	|:history| suboptions
 	-complete=keymap	keyboard mappings
 	-complete=locale	locale names (as output of locale -a)
 	-complete=mapclear	buffer argument
@@ -1650,6 +1652,8 @@ completion can be enabled:
 	-complete=messages	|:messages| suboptions
 	-complete=option	options
 	-complete=packadd	optional package |pack-add| names
+	-complete=runtime	file and directory names in |'runtimepath'|
+	-complete=scriptnames	sourced script names
 	-complete=shellcmd	Shell command
 	-complete=sign		|:sign| suboptions
 	-complete=syntax	syntax file names |'syntax'|

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 9.1.  Last change: 2024 Jul 14
+*motion.txt*    For Vim version 9.1.  Last change: 2024 Aug 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -364,11 +364,11 @@ gg			Goto line [count], default first line, on the first
 			See also 'startofline' option.
 
 :[range]go[to] [count]					*:go* *:goto* *go*
-[count]go		Go to [count] byte in the buffer.  Default [count] is
-			one, start of the file.  When giving [range], the
-			last number in it used as the byte count.  End-of-line
-			characters are counted depending on the current
-			'fileformat' setting.
+[count]go		Go to [count] byte in the buffer.  |exclusive| motion.
+			Default [count] is one, start of the file.  When
+			giving [range], the last number in it used as the byte
+			count.  End-of-line characters are counted depending
+			on the current 'fileformat' setting.
 			Also see the |line2byte()| function, and the 'o'
 			option in 'statusline'.
 			{not available when compiled without the

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.1.  Last change: 2024 Aug 12
+*options.txt*	For Vim version 9.1.  Last change: 2024 Sep 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1496,9 +1496,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 		list:{n}    Adds an additional indent for lines that match a
 			    numbered or bulleted list (using the
 			    'formatlistpat' setting).
-		list:-1	    Uses the length of a match with 'formatlistpat'
-			    for indentation.
 			    (default: 0)
+		list:-1	    Uses the width of a match with 'formatlistpat' for
+			    indentation.
 		column:{n}  Indent at column {n}. Will overrule the other
 			    sub-options. Note: an additional indent may be
 			    added for the 'showbreak' setting.

runtime/doc/pi_getscript.txt

@@ -1,4 +1,4 @@
-*pi_getscript.txt*  For Vim version 9.1.  Last change: 2017 Aug 01
+*pi_getscript.txt*  For Vim version 9.1.  Last change: 2024 Sep 08
 >
 		GETSCRIPT REFERENCE MANUAL  by Charles E. Campbell
 <
@@ -20,7 +20,7 @@ Copyright: (c) 2004-2012 by Charles E. Campbell	*glvs-copyright*
 Getscript is a plugin that simplifies retrieval of the latest versions of the
 scripts that you yourself use!  Typing |:GLVS| will invoke getscript; it will
 then use the <GetLatestVimScripts.dat> (see |GetLatestVimScripts_dat|) file to
-get the latest versions of scripts listed therein from http://vim.sf.net/.
+get the latest versions of scripts listed therein from https://www.vim.org/.
 
 ==============================================================================
 1. Contents				*glvs-contents* *glvs* *getscript*
@@ -59,9 +59,9 @@ the "important" part of it is the first two lines.
 
 Your computer needs to have wget or curl for GetLatestVimScripts to do its work.
 
-	1. if compressed:  gunzip getscript.vba.gz
+	1. if compressed:  gunzip getscript.vmb.gz
 	2. Unix:
-		vim getscript.vba
+		vim getscript.vmb
 		:so %
 		:q
 		cd ~/.vim/GetLatest
@@ -70,7 +70,7 @@ Your computer needs to have wget or curl for GetLatestVimScripts to do its work.
 		list of desired plugins -- see |GetLatestVimScripts_dat|)
 
 	3. Windows:
-		vim getscript.vba
+		vim getscript.vmb
 		:so %
 		:q
 		cd **path-to-vimfiles**/GetLatest
@@ -281,11 +281,14 @@ With :AutoInstall: enabled, as it is by default, files which end with
 
 	---.tar.bz2  : decompressed & untarred in .vim/ directory
 	---.vba.bz2  : decompressed in .vim/ directory, then vimball handles it
+	---.vmb.bz2  : decompressed in .vim/ directory, then vimball handles it
 	---.vim.bz2  : decompressed & moved into .vim/plugin directory
 	---.tar.gz   : decompressed & untarred in .vim/ directory
 	---.vba.gz   : decompressed in .vim/ directory, then vimball handles it
+	---.vmb.gz   : decompressed in .vim/ directory, then vimball handles it
 	---.vim.gz   : decompressed & moved into .vim/plugin directory
-	---.vba      : unzipped in .vim/ directory
+	---.vba      : moved to .vim/ directory, then vimball handles it
+	---.vmb      : moved to .vim/ directory, then vimball handles it
 	---.vim      : moved to .vim/plugin directory
 	---.zip      : unzipped in .vim/ directory
 
@@ -300,7 +303,7 @@ When is a script not auto-installable?  Let me give an example:
 The <blockhl.vim> script provides block highlighting for C/C++ programs; it is
 available at:
 
-	http://vim.sourceforge.net/scripts/script.php?script_id=104
+	https://www.vim.org/scripts/script.php?script_id=104
 
 Currently, vim's after/syntax only supports by-filetype scripts (in
 blockhl.vim's case, that's after/syntax/c.vim).  Hence, auto-install would
@@ -309,7 +312,7 @@ possibly overwrite the current user's after/syntax/c.vim file.
 In my own case, I use <aftersyntax.vim> (renamed to after/syntax/c.vim) to
 allow a after/syntax/c/ directory:
 
-	http://vim.sourceforge.net/scripts/script.php?script_id=1023
+	https://www.vim.org/scripts/script.php?script_id=1023
 
 The script allows multiple syntax files to exist separately in the
 after/syntax/c subdirectory.  I can't bundle aftersyntax.vim in and build an
@@ -345,17 +348,22 @@ after/syntax/c.vim contained in it to overwrite a user's c.vim.
 		Doesn't override vimball installation.
 >
 	g:GetLatestVimScripts_scriptaddr
-<       default='http://vim.sourceforge.net/script.php?script_id='
+<        default='https://www.vim.org/scripts/script.php?script_id='
 		Override this if your system needs
-	  ...  ='http://vim.sourceforge.net/script/script.php?script_id='
-
+	  ...  ='http://vim.sourceforge.net/script.php?script_id='
+>
+	g:GetLatestVimScripts_downloadaddr
+<        default='https://www.vim.org/scripts/download_script.php?src_id='
+		Override this if your system needs
+	  ...  ='http://vim.sourceforge.net/scripts/download_script.php?src_id='
+>
 ==============================================================================
 8. GetLatestVimScripts Algorithm		*glvs-algorithm* *glvs-alg*
 
 The Vim sourceforge page dynamically creates a page by keying off of the
 so-called script-id.  Within the webpage of
 
-	http://vim.sourceforge.net/scripts/script.php?script_id=40
+	https://www.vim.org/scripts/script.php?script_id=40
 
 is a line specifying the latest source-id (src_id).  The source identifier
 numbers are always increasing, hence if the src_id is greater than the one