#1747 Opening mixed-EOL file forces other side to be mixed

[Kimmo Varis]

Current trunk (r5640).

If you open two files, another being mixed-EOL and another having just one EOL type, both files are shown as Mixed-EOL. Which is a bit confusing for the user.

This also causes that WinMerge may copy wrong EOL types when copying differences and actually make a non-mixed EOL file mixed-EOL file.

Instead we should handle non-mixed-EOL file as such and properly convert EOL types when copying differences.

[Kimmo Varis]

Patch

[Kimmo Varis]

Attached a patch (per_buffer_mixed_eol.patch).

This patch moves mixed-eol info to text buffer, so both buffers can have it set independently. And views ask from attached buffer if the eol style is mixed.

I'm considering this for 2.12 branch too.

[Kimmo Varis]

Fix committed to SVN trunk:
Completed: At revision: 6732

[Kimmo Varis]

Matthias found a bug from my patch:
#2790879 Wrong EOL Style displayed
http://winmerge.org/bug/2790879

Looking at it..

[Kimmo Varis]

Fix the bug Matthias found

[Kimmo Varis]

Attached a patch (fix_for_mixed_eol_statuses.patch) that fixes the bug Matthias found. And fix is also what Matthias suggested.

[Kimmo Varis]

Committed the fix to SVN trunk:
Completed: At revision: 6735

[Kimmo Varis]

Committed to 2.12 branch:
Completed: At revision: 6750