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

vim-patch:8.1.1726,8.2.{296,860,1827,2388,2788,2790,2801} #14424

Merged
merged 82 commits into from
May 4, 2021

Conversation

janlazo
Copy link
Contributor

@janlazo janlazo commented Apr 23, 2021

Please report any syntax or API issues with the runtime files to their respective maintainers.

I'm going through all 70 runtime patches. Expect tons of breaking changes, at least for documentation. My aim is to port runtime patches before patch v8.2.0149 (vim9) by next week.

I'd appreciate assistance on the po files.
I haven't removed the duplicate translations yet so I expect all builds to fail.

Omit (or partially port) the following:

  • translations: de.po, ru.po, any po file that require duplicates for full port
  • features, syntax, and documentation for unmerged patches (ie. state(), vim9, modifyOtherKeys)
  • Vim's textprop, terminal, popupwin
  • GUI (ie. scrollfocus)
  • tutor
  • vi_diff.txt (should be N/A because Neovim has vim_diff.txt and removed most references to Vi)
    • didn't notice that it's actually in the repo. whoops 🤦
  • desktop files (ie. gvim.desktop)
  • version8.txt
  • old plugins and tools (ie. logipat, getscripts)
  • .github/ files (ie. CODEOWNERS)
    • handle in separate issue and PR, not this one

20 patches done after syncing most runtime files with Vim 8.2.0.
41 patches done after syncing up before Vim 8.2.0930.
50+ to go towards Vim master.
<10 left to go towards Vim master.

@janlazo janlazo added this to the 0.5 milestone Apr 23, 2021
@janlazo janlazo mentioned this pull request Apr 23, 2021
15 tasks
@janlazo janlazo force-pushed the vim-8.1.1726 branch 2 times, most recently from 5a5d8d2 to 37fdf0a Compare April 24, 2021 00:52
@janlazo janlazo changed the title vim-patch:8.1.1726 vim-patch:8.1.{1726,2257} Apr 24, 2021
@janlazo janlazo changed the title vim-patch:8.1.{1726,2257} vim-patch:8.1.{1726} Apr 24, 2021
@janlazo janlazo force-pushed the vim-8.1.1726 branch 2 times, most recently from 4e488f6 to 28d948c Compare April 24, 2021 19:10
@janlazo janlazo marked this pull request as ready for review April 25, 2021 01:28
@janlazo janlazo changed the title vim-patch:8.1.{1726} vim-patch:8.1.1726,8.2.0296 Apr 27, 2021
Problem:    The eval.txt help file is too big.
Solution:   Split off testing support to testing.txt.  Move function details
            to where the functionality is explained.
vim/vim@ed997ad

Vim commit 5477506a9f01d40fad2e8f0555bc37adee30478f
contains the duplicate tag fix in runtime/doc/testing.txt.
Update runtime files
vim/vim@8fe1000

Omit de.po changes.
There's too many lines to port and I don't understand the language.
Updte runtime files
vim/vim@589edb3

Omit state() changes in eval.txt because patch v8.1.2047 is not merged.
":unset" is not a valid Ex command.
Use setenv() to set/unset environment variables.
Update runtime files
vim/vim@96f45c0

Omit de.po changes.
Same reason as before: too much and I don't understand the language.
Update runtime files
vim/vim@5ef1c6a

"scrollfocus" is for Windows GUI only so it is N/A.
Update runtime files
vim/vim@574ee7b

Omit ru.po because I don't know the language and there's too much to port.
Fix vim.desktop generation.
vim/vim@1ebbb6e
Update runtime files.
vim/vim@09c6f26

Omit getmousepos().
Patch v8.1.2304 is not ported yet.
Update runtime files.
vim/vim@403f3eb

Port sr.po changes, done by vim-patch.sh.
No way I'm manually porting the rest.
Update runtime files
vim/vim@0c0734d

Omit rand(), srand() documentation.
Patch v8.1.2342 is not ported yet.
Update a few runtime files
vim/vim@4ceaa3a

Omit de.po.
Update version 8.2 notes and make syntax.
vim/vim@9834b96
@janlazo janlazo changed the title vim-patch:8.1.1726,8.2.{296,860,1827,2388,2801} vim-patch:8.1.1726,8.2.{296,860,1827,2388,2788,2790,2801} May 2, 2021
@janlazo
Copy link
Contributor Author

janlazo commented May 2, 2021

😌 Finally done (today). Most of the runtime commits aren't complete ports but the same goes for the vim-patch PRs since vim9.

Going to merge tonight (if I don't lose internet or electricity) if no one volunteers to review. It shouldn't be difficult to review if one trusts me to not mess up copy/paste when vim-patch.sh doesn't auto-apply the patch on the file. I actually messed up on some of them but all should be fixed by the last commit. Majority of the review should be spent on the runtime files, maintained by Vim, because I modified those files to omit vim9 or port to pre-8.2 Vimscript syntax (ie. rewrite method syntax to non-method syntax).

Copy link
Member

@jamessan jamessan left a comment

Choose a reason for hiding this comment

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

Didn't do a thorough review, but tried to look for possible incompatibilities.

runtime/autoload/man.vim Show resolved Hide resolved
runtime/autoload/phpcomplete.vim Outdated Show resolved Hide resolved
runtime/autoload/zip.vim Show resolved Hide resolved
@mhinz
Copy link
Member

mhinz commented May 3, 2021

win_complete()

  • runtime/autoload/phpcomplete.vim: It's used all over the place together with popup*(), so don't merge.
  • runtime/doc/usr_41.txt: Probably fine if we intend to merge win_complete() anyway in the future.
  • src/nvim/testdir/test_conceal.vim: Comment it out for now.

@mhinz
Copy link
Member

mhinz commented May 3, 2021

General question: Will we ever change v:version again? Currently it's 800.

runtime/autoload/netrw.vim for example checks if it can use popup_beval()/popup_close() like this:

v:version > 802 || (v:version == 802 && has("patch486"))

So, unless we satisfy that condition, we should be good (for now).

@jamessan
Copy link
Member

jamessan commented May 3, 2021

General question: Will we ever change v:version again? Currently it's 800.

Yes, when we've finished porting the 8.0 patches.

It targets Vim 8.2 without feature and version checks.
@janlazo
Copy link
Contributor Author

janlazo commented May 4, 2021

runtime/autoload/phpcomplete.vim is reverted.

win_execute PR #13664

src/nvim/testdir/test_conceal.vim passes because it doesn't run win_execute. No need to comment out dead code. Dead code is kept for merging.

@janlazo
Copy link
Contributor Author

janlazo commented May 4, 2021

I'm merging this since the reviewer comments are handled here or in a separate PR (ie. win_execute).
Blame me if anything breaks. 🏃

It will be at least another year before v:version is set to 802 so popup code in netrw will be dealt with in another release.

@janlazo janlazo merged commit 4ad30f7 into neovim:master May 4, 2021
@janlazo janlazo deleted the vim-8.1.1726 branch May 4, 2021 23:18
@janlazo
Copy link
Contributor Author

janlazo commented May 4, 2021

As for the vi_diff.txt, I'll fix it up in a separate PR. There are unmerged vim patches that shift the Vi references to vi_diff.txt

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.

3 participants