[RFC] vim-patch:7.4.310, vim-patch:7.4.313

[munshkr]

7.4.310

Problem:    getpos()/setpos() don't include curswant.
Solution:   Add a fifth number when getting/setting the cursor.

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

7.4.313

Problem:    Changing the return value of getpos() causes an error. (Jie Zhu)
Solution:   Revert getpos() and add getcurpos().

https://code.google.com/p/vim/source/detail?r=332a5c2b2956d9b18d85268a724d01deea27ec83

[munshkr]

About these Vim patches, should we merge them while conforming to Neovim's style guide? Or should that be in another issue/PR (like a "refactor")?

[justinmk]

We tend to update the style for lines that are already changing, and add missing {} braces and change /**/ to // or ///. It's a matter of judgement; a guideline is: if more than 20% of the changes are style changes, it's too noisy.

[munshkr]

👍 thanks, I'll update this one then

[munshkr]

Added braces and used // only on new lines. I can rebase this with neovim/docs#31 once #938 is merged.

[justinmk]

@munshkr #938 is merged, so docs can be updated in this PR.

[munshkr]

Rebased against master, looks like docs are already merged.

[atwupack]

@munshkr The doc for cursor({list}) is merged but for getpos({expr}) it still needs to be done.
Edit: Just noticed that there is 7.4.313 which reverts some of the changes here and adds a new function getcurpos. Maybe we should include it here?

[munshkr]

@atwupack runtime/doc was updated from Vim's master with #938, so all documentation changes from this patch and future patches (including 7.4.313) are already merged.

[atwupack]

@munshkr I was thinking about the patch in general and not only the documentation. 7.4.313 is strongly based on 7.4.310 because in reverts some on the changes in 7.4.310. For example it would be bad if 7.4.313 got merged into master before 7.4.310. As these two patches are so strongly connected, I think that they should be part of one PR.

[munshkr]

Ahh, I see what you mean. I'll include 7.4.313 in a separate commit then.

[munshkr]

@atwupack Patch 7.4.313 commited.
Also fixed test for 310, because it wasn't testing the output correctly (test.out file was being closed before writting getpos/getcurpos result).

[splinterofchaos]

I was just about to submit a PR for this when I noticed this one. @munshkr, could you rebase to the current master?

LGTM! 👍

[munshkr]

@splinterofchaos sorry for the delay... I've just rebased

[splinterofchaos]

Still LGTM. 👍

[justinmk]

LGTM too. Thanks @munshkr