Fix Scrollbar covering cursor

[cutelisp]

Fix #2392

By mistake I mixed commits in #3740

[dmaluka]

Thanks for the fix. Looks good to me, but please use force-push instead of a merge commit, to avoid mess when we merge this PR.

I've also noticed a related issue: if scrollbar is disabled and then we enable it (e.g. with set scrollbar on), it may also end up covering the cursor, since Relocate() is not triggered immediately. Fix for it: #3743

[cutelisp]

Thanks for the fix. Looks good to me, but please use force-push instead of a merge commit, to avoid mess when we merge this PR.

Are you referring to c85a732?
I am new to git, I don't know how I did that. Did I screwed up?

[JoeKar]

Are you referring to c85a732?

Yes. Most probably you merged the master into your feature branch instead of rebasing it on top of the (upstream/)master.

Did I screwed up?

Not really, but there is now a commit present, which doesn't really belong to this PR and should be removed before merging. :)

[cutelisp]

Thanks, it's fixed (ig)