Re: [PATCH] auto merge actions

[Kai Willadsen <kai willadsen gmail com>]

On 17 June 2010 19:52, Piotr Piastucki <leech miranda gmail com> wrote:
> Hi,
>
> Here is another version of the patch. It includes a slightly modified
> version of Kai's patch and tries to set sensitivity only when diff or active
> text view has changed.

I've committed this with some small changes. I split my
mergeable_changes patch back out for the sake of clarity, and included
your initialisation fix. There were a few other minor issues I
noticed, but for the sake of getting things done I just went ahead and
fixed them myself:

 * I changed the strings associated with the new actions. "Pull all
non-conflicting from left" isn't the best description, as this will
actually 'pull' deletions; our other 'pull' actions won't do this. All
of these actions are closer to merges than anything else, so I renamed
the new actions to: "Merge all changes from left", "Merge all changes
from right" and "Merge all changes".

 * The code designed to reset the scrollbar to where it was prior to
the merge actions wasn't working because _sync_vscroll was being
called automatically before we got a chance to do so manually. I fixed
this by taking the vscroll lock around the set_text calls

 * I removed the now-obsolete Copy To Left/Right actions from the
pop-up menu, since there's really nothing sensible that they did that
the new actions don't do better.

Thanks for the patch.

...and now for that release.

cheers,
Kai