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

.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
@@ -493,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

runtime/autoload/getscript.vim

@@ -365,7 +365,7 @@ fun! getscript#GetLatestVimScripts()
 endfun
 
 " ---------------------------------------------------------------------
-"  GetOneScript: (Get Latest Vim Script) this function operates {{{1
+"  GetOneScript: (Get Latest Vim script) this function operates {{{1
 "    on the current line, interpreting two numbers and text as
 "    ScriptID, SourceID, and Filename.
 "    It downloads any scripts that have newer versions from vim.sourceforge.net.

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 9.1.  Last change: 2024 Jul 10
+*editing.txt*   For Vim version 9.1.  Last change: 2024 Oct 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1325,7 +1325,7 @@ used (Motif only offers one pattern, but you can edit it).
 For example, to have only Vim files in the dialog, you could use the following
 command: >
 
-     let g:browsefilter = "Vim Scripts\t*.vim\nVim Startup Files\t*vimrc\n"
+     let g:browsefilter = "Vim scripts\t*.vim\nVim Startup Files\t*vimrc\n"
 
 You can override the filter setting on a per-buffer basis by setting the
 b:browsefilter variable.  You would most likely set b:browsefilter in a

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 9.1.  Last change: 2024 Oct 06
+*syntax.txt*	For Vim version 9.1.  Last change: 2024 Oct 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2223,6 +2223,20 @@ define the vim variable 'lace_case_insensitive' in your startup file: >
 	:let lace_case_insensitive=1
 
 
+LF (LFRC)		*lf.vim* *ft-lf-syntax* *g:lf_shell_syntax*
+						*b:lf_shell_syntax*
+
+For the lf file manager configuration files (lfrc) the shell commands
+syntax highlighting can be changed globally and per buffer by setting
+a different 'include' command search pattern using these variables:
+	let g:lf_shell_syntax = "syntax/dosbatch.vim"
+	let b:lf_shell_syntax = "syntax/zsh.vim"
+
+These variables are unset by default.
+
+The default 'include' command search pattern is 'syntax/sh.vim'.
+
+
 LEX						*lex.vim* *ft-lex-syntax*
 
 Lex uses brute-force synchronizing as the "^%%$" section delimiter
@@ -2524,6 +2538,12 @@ set "msql_minlines" to the value you desire.  Example: >
 	:let msql_minlines = 200
 
 
+NEOMUTT			*neomutt.vim* *ft-neomuttrc-syntax* *ft-neomuttlog-syntax*
+
+To disable the default NeoMutt log colors >
+
+	:let g:neolog_disable_default_colors = 1
+
 N1QL						*n1ql.vim* *ft-n1ql-syntax*
 
 N1QL is a SQL-like declarative language for manipulating JSON documents in

runtime/doc/tags

@@ -6135,6 +6135,7 @@ b:changelog_name	filetype.txt	/*b:changelog_name*
 b:clojure_syntax_keywords	syntax.txt	/*b:clojure_syntax_keywords*
 b:clojure_syntax_without_core_keywords	syntax.txt	/*b:clojure_syntax_without_core_keywords*
 b:current_syntax-variable	syntax.txt	/*b:current_syntax-variable*
+b:lf_shell_syntax	syntax.txt	/*b:lf_shell_syntax*
 b:netrw_lastfile	pi_netrw.txt	/*b:netrw_lastfile*
 b:rust_cargo_avoid_whole_workspace	ft_rust.txt	/*b:rust_cargo_avoid_whole_workspace*
 b:rust_cargo_check_all_features	ft_rust.txt	/*b:rust_cargo_check_all_features*
@@ -7345,6 +7346,7 @@ ft-json-syntax	syntax.txt	/*ft-json-syntax*
 ft-ksh-syntax	syntax.txt	/*ft-ksh-syntax*
 ft-lace-syntax	syntax.txt	/*ft-lace-syntax*
 ft-lex-syntax	syntax.txt	/*ft-lex-syntax*
+ft-lf-syntax	syntax.txt	/*ft-lf-syntax*
 ft-lifelines-syntax	syntax.txt	/*ft-lifelines-syntax*
 ft-lisp-syntax	syntax.txt	/*ft-lisp-syntax*
 ft-lite-syntax	syntax.txt	/*ft-lite-syntax*
@@ -7377,6 +7379,8 @@ ft-msql-syntax	syntax.txt	/*ft-msql-syntax*
 ft-n1ql-syntax	syntax.txt	/*ft-n1ql-syntax*
 ft-nasm-syntax	syntax.txt	/*ft-nasm-syntax*
 ft-ncf-syntax	syntax.txt	/*ft-ncf-syntax*
+ft-neomuttlog-syntax	syntax.txt	/*ft-neomuttlog-syntax*
+ft-neomuttrc-syntax	syntax.txt	/*ft-neomuttrc-syntax*
 ft-nroff-syntax	syntax.txt	/*ft-nroff-syntax*
 ft-ocaml-syntax	syntax.txt	/*ft-ocaml-syntax*
 ft-pandoc-syntax	syntax.txt	/*ft-pandoc-syntax*
@@ -7596,6 +7600,7 @@ g:html_use_encoding	syntax.txt	/*g:html_use_encoding*
 g:html_use_input_for_pc	syntax.txt	/*g:html_use_input_for_pc*
 g:html_use_xhtml	syntax.txt	/*g:html_use_xhtml*
 g:html_whole_filler	syntax.txt	/*g:html_whole_filler*
+g:lf_shell_syntax	syntax.txt	/*g:lf_shell_syntax*
 g:markdown_fenced_languages	syntax.txt	/*g:markdown_fenced_languages*
 g:markdown_minlines	syntax.txt	/*g:markdown_minlines*
 g:markdown_syntax_conceal	syntax.txt	/*g:markdown_syntax_conceal*
@@ -8574,6 +8579,7 @@ len()	builtin.txt	/*len()*
 less	various.txt	/*less*
 letter	print.txt	/*letter*
 lex.vim	syntax.txt	/*lex.vim*
+lf.vim	syntax.txt	/*lf.vim*
 lhaskell.vim	syntax.txt	/*lhaskell.vim*
 libcall()	builtin.txt	/*libcall()*
 libcallnr()	builtin.txt	/*libcallnr()*
@@ -8889,6 +8895,7 @@ nb-protocol_errors	netbeans.txt	/*nb-protocol_errors*
 nb-special	netbeans.txt	/*nb-special*
 nb-terms	netbeans.txt	/*nb-terms*
 ncf.vim	syntax.txt	/*ncf.vim*
+neomutt.vim	syntax.txt	/*neomutt.vim*
 netbeans	netbeans.txt	/*netbeans*
 netbeans-commands	netbeans.txt	/*netbeans-commands*
 netbeans-configure	netbeans.txt	/*netbeans-configure*

runtime/doc/usr_51.txt

@@ -352,8 +352,9 @@ was called from a mapping defined with ":noremap".
 DOCUMENTATION						*write-local-help*
 
 It's a good idea to also write some documentation for your plugin.  Especially
-when its behavior can be changed by the user.  See |add-local-help| for how
-they are installed.
+when its behavior can be changed by the user.  See |help-writing| for the
+syntax used by the help files and |add-local-help| for how local help files
+are installed.
 
 Here is a simple example for a plugin help file, called "typecorrect.txt": >
 

runtime/filetype.vim

@@ -1315,6 +1315,9 @@ au BufNewFile,BufRead *.lean			setf lean
 " Ledger
 au BufRead,BufNewFile *.ldg,*.ledger,*.journal			setf ledger
 
+" lf configuration (lfrc)
+au BufNewFile,BufRead lfrc			setf lf
+
 " Less
 au BufNewFile,BufRead *.less			setf less
 
@@ -1589,6 +1592,9 @@ au BufNewFile,BufRead Mutt{ng,}rc		setf muttrc
 " N1QL
 au BufRead,BufNewfile *.n1ql,*.nql		setf n1ql
 
+" Neomutt log
+au BufNewFile,BufRead *.neomuttdebug*		setf neomuttlog
+
 " Nano
 au BufNewFile,BufRead */etc/nanorc,*.nanorc	setf nanorc
 

runtime/ftplugin/gleam.vim

@@ -0,0 +1,16 @@
+" Vim filetype plugin file
+" Language:    Gleam
+" Maintainer:  Trilowy (https://github.com/trilowy)
+" Last Change: 2024 Oct 13
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=://,:///,:////
+setlocal commentstring=//\ %s
+
+let b:undo_ftplugin = "setlocal comments< commentstring<"
+
+" vim: sw=2 sts=2 et

runtime/menu.vim

@@ -1137,7 +1137,7 @@ else
   endif
   tmenu ToolBar.LoadSesn	Choose a session to load
   tmenu ToolBar.SaveSesn	Save current session
-  tmenu ToolBar.RunScript	Choose a Vim Script to run
+  tmenu ToolBar.RunScript	Choose a Vim script to run
   tmenu ToolBar.Make		Make current project (:make)
   tmenu ToolBar.RunCtags	Build tags in current directory tree (!ctags -R .)
   tmenu ToolBar.TagJump		Jump to tag under cursor

runtime/pack/dist/opt/comment/autoload/comment.vim

@@ -35,36 +35,38 @@ export def Toggle(...args: list<string>): string
 
     if len(cms_l) == 0 | return '' | endif
     if len(cms_l) == 1 | call add(cms_l, '') | endif
-    var comment = 0
+    var comment = false
+    var indent_spaces = false
+    var indent_tabs = false
     var indent_min = indent(lnum1)
     var indent_start = matchstr(getline(lnum1), '^\s*')
     for lnum in range(lnum1, lnum2)
         if getline(lnum) =~ '^\s*$' | continue | endif
+        var indent_str = matchstr(getline(lnum), '^\s*')
         if indent_min > indent(lnum)
             indent_min = indent(lnum)
-            indent_start = matchstr(getline(lnum), '^\s*')
+            indent_start = indent_str
         endif
+        indent_spaces = indent_spaces || (stridx(indent_str, ' ') != -1)
+        indent_tabs = indent_tabs || (stridx(indent_str, "\t") != -1)
         if getline(lnum) !~ $'^\s*{cms_l[0]}.*{cms_l[1]}$'
-            comment = 1
+            comment = true
         endif
     endfor
+    var mixed_indent = indent_spaces && indent_tabs
     var lines = []
     var line = ''
     for lnum in range(lnum1, lnum2)
         if getline(lnum) =~ '^\s*$'
             line = getline(lnum)
         elseif comment
             if exists("g:comment_first_col") || exists("b:comment_first_col")
-                # handle % with substitute
                 line = printf(substitute(cms, '%s\@!', '%%', 'g'), getline(lnum))
             else
-                line = getline(lnum)
-                var indent_start_len = strlen(indent_start)
-                # handle % with substitute,
                 # consider different whitespace indenting
-                line = printf(indent_start .. substitute(cms, '%s\@!', '%%', 'g'),
-                    strpart(line, (line[0 : strlen(indent_start_len) - 1] =~ '\t' ?
-                    indent_start_len / &tabstop : indent_start_len)))
+                var indent_current = mixed_indent ? matchstr(getline(lnum), '^\s*') : indent_start
+                line = printf(indent_current .. substitute(cms, '%s\@!', '%%', 'g'),
+                    strpart(getline(lnum), strlen(indent_current)))
             endif
         else
             line = substitute(getline(lnum), $'^\s*\zs{cms_l[0]} \?\| \?{cms_l[1]}$', '', 'g')

runtime/pack/dist/opt/comment/doc/comment.txt

@@ -57,7 +57,7 @@ Vim script): >
 
 	autocmd Filetype vim :setlocal commentstring="%s
 
-This example sets the " as start of a comment for legacy Vim Script.  For Vim9
+This example sets the " as start of a comment for legacy Vim script.  For Vim9
 script, you would instead use the "#" char: >
 
 	autocmd Filetype vim :setlocal commentstring=#\ %s

runtime/pack/dist/opt/editorconfig/autoload/editorconfig.vim

@@ -1,4 +1,4 @@
-" autoload/editorconfig.vim: EditorConfig native Vimscript plugin
+" autoload/editorconfig.vim: EditorConfig native Vim script plugin
 " Copyright (c) 2011-2019 EditorConfig Team
 " All rights reserved.
 "

runtime/pack/dist/opt/editorconfig/doc/editorconfig.txt

@@ -47,7 +47,7 @@ Specify the mode of EditorConfig core. Generally it is OK to leave this option
 empty. Currently, the supported modes are "vim_core" (default) and
 "external_command".
 
-    vim_core:           Use the included VimScript EditorConfig Core.
+    vim_core:           Use the included Vim script EditorConfig Core.
     external_command:   Run external EditorConfig Core.
 
 If "g:EditorConfig_core_mode" is not specified, this plugin will automatically

runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim

@@ -1,4 +1,4 @@
-" plugin/editorconfig.vim: EditorConfig native Vimscript plugin file
+" plugin/editorconfig.vim: EditorConfig native Vim script plugin file
 " Copyright (c) 2011-2019 EditorConfig Team
 " All rights reserved.
 "