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

[RFC] vim-patch:7.4.231 #1062

Merged
merged 1 commit into from Aug 20, 2014
Merged

[RFC] vim-patch:7.4.231 #1062

merged 1 commit into from Aug 20, 2014

Conversation

atwupack
Copy link
Contributor

vim-patch:7.4.230

Problem: Error when using ":options".
Solution: Fix the entry for 'lispwords'. (Kenichi Ito)

https://code.google.com/p/vim/source/detail?r=57ecd7a8c0f052296b41b916eb1ae7

This has already been done with #938. This commit only changes version.c.

The current version.c already has patch 230 in it.


vim-patch:7.4.231

Problem: An error in ":options" is not caught by the tests.
Solution: Add a test for ":options". Set $VIMRUNTIME for the tests so that
it uses the current runtime files instead of the installed ones.

https://code.google.com/p/vim/source/detail?r=0a295a3c9e473512ad3b006a0fb752

This is the test for 7.4.230. I have changed the $SCRIPTSOURCE/$VIMRUNTIME to match the Neovim project structure.

@atwupack atwupack changed the title vim-patch:7.4.230+231 [RFC] vim-patch:7.4.230+231 Aug 13, 2014
@justinmk
Copy link
Member

@oni-link @atwupack I've committed a script in the bot-ci project to auto-generate a vim-patch report here:

http://neovim.org/doc/build-reports/vimpatch/

So we no longer need to manually update the wiki page. I don't want to remove the table in the wiki page yet, because the report still doesn't take into account the "N/A" items. I was thinking we could indicate those in version.c by appending NA to specific commented-out versions, eg:

//123 NA

The script also will obviously have problems when Vim switches to version 7.5. By then, we'll have Neovim's versioning process decided and we can adapt the script based on that.

We can also make the script link to the GitHub commits by using git log --grep='vim-patch'.

@atwupack
Copy link
Contributor Author

@justinmk Good work. This will make it easier to keep track of the patches.
I also had the idea a few days ago to put some kind of annotation in version.c on the patches that won't be included. Maybe we could even handle it in a way that these "missing" patches won't show up as gaps on the :version page?
I know it is a first draft but a small thing: the pull requests should have a link to the PR page.

@justinmk
Copy link
Member

Maybe we could even handle it in a way that these "missing" patches won't show up as gaps on the :version page?

That's definitely something that will be fixed when we settle on a versioning scheme.

the pull requests should have a link to the PR page.

It's a bug, noted here: neovim/bot-ci#10 Fixed.

@Hinidu
Copy link
Contributor

Hinidu commented Aug 15, 2014

Maybe we could even handle it in a way that these "missing" patches won't show up as gaps on the :version page?

What about this?

123,  // NA

@justinmk
Copy link
Member

@Hinidu I would like to do that, but #445 (comment) pointed out some valid reasons why we should't do that.

@@ -5,6 +5,7 @@
export SHELL := sh

VIMPROG := ../../../build/bin/nvim
SCRIPTSOURCE = ../../../runtime
Copy link
Member

Choose a reason for hiding this comment

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

Although it doesn't technically matter, for consistency this should probably use := like the other assignments above. I think := is also less surprising so it's good practice to use it unless = behavior is explicitly needed.

Problem:    An error in ":options" is not caught by the tests.
Solution:   Add a test for ":options".  Set $VIMRUNTIME for the tests so that
            it uses the current runtime files instead of the installed ones.

https://code.google.com/p/vim/source/detail?r=0a295a3c9e473512ad3b006a0fb752ad43d19094
@atwupack atwupack changed the title [RFC] vim-patch:7.4.230+231 [RFC] vim-patch:7.4.231 Aug 19, 2014
@atwupack
Copy link
Contributor Author

@justinmk I have changed the assignment and removed patch 230 from this PR.

justinmk added a commit that referenced this pull request Aug 20, 2014
@justinmk justinmk merged commit bbefc73 into neovim:master Aug 20, 2014
@atwupack atwupack deleted the vp-7.4.230+231 branch August 21, 2014 17:04
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

3 participants