Farewell to Bram and dedicate upcoming Vim 9.1 to him (#12749)

174 views

Skip to first unread message

Christian Brabandt

unread,

Aug 13, 2023, 4:45:13 AM8/13/23

to vim...@googlegroups.com

Farewell to Bram and dedicate upcoming Vim 9.1 to him (#12749)

Commit: https://github.com/vim/vim/commit/e978b4534a5e10471108259118c0ef791106fd92
Author: Christian Brabandt <c...@256bit.org>
Date: Sun Aug 13 10:33:05 2023 +0200

Farewell to Bram and dedicate upcoming Vim 9.1 to him (https://github.com/vim/vim/issues/12749)

* Dedicate upcoming Vim 9.1 to Bram

Also replace in a few more places Brams email address and mention new
maintainers.

* Remove Bram from any Maintainer role

* runtime: Align Header

* it's mailing list not mailinglist

diff --git a/LICENSE b/LICENSE
index ecfbe5534..6c5c05b01 100644
--- a/LICENSE
+++ b/LICENSE
@@ -21,8 +21,8 @@ II) It is allowed to distribute a modified (or extended) version of Vim,
maintainer will do with your changes and under what license they
will be distributed is negotiable. If there has been no negotiation
then this license, or a later version, also applies to your changes.
- The current maintainer is Bram Moolenaar <Br...@vim.org>. If this
- changes it will be announced in appropriate places (most likely
+ The current maintainers are listed here: https://github.com/orgs/vim/people.
+ If this changes it will be announced in appropriate places (most likely
vim.sf.net, www.vim.org and/or comp.editors). When it is completely
impossible to contact the maintainer, the obligation to send him
your changes ceases. Once the maintainer has confirmed that he has
diff --git a/README.md b/README.md
index 5a11cf007..8fec70917 100644
--- a/README.md
+++ b/README.md
@@ -141,14 +141,14 @@ If you still have problems or any other questions, use one of the mailing
lists to discuss them with Vim users and developers:
https://www.vim.org/maillist.php

-If nothing else works, report bugs directly:
- Bram Moolenaar <Br...@vim.org>
+If nothing else works, report bugs directly to the vim-dev mailing list:
+ <vim...@vim.org>

## Main author ##

-Send any other comments, patches, flowers and suggestions to:
- Bram Moolenaar <Br...@vim.org>
+Send any other comments, patches, flowers and suggestions to the vim-dev mailing list:
+ <vim...@vim.org>

This is `README.md` for version 9.0 of Vim: Vi IMproved.
diff --git a/README.txt b/README.txt
index ce3ed73bc..2c692f0a3 100644
--- a/README.txt
+++ b/README.txt
@@ -122,12 +122,12 @@ If you still have problems or any other questions, use one of the mailing
lists to discuss them with Vim users and developers:
https://www.vim.org/maillist.php

-If nothing else works, report bugs directly:
- Bram Moolenaar <Br...@vim.org>
+If nothing else works, report bugs directly to the vim-dev mailing list:
+ <vim...@vim.org>

MAIN AUTHOR

-Send any other comments, patches, flowers and suggestions to:
+Send any other comments, patches, flowers and suggestions to the vim-dev mailing list:

- Bram Moolenaar E-mail: Br...@vim.org
+ <vim...@vim.org>
diff --git a/runtime/autoload/ccomplete.vim b/runtime/autoload/ccomplete.vim
index 3bddba7a9..7096dcf4a 100644
--- a/runtime/autoload/ccomplete.vim
+++ b/runtime/autoload/ccomplete.vim
@@ -1,10 +1,11 @@
vim9script noclear

# Vim completion script
-# Language: C
-# Maintainer: Bram Moolenaar <Br...@vim.org>
+# Language: C
+# Maintainer: The Vim Project <https://github.com/vim/vim>
+# Last Change: 2023 Aug 10
# Rewritten in Vim9 script by github user lacygoill
-# Last Change: 2022 Jan 31
+# Former Maintainer: Bram Moolenaar <Br...@vim.org>

var prepended: string
var grepCache: dict<list<dict<any>>>
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 173588393..9f53f6846 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -2,8 +2,9 @@ vim9script

# Vim functions for file type detection
#
-# Maintainer: Bram Moolenaar <Br...@vim.org>
-# Last Change: 2023 Jun 09
+# Maintainer: The Vim Project <https://github.com/vim/vim>
+# Last Change: 2023 Aug 10
+# Former Maintainer: Bram Moolenaar <Br...@vim.org>

# These functions are moved here from runtime/filetype.vim to make startup
# faster.
diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim
index fa4b6e842..5f3ae4aec 100644
--- a/runtime/autoload/dist/script.vim
+++ b/runtime/autoload/dist/script.vim
@@ -3,8 +3,9 @@ vim9script
# Vim function for detecting a filetype from the file contents.
# Invoked from "scripts.vim" in 'runtimepath'
#
-# Maintainer: Bram Moolenaar <Br...@vim.org>
-# Last Change: 2023 Jun 09
+# Maintainer: The Vim Project <https://github.com/vim/vim>
+# Last Change: 2023 Aug 10
+# Former Maintainer: Bram Moolenaar <Br...@vim.org>

export def DetectFiletype()
var line1 = getline(1)
diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim
index e4adec094..95dd90679 100644
--- a/runtime/autoload/gzip.vim
+++ b/runtime/autoload/gzip.vim
@@ -1,6 +1,7 @@
" Vim autoload file for editing compressed files.
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2016 Sep 28
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" These functions are used by the gzip plugin.

diff --git a/runtime/autoload/paste.vim b/runtime/autoload/paste.vim
index 2d787e7a1..1ba336c2b 100644
--- a/runtime/autoload/paste.vim
+++ b/runtime/autoload/paste.vim
@@ -1,6 +1,7 @@
" Vim support file to help with paste mappings and menus
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2019 Jan 27
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Define the string to use for items that are present both in Edit, Popup and
" Toolbar menu. Also used in mswin.vim and macmap.vim.
diff --git a/runtime/autoload/spellfile.vim b/runtime/autoload/spellfile.vim
index 6f9b1e0e0..43f7dffa1 100644
--- a/runtime/autoload/spellfile.vim
+++ b/runtime/autoload/spellfile.vim
@@ -1,6 +1,7 @@
" Vim script to download a missing spell file
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2020 Jul 10
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

if !exists('g:spellfile_URL')
" Always use https:// because it's secure. The certificate is for nluug.nl,
diff --git a/runtime/bugreport.vim b/runtime/bugreport.vim
index f7886a908..38f47b621 100644
--- a/runtime/bugreport.vim
+++ b/runtime/bugreport.vim
@@ -1,8 +1,9 @@
:" Use this script to create the file "bugreport.txt", which contains
:" information about the environment of a possible bug in Vim.
:"
-:" Maintainer: Bram Moolenaar <Br...@vim.org>
-:" Last change: 2019 Jan 27
+:" Maintainer: The Vim Project <https://github.com/vim/vim>
+:" Last change: 2023 Aug 10
+:" Former Maintainer: Bram Moolenaar <Br...@vim.org>
:"
:" To use inside Vim:
:" :so $VIMRUNTIME/bugreport.vim
diff --git a/runtime/colors/default.vim b/runtime/colors/default.vim
index 70311571d..d2960fa78 100644
--- a/runtime/colors/default.vim
+++ b/runtime/colors/default.vim
@@ -1,6 +1,7 @@
" Vim color file
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2001 Jul 23
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" This is the default color scheme. It doesn't define the Normal
" highlighting, it uses whatever the colors used to be.
diff --git a/runtime/compiler/README.txt b/runtime/compiler/README.txt
index 3f0b97b83..dccf4a976 100644
--- a/runtime/compiler/README.txt
+++ b/runtime/compiler/README.txt
@@ -8,4 +8,4 @@ If you want to write your own compiler plugin, have a look at the other files
for how to do it, the format is simple.

If you think a compiler plugin you have written is useful for others, please
-send it to Br...@vim.org.
+send it to the vim-dev mailing list: <vim...@vim.org>
diff --git a/runtime/compiler/msvc.vim b/runtime/compiler/msvc.vim
index efe36c4da..0d5660c10 100644
--- a/runtime/compiler/msvc.vim
+++ b/runtime/compiler/msvc.vim
@@ -1,7 +1,8 @@
" Vim compiler file
" Compiler: Microsoft Visual C
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2014 Sep 20
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

if exists("current_compiler")
finish
diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index 6f8deb06b..ff8ce8ea1 100644
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -1,7 +1,8 @@
" The default vimrc file.
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last change: 2023 May 10
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>
"
" This is loaded if no vimrc file was found.
" Except when Vim is run with "-u NONE" or "-C".
diff --git a/runtime/delmenu.vim b/runtime/delmenu.vim
index ef663c73b..b614851d8 100644
--- a/runtime/delmenu.vim
+++ b/runtime/delmenu.vim
@@ -1,8 +1,9 @@
" This Vim script deletes all the menus, so that they can be redefined.
" Warning: This also deletes all menus defined by the user!
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2019 Dec 10
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

aunmenu *
tlunmenu *
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 04d5f5cb8..7b66303d3 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt* For Vim version 9.0. Last change: 2022 Nov 20
+*intro.txt* For Vim version 9.0. Last change: 2023 Aug 09

VIM REFERENCE MANUAL by Bram Moolenaar
@@ -129,8 +129,9 @@ There are three ways to report bugs:
3. Send bug reports to: Vim Developers <vim...@vim.org>
This is a maillist, you need to become a member first and many people will
see the message. If you don't want that, e.g. because it is a security
- issue, send it to <bu...@vim.org>, this only goes to the Vim maintainer
- (that's Bram).
+ issue, please contact any of the current Vim maintainers
+ https://github.com/orgs/vim/people (but not Bram or the vim-dev ML).
+ In the future, a proper process for handling security issues will be setup.

Please be brief; all the time that is spent on answering mail is subtracted
from the time that is spent on improving Vim! Always give a reproducible
@@ -181,9 +182,9 @@ The user may create scripts for Vim that use external commands. These might
introduce Y2K problems, but those are not really part of Vim itself.

==============================================================================
-3. Credits *credits* *author* *Bram* *Moolenaar*
+3. Credits *credits* *author*

-Most of Vim was created by Bram Moolenaar <Br...@vim.org>.
+Most of Vim was created by Bram Moolenaar <Br...@vim.org> |Bram-Moolenaar|

Parts of the documentation come from several Vi manuals, written by:
W.N. Joy
@@ -216,7 +217,7 @@ Vim would never have become what it is now, without the help of these people!
Bill Foster Athena GUI port (later removed)
Google Lets me work on Vim one day a week
Loic Grenie xvim (ideas for multi windows version)
- Sven Guckes Vim promoter and previous WWW page maintainer
+ Sven Guckes Vim promoter and previous WWW page maintainer |Sven-Guckes|
Darren Hiebert Exuberant ctags
Jason Hildebrand GTK+ 2 port
Bruce Hunsaker improvements for VMS port
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 51c0323ac..b34ecd5de 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -3856,7 +3856,8 @@ BeOS os_beos.txt /*BeOS*
Blob eval.txt /*Blob*
Blobs eval.txt /*Blobs*
Boolean eval.txt /*Boolean*
-Bram intro.txt /*Bram*
+Bram version9.txt /*Bram*
+Bram-Moolenaar version9.txt /*Bram-Moolenaar*
BufAdd autocmd.txt /*BufAdd*
BufCreate autocmd.txt /*BufCreate*
BufDelete autocmd.txt /*BufDelete*
@@ -5458,7 +5459,7 @@ Mark motion.txt /*Mark*
MenuPopup autocmd.txt /*MenuPopup*
MiNT os_mint.txt /*MiNT*
ModeChanged autocmd.txt /*ModeChanged*
-Moolenaar intro.txt /*Moolenaar*
+Moolenaar version9.txt /*Moolenaar*
MorphOS os_amiga.txt /*MorphOS*
Motif gui_x11.txt /*Motif*
Myspell spell.txt /*Myspell*
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index 093da3015..3a2474793 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -46,8 +46,8 @@ II) It is allowed to distribute a modified (or extended) version of Vim,
maintainer will do with your changes and under what license they
will be distributed is negotiable. If there has been no negotiation
then this license, or a later version, also applies to your changes.
- The current maintainer is Bram Moolenaar <Br...@vim.org>. If this
- changes it will be announced in appropriate places (most likely
+ The current maintainers are listed here: https://github.com/orgs/vim/people.
+ If this changes it will be announced in appropriate places (most likely
vim.sf.net, www.vim.org and/or comp.editors). When it is completely
impossible to contact the maintainer, the obligation to send him
your changes ceases. Once the maintainer has confirmed that he has
diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt
index 03b732b5e..e9549285f 100644
--- a/runtime/doc/version9.txt
+++ b/runtime/doc/version9.txt
@@ -1,4 +1,4 @@
-*version9.txt* For Vim version 9.0. Last change: 2022 Nov 23
+*version9.txt* For Vim version 9.0. Last change: 2023 Aug 09

VIM REFERENCE MANUAL by Bram Moolenaar
@@ -43,6 +43,17 @@ when the release was being prepared. Sven was a long time supporter of Vim.
He registered the vim.org domain and created the first Vim website. We will
remember him!

+ *Bram* *Moolenaar* *Bram-Moolenaar*
+Vim version 9.1 is dedicated to Bram Moolenaar, who passed away on August 3rd 2023
+while still working full-time on Vim. The Vim project would not exist without
+his ongoing passion to lead and develop Vim and the community for more than 30
+years. Bram was also passionate about his |ICCF| foundation to help children
+in Uganda. If you enjoy using Vim, please consider donating!
+We will miss his guidance, passion and leadership.
+
+Obituary Articles: https://github.com/vim/vim/discussions/12742
+Say Farewell: https://github.com/vim/vim/discussions/12737
+
==============================================================================
NEW FEATURES *new-9*

diff --git a/runtime/evim.vim b/runtime/evim.vim
index d3f349e0d..df7d756e2 100644
--- a/runtime/evim.vim
+++ b/runtime/evim.vim
@@ -1,6 +1,7 @@
" Vim script for Evim key bindings
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2022 May 10
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Don't use Vi-compatible mode.
set nocompatible
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index eea55f8b9..fe6e94828 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,8 @@
" Vim support file to detect file types
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2023 Jun 09
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
diff --git a/runtime/ftoff.vim b/runtime/ftoff.vim
index 377c6ef82..a33b0962d 100644
--- a/runtime/ftoff.vim
+++ b/runtime/ftoff.vim
@@ -1,7 +1,8 @@
" Vim support file to switch off detection of file types
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last change: 2001 Jun 11
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

if exists("did_load_filetypes")
unlet did_load_filetypes
diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim
index 2500a7f27..93f6b05a4 100644
--- a/runtime/ftplugin.vim
+++ b/runtime/ftplugin.vim
@@ -2,8 +2,9 @@ vim9script noclear

# Vim support file to switch on loading plugins for file types
#
-# Maintainer: Bram Moolenaar <Br...@vim.org>
-# Last change: 2022 Feb 11
+# Maintainer: The Vim Project <https://github.com/vim/vim>
+# Last change: 2023 Aug 10
+# Former Maintainer: Bram Moolenaar <Br...@vim.org>

if exists("g:did_load_ftplugin")
finish
diff --git a/runtime/ftplugin/aap.vim b/runtime/ftplugin/aap.vim
index b5065e515..df839c99a 100644
--- a/runtime/ftplugin/aap.vim
+++ b/runtime/ftplugin/aap.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: Aap recipe
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2021 Nov 14
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/btm.vim b/runtime/ftplugin/btm.vim
index d3dc5b75f..1c2c68599 100644
--- a/runtime/ftplugin/btm.vim
+++ b/runtime/ftplugin/btm.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: BTM
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2004 Jul 06
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/c.vim b/runtime/ftplugin/c.vim
index 3627089ec..4ddc4a539 100644
--- a/runtime/ftplugin/c.vim
+++ b/runtime/ftplugin/c.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: C
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2022 Apr 08
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/cpp.vim b/runtime/ftplugin/cpp.vim
index f9d31cbec..fc92935a1 100644
--- a/runtime/ftplugin/cpp.vim
+++ b/runtime/ftplugin/cpp.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: C++
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2020 Jul 26
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/diff.vim b/runtime/ftplugin/diff.vim
index bf37d464c..f2a0820be 100644
--- a/runtime/ftplugin/diff.vim
+++ b/runtime/ftplugin/diff.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: Diff
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2021 Nov 14
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/mail.vim b/runtime/ftplugin/mail.vim
index f12022305..3cef84f52 100644
--- a/runtime/ftplugin/mail.vim
+++ b/runtime/ftplugin/mail.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: Mail
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2021 Oct 23
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/make.vim b/runtime/ftplugin/make.vim
index 168bc38eb..7227bb373 100644
--- a/runtime/ftplugin/make.vim
+++ b/runtime/ftplugin/make.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: Make
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2020 Oct 16
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/objc.vim b/runtime/ftplugin/objc.vim
index e41beb5da..d129b33c1 100644
--- a/runtime/ftplugin/objc.vim
+++ b/runtime/ftplugin/objc.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: Objective C
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2003 Jan 15
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim
index 1ae1d2346..e25054ba8 100644
--- a/runtime/ftplugin/vim.vim
+++ b/runtime/ftplugin/vim.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin
" Language: Vim
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2023 Feb 07
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/zimbu.vim b/runtime/ftplugin/zimbu.vim
index 9d9fa6f40..2ce08e5ca 100644
--- a/runtime/ftplugin/zimbu.vim
+++ b/runtime/ftplugin/zimbu.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: Zimbu
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2022 Sep 07
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
diff --git a/runtime/ftplugof.vim b/runtime/ftplugof.vim
index e0505ce62..46351d203 100644
--- a/runtime/ftplugof.vim
+++ b/runtime/ftplugof.vim
@@ -2,8 +2,9 @@ vim9script

# Vim support file to switch off loading plugins for file types
#
-# Maintainer: Bram Moolenaar <Br...@vim.org>
-# Last Change: 2022 Feb 09
+# Maintainer: The Vim Project <https://github.com/vim/vim>
+# Last Change: 2023 Aug 10
+# Former Maintainer: Bram Moolenaar <Br...@vim.org>

if exists("g:did_load_ftplugin")
unlet g:did_load_ftplugin
diff --git a/runtime/gvimrc_example.vim b/runtime/gvimrc_example.vim
index 083dacee9..e42f365b6 100644
--- a/runtime/gvimrc_example.vim
+++ b/runtime/gvimrc_example.vim
@@ -2,8 +2,9 @@
" The commands in this are executed when the GUI is started, after the vimrc
" has been executed.
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last change: 2016 Apr 05
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>
"
" To use it, copy it to
" for Unix: ~/.gvimrc
diff --git a/runtime/indent.vim b/runtime/indent.vim
index a3249956a..72b558734 100644
--- a/runtime/indent.vim
+++ b/runtime/indent.vim
@@ -1,7 +1,8 @@
" Vim support file to switch on loading indent files for file types
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2022 Feb 11
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

if exists("did_indent_on")
finish
diff --git a/runtime/indent/README.txt b/runtime/indent/README.txt
index 649870636..8628ecccb 100644
--- a/runtime/indent/README.txt
+++ b/runtime/indent/README.txt
@@ -6,9 +6,9 @@ at ":help indent-expression". Looking at the existing files should give you
inspiration.

If you make a new indent file which would be useful for others, please send it
-to Br...@vim.org. Include instructions for detecting the file type for this
-language, by file name extension or by checking a few lines in the file.
-And please stick to the rules below.
+to the vim-dev mailing list <vim...@vim.org>. Include instructions for
+detecting the file type for this language, by file name extension or by
+checking a few lines in the file. And please stick to the rules below.

If you have remarks about an existing file, send them to the maintainer of
that file. Only when you get no response send a message to Br...@vim.org.
diff --git a/runtime/indent/aap.vim b/runtime/indent/aap.vim
index 35828b4c1..23c104985 100644
--- a/runtime/indent/aap.vim
+++ b/runtime/indent/aap.vim
@@ -1,7 +1,8 @@
" Vim indent file
" Language: Aap recipe
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2005 Jun 24
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only load this indent file when no other was loaded.
if exists("b:did_indent")
diff --git a/runtime/indent/c.vim b/runtime/indent/c.vim
index e224382f6..7f285e1b9 100644
--- a/runtime/indent/c.vim
+++ b/runtime/indent/c.vim
@@ -1,7 +1,8 @@
" Vim indent file
" Language: C
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2005 Mar 27
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only load this indent file when no other was loaded.
if exists("b:did_indent")
diff --git a/runtime/indent/cpp.vim b/runtime/indent/cpp.vim
index ffa37d720..bb4dfd185 100644
--- a/runtime/indent/cpp.vim
+++ b/runtime/indent/cpp.vim
@@ -1,7 +1,8 @@
" Vim indent file
" Language: C++
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2008 Nov 29
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only load this indent file when no other was loaded.
if exists("b:did_indent")
diff --git a/runtime/indent/cuda.vim b/runtime/indent/cuda.vim
index 68ee9cec0..5980ddda4 100644
--- a/runtime/indent/cuda.vim
+++ b/runtime/indent/cuda.vim
@@ -1,7 +1,8 @@
" Vim indent file
" Language: CUDA
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2008 Nov 29
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only load this indent file when no other was loaded.
if exists("b:did_indent")
diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim
index 8c3d0b067..42ab4f377 100644
--- a/runtime/indent/python.vim
+++ b/runtime/indent/python.vim
@@ -1,8 +1,9 @@
" Vim indent file
-" Language: Python
-" Maintainer: Bram Moolenaar <Br...@vim.org>
+" Language: Python
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>
" Original Author: David Bustos <bus...@caltech.edu>
-" Last Change: 2021 Sep 26

" Only load this indent file when no other was loaded.
if exists("b:did_indent")
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim
index 7b45d41ad..97a4a3662 100644
--- a/runtime/indent/vim.vim
+++ b/runtime/indent/vim.vim
@@ -2,8 +2,9 @@ vim9script

# Vim indent file
# Language: Vim script
-# Maintainer: Bram Moolenaar <Br...@vim.org>
-# Last Change: 2023 Feb 02
+# Maintainer: The Vim Project <https://github.com/vim/vim>
+# Last Change: 2023 Aug 10
+# Former Maintainer: Bram Moolenaar <Br...@vim.org>

# Only load this indent file when no other was loaded.
if exists('b:did_indent')
diff --git a/runtime/indent/xhtml.vim b/runtime/indent/xhtml.vim
index 2197b7901..e5c9cc307 100644
--- a/runtime/indent/xhtml.vim
+++ b/runtime/indent/xhtml.vim
@@ -1,7 +1,8 @@
" Vim indent file
" Language: XHTML
-" Maintainer: Bram Moolenaar <Br...@vim.org> (for now)
-" Last Change: 2005 Jun 24
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only load this indent file when no other was loaded.
if exists("b:did_indent")
diff --git a/runtime/indent/zimbu.vim b/runtime/indent/zimbu.vim
index 0e6e2ab1d..08369e42e 100644
--- a/runtime/indent/zimbu.vim
+++ b/runtime/indent/zimbu.vim
@@ -1,7 +1,8 @@
" Vim indent file
" Language: Zimbu
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2021 Sep 26
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Only load this indent file when no other was loaded.
if exists("b:did_indent")
diff --git a/runtime/indoff.vim b/runtime/indoff.vim
index 0d930352b..57d5e5400 100644
--- a/runtime/indoff.vim
+++ b/runtime/indoff.vim
@@ -1,7 +1,8 @@
" Vim support file to switch off loading indent files for file types
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2001 Jun 11
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

if exists("did_indent_on")
unlet did_indent_on
diff --git a/runtime/macros/less.vim b/runtime/macros/less.vim
index 17433f4ab..95a412796 100644
--- a/runtime/macros/less.vim
+++ b/runtime/macros/less.vim
@@ -1,6 +1,7 @@
" Vim script to work like "less"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2020 Dec 17
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Avoid loading this file twice, allow the user to define his own script.
if exists("loaded_less")
diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index b9cd8cb7b..4dfd2cc79 100644
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -1,8 +1,9 @@
vim9script

# Script to define the syntax menu in synmenu.vim
-# Maintainer: Bram Moolenaar <Br...@vim.org>
-# Last Change: 2022 Jun 27
+# Maintainer: The Vim Project <https://github.com/vim/vim>
+# Last Change: 2023 Aug 10
+# Former Maintainer: Bram Moolenaar <Br...@vim.org>

# This is used by "make menu" in the src directory.
edit <sfile>:p:h/synmenu.vim
diff --git a/runtime/menu.vim b/runtime/menu.vim
index f8f7e7ad7..6d12bcd03 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -1,8 +1,9 @@
" Vim support file to define the default menus
" You can also use this as a start for your own set of menus.
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2023 May 03
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Note that ":an" (short for ":anoremenu") is often used to make a menu work
" in all modes and avoid side effects from mappings defined by the user.
diff --git a/runtime/mswin.vim b/runtime/mswin.vim
index 2b04c1aea..1c28cadac 100644
--- a/runtime/mswin.vim
+++ b/runtime/mswin.vim
@@ -1,7 +1,8 @@
" Set options and add mapping such that Vim behaves a lot like MS-Windows
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2018 Dec 07
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Bail out if this isn't wanted.
if exists("g:skip_loading_mswin") && g:skip_loading_mswin
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index ed31b678e..d5978c66c 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,8 @@
" These commands create the option window.
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2022 Dec 16
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" If there already is an option window, jump to that one.
let buf = bufnr('option-window')
diff --git a/runtime/plugin/gzip.vim b/runtime/plugin/gzip.vim
index 721448857..c02bd9956 100644
--- a/runtime/plugin/gzip.vim
+++ b/runtime/plugin/gzip.vim
@@ -1,6 +1,7 @@
" Vim plugin for editing compressed files.
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2016 Oct 30
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Exit quickly when:
" - this plugin was already loaded
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index e19b28322..b33ecd557 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -1,6 +1,7 @@
" Vim plugin for showing matching parens
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2022 Dec 01
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Exit quickly when:
" - this plugin was already loaded (or disabled)
diff --git a/runtime/plugin/spellfile.vim b/runtime/plugin/spellfile.vim
index 437296090..1730ac8a9 100644
--- a/runtime/plugin/spellfile.vim
+++ b/runtime/plugin/spellfile.vim
@@ -1,6 +1,7 @@
" Vim plugin for downloading spell files
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2006 Feb 01
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Exit quickly when:
" - this plugin was already loaded
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 185f1676d..ced4c239b 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -1,7 +1,8 @@
" Vim support file to detect file types in scripts
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last change: 2023 Jun 08
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" This file is called by an autocommand for every file that has just been
" loaded into a buffer. It checks if the type of file can be recognized by
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 9d7da7dee..9a6ec997d 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -1,8 +1,9 @@
" Vim support file to define the syntax selection menu
" This file is normally sourced from menu.vim.
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2022 Oct 04
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Define the SetSyn function, used for the Syntax menu entries.
" Set 'filetype' and also 'syntax' if it is manually selected.
diff --git a/runtime/syntax/README.txt b/runtime/syntax/README.txt
index d6a86e5ca..8eee0ea20 100644
--- a/runtime/syntax/README.txt
+++ b/runtime/syntax/README.txt
@@ -28,9 +28,10 @@ whitespace.vim View Tabs and Spaces.
If you want to write a syntax file, read the docs at ":help usr_44.txt".

If you make a new syntax file which would be useful for others, please send it
-to Br...@vim.org. Include instructions for detecting the file type for this
-language, by file name extension or by checking a few lines in the file.
-And please write the file in a portable way, see ":help 44.12".
+to the vim-dev mailing list <vim...@vim.org>. Include instructions for
+detecting the file type for this language, by file name extension or by
+checking a few lines in the file. And please write the file in a portable way,
+see ":help 44.12".

If you have remarks about an existing file, send them to the maintainer of
that file. Only when you get no response send a message to Br...@vim.org.
diff --git a/runtime/syntax/aap.vim b/runtime/syntax/aap.vim
index 8399a4d22..87cedab30 100644
--- a/runtime/syntax/aap.vim
+++ b/runtime/syntax/aap.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: A-A-P recipe
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2004 Jun 13
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Quit when a syntax file was already loaded
if exists("b:current_syntax")
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 04b132d3f..5ed8fdc84 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: C
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2023 Mar 08
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
diff --git a/runtime/syntax/colortest.vim b/runtime/syntax/colortest.vim
index 58de7aaf1..1dd860c1d 100644
--- a/runtime/syntax/colortest.vim
+++ b/runtime/syntax/colortest.vim
@@ -1,7 +1,8 @@
" Vim script for testing colors
-" Maintainer: Bram Moolenaar <Br...@vim.org>
+" Maintainer: The Vim Project <https://github.com/vim/vim>
" Contributors: Rafael Garcia-Suarez, Charles Campbell
-" Last Change: 2008 Jun 04
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" edit this file, then do ":source %", and check if the colors match

diff --git a/runtime/syntax/conf.vim b/runtime/syntax/conf.vim
index 6a78ef8c6..15a1fffab 100644
--- a/runtime/syntax/conf.vim
+++ b/runtime/syntax/conf.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: generic configure file
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2021 May 01
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
diff --git a/runtime/syntax/ctrlh.vim b/runtime/syntax/ctrlh.vim
index b4bf3477e..b34f33578 100644
--- a/runtime/syntax/ctrlh.vim
+++ b/runtime/syntax/ctrlh.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: CTRL-H (e.g., ASCII manpages)
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2005 Jun 20
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Existing syntax is kept, this file can be used as an addition

diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim
index 408556ac1..4cadf5dae 100644
--- a/runtime/syntax/diff.vim
+++ b/runtime/syntax/diff.vim
@@ -1,8 +1,9 @@
" Vim syntax file
" Language: Diff (context or unified)
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Translations by Jakson Alves de Aquino.
-" Last Change: 2020 Dec 30
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Translations by Jakson Alves de Aquino.
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index a2fddbb0f..b734c2c4b 100644
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: Vim help file
-" Maintainer: Bram Moolenaar (Br...@vim.org)
-" Last Change: 2022 Nov 13
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
diff --git a/runtime/syntax/manual.vim b/runtime/syntax/manual.vim
index c0e53fa7b..8388336f2 100644
--- a/runtime/syntax/manual.vim
+++ b/runtime/syntax/manual.vim
@@ -1,6 +1,7 @@
" Vim syntax support file
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2016 Feb 01
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" This file is used for ":syntax manual".
" It installs the Syntax autocommands, but no the FileType autocommands.
diff --git a/runtime/syntax/model.vim b/runtime/syntax/model.vim
index 5f3b7f872..ea661eb5b 100644
--- a/runtime/syntax/model.vim
+++ b/runtime/syntax/model.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: Model
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2005 Jun 20
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" very basic things only (based on the vgrindefs file).
" If you use this language, please improve it, and send me the patches!
diff --git a/runtime/syntax/nosyntax.vim b/runtime/syntax/nosyntax.vim
index 0ab341237..a761d712b 100644
--- a/runtime/syntax/nosyntax.vim
+++ b/runtime/syntax/nosyntax.vim
@@ -1,6 +1,7 @@
" Vim syntax support file
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2006 Apr 16
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" This file is used for ":syntax off".
" It removes the autocommands and stops highlighting for all buffers.
diff --git a/runtime/syntax/qf.vim b/runtime/syntax/qf.vim
index 5c987a97b..6f2ea6a92 100644
--- a/runtime/syntax/qf.vim
+++ b/runtime/syntax/qf.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: Quickfix window
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last change: 2001 Jan 15
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Quit when a syntax file was already loaded
if exists("b:current_syntax")
diff --git a/runtime/syntax/syncolor.vim b/runtime/syntax/syncolor.vim
index 5b907a3b8..6cf38cfa5 100644
--- a/runtime/syntax/syncolor.vim
+++ b/runtime/syntax/syncolor.vim
@@ -1,6 +1,7 @@
" Vim syntax support file
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2020 Feb 13
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" This file sets up the default methods for highlighting.
" It is loaded from "synload.vim" and from Vim for ":syntax reset".
diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim
index 70e2d8879..553e8b209 100644
--- a/runtime/syntax/synload.vim
+++ b/runtime/syntax/synload.vim
@@ -1,6 +1,7 @@
" Vim syntax support file
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2022 Apr 12
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" This file sets up for syntax highlighting.
" It is loaded from "syntax.vim" and "manual.vim".
diff --git a/runtime/syntax/syntax.vim b/runtime/syntax/syntax.vim
index 55a2ee6d7..06b8d8f11 100644
--- a/runtime/syntax/syntax.vim
+++ b/runtime/syntax/syntax.vim
@@ -1,6 +1,7 @@
" Vim syntax support file
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2022 Apr 12
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" This file is used for ":syntax on".
" It installs the autocommands and starts highlighting for all buffers.
diff --git a/runtime/syntax/template.vim b/runtime/syntax/template.vim
index 5bf580fc1..a59b7b0af 100644
--- a/runtime/syntax/template.vim
+++ b/runtime/syntax/template.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: Generic template
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2019 May 06
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
diff --git a/runtime/syntax/vgrindefs.vim b/runtime/syntax/vgrindefs.vim
index 3de31b143..a194c108c 100644
--- a/runtime/syntax/vgrindefs.vim
+++ b/runtime/syntax/vgrindefs.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: Vgrindefs
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2005 Jun 20
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" The Vgrindefs file is used to specify a language for vgrind

diff --git a/runtime/syntax/viminfo.vim b/runtime/syntax/viminfo.vim
index 667e1bab2..06c59766d 100644
--- a/runtime/syntax/viminfo.vim
+++ b/runtime/syntax/viminfo.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: Vim .viminfo file
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last Change: 2016 Jun 05
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>

" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
diff --git a/runtime/termcap b/runtime/termcap
index 38790c49d..cb8355e25 100644
--- a/runtime/termcap
+++ b/runtime/termcap
@@ -1,8 +1,9 @@
#
# Demonstration of a termcap file (for the Amiga and Archimedes)
#
-# Maintainer: Bram Moolenaar <Br...@vim.org>
-# Last change: 1999 Feb 02
+# Maintainer: The Vim Project <https://github.com/vim/vim>
+# Last Change: 2023 Aug 10
+# Former Maintainer: Bram Moolenaar <Br...@vim.org>
#
sx|ansi|any ansi terminal with pessimistic assumptions:\
:co#80:li#24:cl=50\E[;H\E[2J:bs:am:cm=\E[%i%d;%dH:\
diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
index e11e4cff5..02e4143be 100644
--- a/runtime/vimrc_example.vim
+++ b/runtime/vimrc_example.vim
@@ -1,7 +1,8 @@
" An example for a vimrc file.
"
-" Maintainer: Bram Moolenaar <Br...@vim.org>
-" Last change: 2019 Dec 17
+" Maintainer: The Vim Project <https://github.com/vim/vim>
+" Last Change: 2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Br...@vim.org>
"
" To use it, copy it to
" for Unix: ~/.vimrc
diff --git a/src/Makefile b/src/Makefile
index ea37ee178..4abcaa39d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -102,7 +102,7 @@
# something wrong you may need to change one of the other files. If
# you find a clean way to fix the problem, consider sending a note to
# the author of autoconf (bug-gn...@prep.ai.mit.edu) or Vim
-# (Br...@vim.org). Don't bother to do that when you made a hack
+# (vim...@vim.org). Don't bother to do that when you made a hack
# solution for a non-standard system.
#
# 4. "make test" {{{1
diff --git a/src/message.c b/src/message.c
index d047d4fcc..a258e788b 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1114,7 +1114,7 @@ ex_messages(exarg_T *eap)
msg_attr(
// Translator: Please replace the name and email address
// with the appropriate text for your translation.
- _("Messages maintainer: Bram Moolenaar <Br...@vim.org>"),
+ _("Messages maintainer: The Vim Project"),
HL_ATTR(HLF_T));
}

diff --git a/src/po/README.txt b/src/po/README.txt
index be09aa18d..8ec1b5946 100644
--- a/src/po/README.txt
+++ b/src/po/README.txt
@@ -90,7 +90,7 @@ language.
Remove the "#, fuzzy" line after adding the translation.

There is one special message:
- msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+ msgid "Messages maintainer: The Vim Project"
You should include your name and E-mail address instead, for example:
msgstr "Berichten übersetzt bei: John Doe <jo...@doe.org>"

diff --git a/src/po/README_mingw.txt b/src/po/README_mingw.txt
index 805208228..a98af578a 100644
--- a/src/po/README_mingw.txt
+++ b/src/po/README_mingw.txt
@@ -59,7 +59,7 @@ the same as in the Unix case, only the commands change):
Remove "#~" and "#, fuzzy" after adding the translation.

There is one special message:
- msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+ msgid "Messages maintainer: The Vim Project"
You should include your name and E-mail address instead, for example:
msgstr "Berichten übersetzt bei: John Doe <jo...@doe.org>"

diff --git a/src/po/af.po b/src/po/af.po
index 76b7ece93..5ad9f4752 100644
--- a/src/po/af.po
+++ b/src/po/af.po
@@ -1562,7 +1562,7 @@ msgstr "Fout ontdek tydens verwerking van %s: "
msgid "line %4ld:"
msgstr "reël %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Boodskappe onderhouers: Danie Roux en Jean Jordaan <dr...@tuks.co.za>"

msgid "Interrupt: "
diff --git a/src/po/ca.po b/src/po/ca.po
index 591b7bf54..44125fb77 100644
--- a/src/po/ca.po
+++ b/src/po/ca.po
@@ -2245,7 +2245,7 @@ msgstr "S'ha detectat un error en processar %s:"
msgid "line %4ld:"
msgstr "línia %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Traducció dels missatges: Ernest Adrogué <n...@posteo.net>"

msgid "Interrupt: "
diff --git a/src/po/cs.cp1250.po b/src/po/cs.cp1250.po
index 63cabc34a..bed259561 100644
--- a/src/po/cs.cp1250.po
+++ b/src/po/cs.cp1250.po
@@ -2954,7 +2954,7 @@ msgstr "
msgid "[string too long]"
msgstr "[příliš dlouhý řetězec]"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Správce zpráv: Jiří Pavlovský <jpavl...@mbox.vol.cz>"

msgid "Interrupt: "
diff --git a/src/po/cs.po b/src/po/cs.po
index a319088f5..b6dcdb745 100644
--- a/src/po/cs.po
+++ b/src/po/cs.po
@@ -2954,7 +2954,7 @@ msgstr "
msgid "[string too long]"
msgstr "[přílią dlouhý řetězec]"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Správce zpráv: Jiří Pavlovský <jpavl...@mbox.vol.cz>"

msgid "Interrupt: "
diff --git a/src/po/da.po b/src/po/da.po
index a88d3f310..80cc6feea 100644
--- a/src/po/da.po
+++ b/src/po/da.po
@@ -3968,7 +3968,7 @@ msgstr "linje %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: Ugyldigt registernavn: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "OversĂ¦tter: scootergrisen"

msgid "Interrupt: "
diff --git a/src/po/de.po b/src/po/de.po
index e4f0612f3..986fbd323 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -2299,7 +2299,7 @@ msgstr "Fehler beim Ausf
msgid "line %4ld:"
msgstr "Zeile %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Übersetzt von Christian Brabandt <c...@256bit.org>"

msgid "Interrupt: "
diff --git a/src/po/en_GB.po b/src/po/en_GB.po
index e23daecb4..239be0f6a 100644
--- a/src/po/en_GB.po
+++ b/src/po/en_GB.po
@@ -94,7 +94,7 @@ msgstr "-foreground <colour>\tUse <colour> for normal text (also: -fg)"
msgid "+reverse\t\tDon't use reverse video (also: +rv)"
msgstr "+reverse\t\tDo not use reverse video (also: +rv)"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Messages maintainer: Mike Williams <m...@eandem.co.uk>"

msgid "VIM: Can't open window!\n"
diff --git a/src/po/eo.po b/src/po/eo.po
index fc90f8cad..a9aaefa82 100644
--- a/src/po/eo.po
+++ b/src/po/eo.po
@@ -3814,7 +3814,7 @@ msgstr "linio %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: Nevalida nomo de reÄťistro: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Flegado de mesaÄťoj: Dominique PELLĂ‰ <dominiq...@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/es.po b/src/po/es.po
index 3cbafbb6a..f4a02fa9c 100644
--- a/src/po/es.po
+++ b/src/po/es.po
@@ -2266,7 +2266,7 @@ msgstr "Se ha detectado un error al procesar %s:"
msgid "line %4ld:"
msgstr "lĂnea %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr ""
"TraducciĂłn: Proyecto vim-doc-es <https://www.assembla.com/wiki/show/vim-doc-"
"es>, Victorhck <vict...@opensuse.org>"
diff --git a/src/po/fi.po b/src/po/fi.po
index c2fc86011..d2fd336be 100644
--- a/src/po/fi.po
+++ b/src/po/fi.po
@@ -2206,7 +2206,7 @@ msgstr "Virhe suoritettaessa komentoja %s:"
msgid "line %4ld:"
msgstr "rivi %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "KĂ¤Ă¤nnĂ¶ksen yllĂ¤pitĂ¤jĂ¤: Flammie Pirinen <fla...@iki.fi>"

msgid "Interrupt: "
diff --git a/src/po/fr.po b/src/po/fr.po
index 866b0f94d..27f11eb74 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -3967,7 +3967,7 @@ msgid "E354: Invalid register name: '%s'"
msgstr "E354: Nom de registre invalide : '%s'"

# DB - todo : mettre ŕ jour ?
-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Maintenance des messages : Dominique Pellé <dominiq...@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/ga.po b/src/po/ga.po
index 4044c3eaa..62fa8c8bd 100644
--- a/src/po/ga.po
+++ b/src/po/ga.po
@@ -2256,7 +2256,7 @@ msgstr "Earr
msgid "line %4ld:"
msgstr "líne %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr ""
"Cothaitheoir na dteachtaireachtaí: Kevin P. Scannell <ksc...@gmail.com>"

diff --git a/src/po/it.po b/src/po/it.po
index 7bf2d893b..e1845406f 100644
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -2192,7 +2192,7 @@ msgstr "riga %4ld:"

#. Translator: Please replace the name and email address
#. with the appropriate text for your translation.
-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Manutentore messaggi: Antonio Colombo <azc...@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index 3bec1d3a2..5b2f0138d 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -2182,7 +2182,7 @@ msgstr "%s
msgid "line %4ld:"
msgstr "ąÔ %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "ĆüËÜ¸ěĄáĄĂĄ»ˇĽĄ¸ËÝĚő/´Ć˝¤: ÂĽ˛¬ ÂŔĎş <koron....@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/ja.po b/src/po/ja.po
index c2432c9c7..57506c8e1 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -2182,7 +2182,7 @@ msgstr "%s ă ®ĺ‡¦ç †ä¸ă «ă‚¨ă ©ă Ľă Ść¤śĺ‡şă •ă‚Śă ľă —ă ź:"
msgid "line %4ld:"
msgstr "čˇŚ %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "ć—Ąćś¬čŞžă ˇă ă‚»ă Ľă‚¸çż»č¨ł/ç›Łäż®: ćť‘ĺ˛ˇ ĺ¤Şé Ž <koron....@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/ko.UTF-8.po b/src/po/ko.UTF-8.po
index 73686c464..a9ee0ca74 100644
--- a/src/po/ko.UTF-8.po
+++ b/src/po/ko.UTF-8.po
@@ -3907,7 +3907,7 @@ msgstr "%4ld ě¤„:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: ěž ëŞ»ë ś ë ě§€ěŠ¤í„° ěť´ë¦„: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "ë©”ě‹śě§€ ę´€ë¦¬ěž : SungHyun Nam <gow...@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/ko.po b/src/po/ko.po
index 304caec49..00fb48681 100644
--- a/src/po/ko.po
+++ b/src/po/ko.po
@@ -3907,7 +3907,7 @@ msgstr "%4ld
msgid "E354: Invalid register name: '%s'"
msgstr "E354: Ŕß¸řµČ ·ąÁö˝şĹÍ ŔĚ¸§: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "¸Ţ˝ĂÁö °ü¸®ŔÚ: SungHyun Nam <gow...@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/lv.po b/src/po/lv.po
index bf5f68e68..e61042df0 100644
--- a/src/po/lv.po
+++ b/src/po/lv.po
@@ -215,7 +215,7 @@ msgstr "E298: NeizdevÄ s iegĹ«t bloku nr 2?"
msgid "E304: ml_upd_block0(): Didn't get block 0??"
msgstr "E304: ml_upd_block0(): NeizdevÄ s iegĹ«t bloku 0??"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Messages maintainer: Valdis Vitolins <valdis....@odo.lv>"

msgid "Keys don't match!"
diff --git a/src/po/nb.po b/src/po/nb.po
index 141e63ad0..d9f527bce 100644
--- a/src/po/nb.po
+++ b/src/po/nb.po
@@ -3738,7 +3738,7 @@ msgstr "linje %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: Ugyldig registernavn: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr ""
"Vedlikeholder for norsk oversettelse: Řyvind A. Holm <su...@sunbase.org>"

diff --git a/src/po/nl.po b/src/po/nl.po
index bde0adf37..09f281b1b 100644
--- a/src/po/nl.po
+++ b/src/po/nl.po
@@ -3347,7 +3347,7 @@ msgstr "regel %4ld:"
#~ msgid "E354: Invalid register name: '%s'"
#~ msgstr ""

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Vertaald door: Erwin Poeze <erwin...@gmail.com>"

#~ msgid "Interrupt: "
diff --git a/src/po/no.po b/src/po/no.po
index 141e63ad0..d9f527bce 100644
--- a/src/po/no.po
+++ b/src/po/no.po
@@ -3738,7 +3738,7 @@ msgstr "linje %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: Ugyldig registernavn: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr ""
"Vedlikeholder for norsk oversettelse: Řyvind A. Holm <su...@sunbase.org>"

diff --git a/src/po/pl.UTF-8.po b/src/po/pl.UTF-8.po
index 2798b5bdf..c9036a35e 100644
--- a/src/po/pl.UTF-8.po
+++ b/src/po/pl.UTF-8.po
@@ -3909,7 +3909,7 @@ msgstr "wiersz %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: NiewĹ‚aĹ›ciwa nazwa rejestru: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Opiekun komunikatĂłw: MikoĹ‚aj Machowski <mik...@wp.pl>"

msgid "Interrupt: "
diff --git a/src/po/pl.cp1250.po b/src/po/pl.cp1250.po
index a8a449723..9280d2fbb 100644
--- a/src/po/pl.cp1250.po
+++ b/src/po/pl.cp1250.po
@@ -3909,7 +3909,7 @@ msgstr "wiersz %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: Niewłaściwa nazwa rejestru: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Opiekun komunikatów: Mikołaj Machowski <mik...@wp.pl>"

msgid "Interrupt: "
diff --git a/src/po/pl.po b/src/po/pl.po
index 901ad04a9..f10897d09 100644
--- a/src/po/pl.po
+++ b/src/po/pl.po
@@ -3909,7 +3909,7 @@ msgstr "wiersz %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: Niewła¶ciwa nazwa rejestru: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Opiekun komunikatów: Mikołaj Machowski <mik...@wp.pl>"

msgid "Interrupt: "
diff --git a/src/po/pt_BR.po b/src/po/pt_BR.po
index d6fd574eb..3a8844a54 100644
--- a/src/po/pt_BR.po
+++ b/src/po/pt_BR.po
@@ -3928,7 +3928,7 @@ msgstr "linha %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: Nome de registrador invĂˇlido: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Tradutor das mensagens: Eduardo Dobay <edud...@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/ru.cp1251.po b/src/po/ru.cp1251.po
index 5779ce4c0..6ca22fb01 100644
--- a/src/po/ru.cp1251.po
+++ b/src/po/ru.cp1251.po
@@ -2228,7 +2228,7 @@ msgstr "
msgid "line %4ld:"
msgstr "ńňđîęŕ %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr ""
"Ďĺđĺâîä ńîîáůĺíčé íŕ đóńńęčé ˙çűę: Âŕńčëčé Đŕăîçčí <v...@users.sourceforge."
"net>, Ńĺđăĺé Ŕë¸řčí <alyos...@gmail.com>, Ěŕňâĺé Ňŕđŕńîâ "
diff --git a/src/po/ru.po b/src/po/ru.po
index 80b22933e..d16fc0e4f 100644
--- a/src/po/ru.po
+++ b/src/po/ru.po
@@ -2228,7 +2228,7 @@ msgstr "ĐžĐ±Đ˝Đ°Ń€Ń Đ¶ĐµĐ˝Đ° ĐľŃ Đ¸Đ±ĐşĐ° ĐżŃ€Đ¸ ĐľĐ±Ń€Đ°Đ±ĐľŃ‚ĐşĐµ %s:"
msgid "line %4ld:"
msgstr "Ń Ń‚Ń€ĐľĐşĐ° %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr ""
"ĐźĐµŃ€ĐµĐ˛ĐľĐ´ Ń ĐľĐľĐ±Ń‰ĐµĐ˝Đ¸Đą Đ˝Đ° Ń€Ń Ń Ń ĐşĐ¸Đą ŃŹĐ·Ń‹Đş: Đ’Đ°Ń Đ¸Đ»Đ¸Đą Đ Đ°ĐłĐľĐ·Đ¸Đ˝ <v...@users.sourceforge."
"net>, ĐˇĐµŃ€ĐłĐµĐą Đ Đ»Ń‘Ń Đ¸Đ˝ <alyos...@gmail.com>, ĐśĐ°Ń‚Đ˛ĐµĐą Đ˘Đ°Ń€Đ°Ń ĐľĐ˛ "
diff --git a/src/po/sk.cp1250.po b/src/po/sk.cp1250.po
index d8699758f..36fd347c1 100644
--- a/src/po/sk.cp1250.po
+++ b/src/po/sk.cp1250.po
@@ -3510,7 +3510,7 @@ msgstr "riadok %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: '%s' nie je prístupné meno registru"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Správca prekladu: Lubomir Host <ra...@platon.sk>"

msgid "Interrupt: "
diff --git a/src/po/sk.po b/src/po/sk.po
index 02b7ac002..935b0c222 100644
--- a/src/po/sk.po
+++ b/src/po/sk.po
@@ -3510,7 +3510,7 @@ msgstr "riadok %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: '%s' nie je prístupné meno registru"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Správca prekladu: Lubomir Host <ra...@platon.sk>"

msgid "Interrupt: "
diff --git a/src/po/sr.po b/src/po/sr.po
index 2bedfeb9f..df537a157 100644
--- a/src/po/sr.po
+++ b/src/po/sr.po
@@ -2264,7 +2264,7 @@ msgstr "ĐžŃ‚ĐşŃ€Đ¸Đ˛ĐµĐ˝Đ° Ń Đµ ĐłŃ€ĐµŃ ĐşĐ° Ń‚ĐľĐşĐľĐĽ ĐľĐ±Ń€Đ°Đ´Đµ %s:"
msgid "line %4ld:"
msgstr "Đ»Đ¸Đ˝Đ¸Ń Đ° %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "ĐźĐľŃ€Ń ĐşĐµ ĐľĐ´Ń€Đ¶Đ°Đ˛Đ°: Đ Đ˛Đ°Đ˝ ĐźĐµŃ Đ¸Ń› <ivan....@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/sv.po b/src/po/sv.po
index 29989917d..629a22c9b 100644
--- a/src/po/sv.po
+++ b/src/po/sv.po
@@ -3718,7 +3718,7 @@ msgstr "rad %4ld:"
msgid "E354: Invalid register name: '%s'"
msgstr "E354: Otillĺtet registernamn: '%s'"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Meddelandeansvarig: Johan Svedberg <jo...@svedberg.com>"

msgid "Interrupt: "
diff --git a/src/po/tr.po b/src/po/tr.po
index 5a0547360..ac8464815 100644
--- a/src/po/tr.po
+++ b/src/po/tr.po
@@ -2237,7 +2237,7 @@ msgstr "%s iĹźlenirken hata tespit edildi:"
msgid "line %4ld:"
msgstr "satÄ±r %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "TĂĽrkĂ§eye Ă§eviren: Emir SARI <emir...@icloud.com>"

msgid "Interrupt: "
diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po
index 9a79ef119..096c36cd4 100644
--- a/src/po/uk.cp1251.po
+++ b/src/po/uk.cp1251.po
@@ -2235,7 +2235,7 @@ msgstr "
msgid "line %4ld:"
msgstr "đ˙äîę %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "Óęđŕżíłçŕöł˙: Ŕíŕňîëłé Ńŕőíłę <sak...@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/uk.po b/src/po/uk.po
index 1019eb62c..347d9cfea 100644
--- a/src/po/uk.po
+++ b/src/po/uk.po
@@ -2235,7 +2235,7 @@ msgstr "Đ’Đ¸ŃŹĐ˛Đ»ĐµĐ˝Đľ ĐżĐľĐĽĐ¸Đ»ĐşŃ ĐżŃ–Đ´ Ń‡Đ°Ń Đ˛Đ¸ĐşĐľĐ˝Đ°Đ˝Đ˝ŃŹ %s:"
msgid "line %4ld:"
msgstr "Ń€ŃŹĐ´ĐľĐş %4ld:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "ĐŁĐşŃ€Đ°Ń—Đ˝Ń–Đ·Đ°Ń†Ń–ŃŹ: Đ Đ˝Đ°Ń‚ĐľĐ»Ń–Đą ĐˇĐ°Ń…Đ˝Ń–Đş <sak...@gmail.com>"

msgid "Interrupt: "
diff --git a/src/po/vi.po b/src/po/vi.po
index a76e7b1cf..4e7c1ecf5 100644
--- a/src/po/vi.po
+++ b/src/po/vi.po
@@ -3234,7 +3234,7 @@ msgstr "dĂ˛ng %4ld:"
msgid "[string too long]"
msgstr "[chuá»—i quĂˇ dĂ i]"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr ""
"BáşŁn dá»‹ch cĂˇc thĂ´ng bĂˇo sang tiáşżng Viá»‡t: Phan VÄ©nh Thá»‹nh <te...@vnlinux.org>"

diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index 43ea1d35f..6e4fa8f93 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -2158,7 +2158,7 @@ msgstr "ĺ¤„ç † %s ć—¶ĺŹ‘ç”źé”™čŻŻ:"
msgid "line %4ld:"
msgstr "ç¬¬ %4ld čˇŚ:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "ç®€ä˝“ä¸ć–‡ć¶ ć Żç»´ćŠ¤č€…: Yuheng Xie <elep...@linux.net.cn>"

msgid "Interrupt: "
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index bbbe4f7f1..c38f166c4 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -2158,7 +2158,7 @@ msgstr "
msgid "line %4ld:"
msgstr "µÚ %4ld ĐĐ:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "ĽňĚĺÖĐÎÄĎűĎ˘Î¬»¤Őß: Yuheng Xie <elep...@linux.net.cn>"

msgid "Interrupt: "
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 3d7b808f4..e88d49684 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -2158,7 +2158,7 @@ msgstr "
msgid "line %4ld:"
msgstr "µÚ %4ld ĐĐ:"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr "ĽňĚĺÖĐÎÄĎűĎ˘Î¬»¤Őß: Yuheng Xie <elep...@linux.net.cn>"

msgid "Interrupt: "
diff --git a/src/po/zh_TW.UTF-8.po b/src/po/zh_TW.UTF-8.po
index 8ea35ed97..4582cd968 100644
--- a/src/po/zh_TW.UTF-8.po
+++ b/src/po/zh_TW.UTF-8.po
@@ -3223,7 +3223,7 @@ msgstr "čˇŚ %4ld:"
msgid "[string too long]"
msgstr "[ć¤čˇŚé Žé•·]"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr ""
"ćŁé«”ä¸ć–‡č¨Šć Żç¶č·č€…: Francis S.Lin <pi...@csie.ntu.edu."
"tw>, Cecil Sheng <b750...@csie.ntu.edu.tw>"
diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po
index 51589a775..2cedfd457 100644
--- a/src/po/zh_TW.po
+++ b/src/po/zh_TW.po
@@ -3223,7 +3223,7 @@ msgstr "
msgid "[string too long]"
msgstr "[¦ą¦ćąLŞř]"

-msgid "Messages maintainer: Bram Moolenaar <Br...@vim.org>"
+msgid "Messages maintainer: The Vim Project"
msgstr ""
"ĄżĹé¤¤¤ĺ°T®§şűĹ@ŞĚ: Francis S.Lin <pi...@csie.ntu.edu."
"tw>, Cecil Sheng <b750...@csie.ntu.edu.tw>"

Christ van Willegen

unread,

Aug 13, 2023, 11:01:25 AM8/13/23

to vim...@googlegroups.com

Hi,

Whilst scrolling through the patch, my eye fell on:

index 649870636..8628ecccb 100644
--- a/runtime/indent/README.txt
+++ b/runtime/indent/README.txt
@@ -6,9 +6,9 @@ at ":help indent-expression". Looking at the existing files should give you
inspiration.

If you make a new indent file which would be useful for others, please send it
-to Br...@vim.org. Include instructions for detecting the file type for this
-language, by file name extension or by checking a few lines in the file.
-And please stick to the rules below.
+to the vim-dev mailing list <vim...@vim.org>. Include instructions for
+detecting the file type for this language, by file name extension or by
+checking a few lines in the file. And please stick to the rules below.

If you have remarks about an existing file, send them to the maintainer of
that file. Only when you get no response send a message to Br...@vim.org.

A similar message is in the syntax/README, IIRC...

Christ van Willegen

Adri Verhoef

unread,

Aug 14, 2023, 8:20:38 AM8/14/23

to vim...@googlegroups.com

> Op 13-08-2023 10:45 CEST schreef Christian Brabandt <cbl...@256bit.org>:
[..]
> diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
[..]

> @@ -216,7 +217,7 @@ Vim would never have become what it is now, without the help of these people!
> Bill Foster Athena GUI port (later removed)
> Google Lets me work on Vim one day a week

I noticed this: "Lets me work". Bram worked for Google for 15 years, until September 2021.
Shouldn't this "Lets me" be past tense then, like "Let Bram"? Alternatively: "Letting Bram".

> diff --git a/LICENSE b/LICENSE
[..]

> @@ -21,8 +21,8 @@ II) It is allowed to distribute a modified (or extended) version of Vim,
> maintainer will do with your changes and under what license they
> will be distributed is negotiable. If there has been no negotiation
> then this license, or a later version, also applies to your changes.
> - The current maintainer is Bram Moolenaar <Br...@vim.org>. If this
> - changes it will be announced in appropriate places (most likely
> + The current maintainers are listed here: https://github.com/orgs/vim/people.
> + If this changes it will be announced in appropriate places (most likely
> vim.sf.net, www.vim.org and/or comp.editors). When it is completely
> impossible to contact the maintainer, the obligation to send him
> your changes ceases. Once the maintainer has confirmed that he has

Above it says: "The current maintainers are listed".

As we can see, that's plural. Let's watch out for the word "maintainer" then.

Let's also have another look at the lines above.

"It is allowed to distribute a modified (or extended) version of Vim",

that's singular ("version of Vim"). Then the next lines: "maintainer will do

with your changes and under what license they will be distributed is negotiable".

I think this can be split into two parts: the part where the changes are mentioned
and the part where the license of the version is discussed. 'The changes'
might be plural, but 'the version' is singular. So shouldn't this be "the
maintainers will do with your changes and under what license that version"
(trying to avoid the word 'it' or 'they' after "under what license") then?

Possibly, the following lines:

"impossible to contact the maintainer, the obligation to send him
your changes ceases. Once the maintainer has confirmed that he has"

should then be changed into:

"impossible to contact the maintainers, the obligation to send them
your changes ceases. Once the maintainers have confirmed that they have"

There are more locations where "maintainer" is mentioned. Should I list them?

The same text appears in file uganda.txt:

> diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
[..]

> @@ -46,8 +46,8 @@ II) It is allowed to distribute a modified (or extended) version of Vim,
> maintainer will do with your changes and under what license they
> will be distributed is negotiable. If there has been no negotiation
> then this license, or a later version, also applies to your changes.
> - The current maintainer is Bram Moolenaar <Br...@vim.org>. If this
> - changes it will be announced in appropriate places (most likely
> + The current maintainers are listed here: https://github.com/orgs/vim/people.
> + If this changes it will be announced in appropriate places (most likely
> vim.sf.net, www.vim.org and/or comp.editors). When it is completely
> impossible to contact the maintainer, the obligation to send him
> your changes ceases. Once the maintainer has confirmed that he has

So the same remarks apply. :-)

This wasn't changed yet:

> diff --git a/runtime/indent/README.txt b/runtime/indent/README.txt
[..]

> If you have remarks about an existing file, send them to the maintainer of
> that file. Only when you get no response send a message to Br...@vim.org.

That should possibly be changed into:
"get no response send a message to the vim-dev mailing list <vim...@vim.org>."

The word "me" is also 'suspect':

> diff --git a/runtime/syntax/model.vim b/runtime/syntax/model.vim
[..]

> -" Maintainer: Bram Moolenaar <Br...@vim.org>
> -" Last Change: 2005 Jun 20
> +" Maintainer: The Vim Project <https://github.com/vim/vim>
> +" Last Change: 2023 Aug 10
> +" Former Maintainer: Bram Moolenaar <Br...@vim.org>
>
> " very basic things only (based on the vgrindefs file).
> " If you use this language, please improve it, and send me the patches!

Maybe change "me" into "us"?

> diff --git a/src/po/README.txt b/src/po/README.txt
[..]

> You should include your name and E-mail address instead, for example:

Shouldn't this just be "e-mail" instead of "E-mail"?

The same applies here:

> diff --git a/src/po/README_mingw.txt b/src/po/README_mingw.txt
[..]

> You should include your name and E-mail address instead, for example:

Adri
PS Great that you've taken up the project!

Christian Brabandt

unread,

Aug 15, 2023, 6:03:37 PM8/15/23

to vim...@googlegroups.com

On Mo, 14 Aug 2023, Adri Verhoef wrote:

> > Op 13-08-2023 10:45 CEST schreef Christian Brabandt <cbl...@256bit.org>:
> [..]
> > diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
> [..]
> > @@ -216,7 +217,7 @@ Vim would never have become what it is now, without the help of these people!
> > Bill Foster Athena GUI port (later removed)
> > Google Lets me work on Vim one day a week
>
> I noticed this: "Lets me work". Bram worked for Google for 15 years, until September 2021.
> Shouldn't this "Lets me" be past tense then, like "Let Bram"? Alternatively: "Letting Bram".

Fixed in https://github.com/vim/vim/pull/12790

Yes, uganda.txt is basically a copy of the license files. I am a bit
hesitant to change this, as I don't want to change the license more than
necessary. https://github.com/vim/vim/pull/12749#issuecomment-1678066341

>
> > diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
> [..]
> > @@ -46,8 +46,8 @@ II) It is allowed to distribute a modified (or extended) version of Vim,
> > maintainer will do with your changes and under what license they
> > will be distributed is negotiable. If there has been no negotiation
> > then this license, or a later version, also applies to your changes.
> > - The current maintainer is Bram Moolenaar <Br...@vim.org>. If this
> > - changes it will be announced in appropriate places (most likely
> > + The current maintainers are listed here: https://github.com/orgs/vim/people.
> > + If this changes it will be announced in appropriate places (most likely
> > vim.sf.net, www.vim.org and/or comp.editors). When it is completely
> > impossible to contact the maintainer, the obligation to send him
> > your changes ceases. Once the maintainer has confirmed that he has
>
> So the same remarks apply. :-)
>
> This wasn't changed yet:
>
> > diff --git a/runtime/indent/README.txt b/runtime/indent/README.txt
> [..]
> > If you have remarks about an existing file, send them to the maintainer of
> > that file. Only when you get no response send a message to Br...@vim.org.

fixed in
https://github.com/vim/vim/commit/96d6c4aabed15266bc4acfa66f9b35c2820dfa59

>
> That should possibly be changed into:
> "get no response send a message to the vim-dev mailing list <vim...@vim.org>."
>
> The word "me" is also 'suspect':
>
> > diff --git a/runtime/syntax/model.vim b/runtime/syntax/model.vim
> [..]
> > -" Maintainer: Bram Moolenaar <Br...@vim.org>
> > -" Last Change: 2005 Jun 20
> > +" Maintainer: The Vim Project <https://github.com/vim/vim>
> > +" Last Change: 2023 Aug 10
> > +" Former Maintainer: Bram Moolenaar <Br...@vim.org>
> >
> > " very basic things only (based on the vgrindefs file).
> > " If you use this language, please improve it, and send me the patches!
>
> Maybe change "me" into "us"?

Fixed in https://github.com/vim/vim/pull/12780/commits

> > diff --git a/src/po/README.txt b/src/po/README.txt
> [..]
> > You should include your name and E-mail address instead, for example:
>
> Shouldn't this just be "e-mail" instead of "E-mail"?
>
> The same applies here:
>
> > diff --git a/src/po/README_mingw.txt b/src/po/README_mingw.txt
> [..]
> > You should include your name and E-mail address instead, for example:

included here: https://github.com/vim/vim/pull/12753/commits

Best,
Christian
--
Love is a snowmobile racing across the tundra, which suddenly flips
over, pinning you underneath. At night the ice weasels come.
-- Matt Groening, "Love is Hell"

Reply all

Reply to author

Forward

0 new messages