[vim/vim] Bring Bram's last patch (9.0.1678) to GitHub (PR #12740)

112 views
Skip to first unread message

K.Takata

unread,
Aug 6, 2023, 2:35:24 PM8/6/23
to vim/vim, Subscribed

Bram's last patch was 9.0.1678: http://ftp.vim.org/pub/vim/patches/9.0/9.0.1678

Unfortunately, it was not committed to this repository.
Bring his last commit to here.

patch 9.0.1678: blade files are not recognized

Problem:    Blade files are not recognized.
Solution:   Add a pattern for Blade files. (closes #12650)

You can view, comment on, or merge this pull request online at:

  https://github.com/vim/vim/pull/12740

Commit Summary

  • ad34abe patch 9.0.1678: blade files are not recognized

File Changes

(3 files)

Patch Links:


Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740@github.com>

codecov[bot]

unread,
Aug 6, 2023, 2:45:28 PM8/6/23
to vim/vim, Subscribed

Codecov Report

Merging #12740 (ad34abe) into master (4c0089d) will increase coverage by 0.63%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #12740      +/-   ##
==========================================
+ Coverage   82.09%   82.73%   +0.63%     
==========================================
  Files         160      150      -10     
  Lines      193683   180569   -13114     
  Branches    43493    40589    -2904     
==========================================
- Hits       159005   149390    -9615     
+ Misses      21833    18229    -3604     
- Partials    12845    12950     +105     
Flag Coverage Δ
huge-clang-none 82.73% <ø> (-0.02%) ⬇️
linux 82.73% <ø> (-0.02%) ⬇️
mingw-x64-HUGE ?
mingw-x86-HUGE ?
windows ?

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

Files Changed Coverage Δ
src/version.c 84.74% <ø> (-0.51%) ⬇️

... and 142 files with indirect coverage changes


Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1666942329@github.com>

Christian Brabandt

unread,
Aug 7, 2023, 11:01:11 AM8/7/23
to vim/vim, Subscribed

thanks!


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1668037953@github.com>

Christian Brabandt

unread,
Aug 7, 2023, 11:01:22 AM8/7/23
to vim/vim, Subscribed

Merged #12740 into master.


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/issue_event/10025345973@github.com>

ObserverOfTime

unread,
Aug 7, 2023, 12:04:28 PM8/7/23
to vim/vim, Subscribed

@chrisbra Can you also tag it?


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1668153902@github.com>

K.Takata

unread,
Aug 7, 2023, 12:16:43 PM8/7/23
to vim/vim, Subscribed

Done.


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1668178665@github.com>

Martin Tournoij

unread,
Aug 7, 2023, 7:16:12 PM8/7/23
to vim/vim, Subscribed

Maybe this should be released/tagged as Vim 9.1? I know that in #12736 @chrisbra said that he wants to "merge any un-contraditionary changes" first, but unless there's some critical stuff in there that really ought to be fixed, I think it would be kind of nice to make a last "pure" Bram-Vim release, before we continue with post-Bram-Vim. Maybe it's silly, but I think it would be nice, mostly for emotional reasons rather than technical.


Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1668692194@github.com>

Tony Mechelynck

unread,
Aug 7, 2023, 7:50:09 PM8/7/23
to vim/vim, Subscribed

I confirm that this patch has reached the Mercurial mirror, but AFAICT it hasn't been tagged v9.0.1678 there. I was a little surprised to see a mention of "Br...@vim.org" (I would have expected "[Bb]r...@moolenaar.net") but then I though that if it's good enough for Christian it's good enough for me : I ought not to expect a third-party takeover under Christian's nose.


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1668715340@github.com>

Tony Mechelynck

unread,
Aug 7, 2023, 8:01:32 PM8/7/23
to vim/vim, Subscribed

P.S. "Br...@vim.org" was the author neme used in previous changesets so I ought not to have been surprised after all.


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1668722442@github.com>

Eric Wong

unread,
Aug 8, 2023, 1:14:06 AM8/8/23
to vim/vim, Subscribed

@chrisbra it is better to use rebase merged feature of github and ignore merge commit.


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1668920630@github.com>

zeertzjq

unread,
Aug 8, 2023, 1:17:39 AM8/8/23
to vim/vim, Subscribed

This may be only PR where the merge button can be used, because in most PRs it's not possible to determine the patch and the change to version.c in advance.


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1668923113@github.com>

Christian Brabandt

unread,
Aug 8, 2023, 12:16:51 PM8/8/23
to vim/vim, Subscribed

oh yes, will tag it in a second


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1669919802@github.com>

ObserverOfTime

unread,
Aug 8, 2023, 12:36:55 PM8/8/23
to vim/vim, Subscribed

Maybe this should be released/tagged as Vim 9.1? I know that in #12736 @chrisbra said that he wants to "merge any un-contraditionary changes" first, but unless there's some critical stuff in there that really ought to be fixed, I think it would be kind of nice to make a last "pure" Bram-Vim release, before we continue with post-Bram-Vim. Maybe it's silly, but I think it would be nice, mostly for emotional reasons rather than technical.

I'm of the same opinion, but since this was a patch that Bram released (just not on GitHub) it should be in 9.0.


Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1669954486@github.com>

Christian Brabandt

unread,
Aug 8, 2023, 12:41:39 PM8/8/23
to vim/vim, Subscribed

Guys, I don't want that now, because Vim has always included contributions from various other people. so it's not like this is changing much now. Let's first clean up the PRs and additional runtime file updates and then go ahead with a new release. It's adding a lot more work if I need to find out how to do it properly now (including adding patch descriptions), when I already have a lot of other things to take care of right now (including my family). So this has to wait a bit.


Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1669960590@github.com>

Christian Brabandt

unread,
Aug 8, 2023, 12:42:54 PM8/8/23
to vim/vim, Subscribed

This may be only PR where the merge button can be used, because in most PRs it's not possible to determine the patch number and the change to version.c in advance.

Yes, I'll most likely do this on the command line and apply the patches there, adding minor patch number and tags and push out (I assume similar to how Bram did it) 🤷‍♂️


Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/pull/12740/c1669962169@github.com>

Reply all
Reply to author
Forward
0 new messages