aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorSean Dewar <seandewar@users.noreply.github.com>2023-08-13 13:25:10 +0100
committerGitHub <noreply@github.com>2023-08-13 13:25:10 +0100
commitcbf54ec2a5aaa1a00ff89e26bab44a30d09d4631 (patch)
tree1449876ff61a56d5be61fe68b15da60c2ac63a02 /runtime/doc
parent0fe921663f1be9e32afa66874fda1ef15142a47e (diff)
downloadrneovim-cbf54ec2a5aaa1a00ff89e26bab44a30d09d4631.tar.gz
rneovim-cbf54ec2a5aaa1a00ff89e26bab44a30d09d4631.tar.bz2
rneovim-cbf54ec2a5aaa1a00ff89e26bab44a30d09d4631.zip
vim-patch:e978b4534a5e (#24697)
Farewell to Bram and dedicate upcoming Vim 9.1 to him (vim/vim#12749) https://github.com/vim/vim/commit/e978b4534a5e10471108259118c0ef791106fd92 Also update the header for the following files that were converted to Vim9 script upstream: - autoload/ccomplete.lua (vim9jitted) - ftplugin.vim - ftplugof.vim - indent.vim - indent/vim.vim - makemenu.vim This also updates the "Last Change" dates, even if some changes (due to rewrites to Vim9 script) were not ported. There's still a few other places where Bram is still mentioned as a maintainer in the files we and Vim have: - ftplugin/bash.vim - indent/bash.vim - indent/html.vim - indent/mail.vim - macros/accents.vim - macros/editexisting.vim - syntax/bash.vim - syntax/shared/typescriptcommon.vim - syntax/tar.vim - syntax/typescript.vim - syntax/typescriptreact.vim - syntax/zimbu.vim Maybe future patches will address that. Also exclude changes to .po files that didn't apply automatically (the `:messages` maintainer string isn't used in Nvim anyway). Co-authored-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/intro.txt9
-rw-r--r--runtime/doc/uganda.txt4
2 files changed, 8 insertions, 5 deletions
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index afb67373fd..a39d07e3f2 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -88,9 +88,9 @@ Nvim development is funded separately from Vim:
https://neovim.io/#sponsor
==============================================================================
-Credits *credits*
+Credits *credits*
-Most of Vim was written by Bram Moolenaar <Bram@vim.org>.
+Most of Vim was written by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|
Parts of the documentation come from several Vi manuals, written by:
W.N. Joy
@@ -194,7 +194,7 @@ Elvis Another Vi clone, made by Steve Kirkendall. Very compact but isn't
Vim Nvim is based on Vim. https://www.vim.org/
==============================================================================
-Bram Moolenaar *Bram* *brammool*
+Bram Moolenaar *Bram* *Moolenaar* *Bram-Moolenaar* *brammool*
Nvim is a fork of the Vim ("Vi IMproved") text editor, which was originally
developed by Bram Moolenaar. Searching his name within the source code of
@@ -203,6 +203,9 @@ On August 3, 2023, he passed away at the age of 62. If Vim or Nvim have been
of use to you in your life, please read |Uganda| and consider honoring his
memory however you may see fit.
+Obituary Articles: https://github.com/vim/vim/discussions/12742
+Say Farewell: https://github.com/vim/vim/discussions/12737
+
==============================================================================
Notation *notation*
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index fc38f5b73c..42e275c230 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 <Bram@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