Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from Aug 13, 2023

Conversation

chrisbra
Copy link
Member

@chrisbra chrisbra commented Aug 8, 2023

No description provided.

@chrisbra chrisbra changed the title Farewall to Bram and dedicate upcoming Vim 9.1 to him Farewell to Bram and dedicate upcoming Vim 9.1 to him Aug 8, 2023
@chrisbra chrisbra force-pushed the doc_update branch 2 times, most recently from ee9b418 to 025db31 Compare August 8, 2023 19:31
@codecov
Copy link

codecov bot commented Aug 8, 2023

Codecov Report

Merging #12749 (3984169) into master (84bc00e) will decrease coverage by 0.03%.
Report is 28 commits behind head on master.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master   #12749      +/-   ##
==========================================
- Coverage   82.10%   82.08%   -0.03%     
==========================================
  Files         160      160              
  Lines      193690   193774      +84     
  Branches    43492    43518      +26     
==========================================
+ Hits       159025   159051      +26     
- Misses      21819    21867      +48     
- Partials    12846    12856      +10     
Flag Coverage Δ
huge-clang-none 82.70% <0.00%> (-0.03%) ⬇️
linux 82.70% <0.00%> (-0.03%) ⬇️
mingw-x64-HUGE 76.59% <ø> (-0.02%) ⬇️
mingw-x86-HUGE 77.07% <ø> (-0.03%) ⬇️
windows 78.18% <ø> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
src/message.c 79.26% <0.00%> (ø)

... and 16 files with indirect coverage changes

@@ -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*
Vim version 9.1 is dedicated to Bram Moolenaar, who passed away August 3rd 2023
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"who passed away on"?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest "who passed away August 3rd, 2023". The "on" is optional to my (non-native) eyes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean adding "," between the date and the year?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@k-takata he means remove the word "on"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

English is not my native language. I suggest.

Vim version 9.1 is dedicated to Bram Moolenaar, who passed away on August 3rd 2023

Also replace in a few more places Brams email address and mention new
maintainers.
@chrisbra
Copy link
Member Author

chrisbra commented Aug 9, 2023

I have slightly updated it according to the suggestions, and replaced Brams email address in a few more places (e.g. the license and for reporting bugs). Hope you all find that okay.

Comment on lines 5 to 6
# Maintainer: The Vim Project <https://github.com/vim/vim>
# Former Maintainer: Bram Moolenaar <Bram@vim.org>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Maintainer: The Vim Project <https://github.com/vim/vim>
# Former Maintainer: Bram Moolenaar <Bram@vim.org>
# Maintainer: The Vim Project <https://github.com/vim/vim>
# Former Maintainer: Bram Moolenaar <Bram@vim.org>

How about aligning "Language:", "Maintainer:" and "Last Change:"?
Not sure if "Former Maintainer:" should be also aligned.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, will adjust later.

@yegappan yegappan added this to the vim-9.1 milestone Aug 11, 2023
@chrisbra chrisbra requested a review from dpelle as a code owner August 11, 2023 18:36
@chrisbra
Copy link
Member Author

are we okay including this?

@Shane-XB-Qian
Copy link
Contributor

Shane-XB-Qian commented Aug 12, 2023 via email

@chrisbra chrisbra merged commit e978b45 into vim:master Aug 13, 2023
30 of 32 checks passed
@Shane-XB-Qian
Copy link
Contributor

Shane-XB-Qian commented Aug 13, 2023 via email

@chrisbra
Copy link
Member Author

chrisbra commented Aug 13, 2023 via email

seandewar added a commit to seandewar/neovim that referenced this pull request Aug 13, 2023
Farewell to Bram and dedicate upcoming Vim 9.1 to him (vim/vim#12749)

vim/vim@e978b45

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>
seandewar added a commit to seandewar/neovim that referenced this pull request Aug 13, 2023
Farewell to Bram and dedicate upcoming Vim 9.1 to him (vim/vim#12749)

vim/vim@e978b45

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>
seandewar added a commit to neovim/neovim that referenced this pull request Aug 13, 2023
Farewell to Bram and dedicate upcoming Vim 9.1 to him (vim/vim#12749)

vim/vim@e978b45

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>
@@ -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 <Bram@vim.org>"),
_("Messages maintainer: The Vim Project"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you should add an email address vim-dev@vim.org

@ychin
Copy link
Contributor

ychin commented Aug 14, 2023

This change modified the Vim license file. I'm just assuming that's an ok thing to do given the way it's previously written allowing for change of maintainers (was previously going to ask about this on a separate discussion as license issues can be tricky), but wondering if this affects other things like the GitHub license detection (it still seems to work so far), and the spdx entry: https://spdx.org/licenses/Vim.html, as well as https://vim-license.dev/.

Pinging @othree who filed #5458 and also did a lot of work on getting the Vim license recognized.

@othree
Copy link

othree commented Aug 15, 2023

Thanks for pinging me, I can help to communicate and send the PR. There are two major repos we need to send PR:

  • SPDX
  • choosealicense, which is the source of license recognization.

But I think it will cause some issues if we change the text in choosealicense directly. Which will cause the existing repo uses the Vim license to become unrecognized. The ideal case is we have a new version of the license, such as Vim License 1.1. Then we didn't need to worry about the existing repo being affected. But it also will cause another issue. The choosealicense only accepts widely used licenses. Vim License 1.1 will be a new license and is not widely used at this moment. So there will be a period of time that GitHub won't recognize it.

@ychin
Copy link
Contributor

ychin commented Aug 15, 2023

When you say "existing repo", do you mean this one itself (https://github.com/vim/vim/)? It seems like GitHub is still recognizing it despite this PR being merged already, but I wonder if there is a time delay in rescanning done by GitHub. If that's the case that means GitHub will soon stop recognizing the license?

@othree
Copy link

othree commented Aug 15, 2023

The "existing repo" means every repo uses Vim License such as "tpope/vim-pathogen". "vim/vim" is one of them. I will try to verify my assumption later(maybe next week). GitHub has a special cache for the result of license detection. So it is possible that the license result is not changed now. I am not sure when it will be invalid.

@chrisbra
Copy link
Member Author

I was a bit hesitant to change the license file directly, but I did not see any alternatives. Surely, just changing the maintainer line should be allowed and okay, since we did not touch the actual license clauses. But if you think of a different solution, please let me know.

k-takata added a commit to k-takata/vim that referenced this pull request Aug 18, 2023
Update po files by running `make` in `src/po/`.
Some po files were out of sync with the files in other encodings.

Related: vim#12749, vim#12787, vim#12826
@k-takata k-takata mentioned this pull request Aug 18, 2023
chrisbra pushed a commit that referenced this pull request Aug 19, 2023
Update po files by running `make` in `src/po/`.
Some po files were out of sync with the files in other encodings.

Related: #12749, #12787
closes: #12826
closes: #12840
Konfekt pushed a commit to Konfekt/vim that referenced this pull request Aug 30, 2023
Update po files by running `make` in `src/po/`.
Some po files were out of sync with the files in other encodings.

Related: vim#12749, vim#12787
closes: vim#12826
closes: vim#12840
@othree
Copy link

othree commented Aug 31, 2023

A quick update:

The Licensee can recognize the new version of the Vim License text

vim-license-licensee

The similarity is 98.45%. The threshold is 98%, so there is not much space for other differences. I will spend some time checking other projects using the Vim License and have the software name correctly modified. Currently, I feel positive about the results. It seems Licensee has a better algorithm to compare the license text with substitutions than before.

If the result is good. We don't need to worry about the existing software in the wild. We just need to:

  1. Discuss how to deal with this case with the SPDX
  2. Update the license text or create a new version of the license based on the answer of 1
  3. Update the license text on choosealicense.com if necessary

@chrisbra
Copy link
Member Author

that are good news, thanks!

chrisbra added a commit to chrisbra/vim that referenced this pull request Sep 22, 2023
* 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
chrisbra pushed a commit to chrisbra/vim that referenced this pull request Sep 22, 2023
Update po files by running `make` in `src/po/`.
Some po files were out of sync with the files in other encodings.

Related: vim#12749, vim#12787
closes: vim#12826
closes: vim#12840
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants