Mercurial Repositories > eric / file comparison
comparison: UI/CompareDialog.py
UI/CompareDialog.py
- changeset 5596
- 4550d8e34765
- parent 5389
- 9b1c800daff3
- child 5603
- 4f2dd0850803
equal
deleted
inserted
replaced
| 5595:1d4706f786d6 | 5596:4550d8e34765 |
|---|---|
| 71 IS_CHARACTER_JUNK): | 71 IS_CHARACTER_JUNK): |
| 72 if not flag: | 72 if not flag: |
| 73 yield ('e', linenumberformat.format(ln1), l1, | 73 yield ('e', linenumberformat.format(ln1), l1, |
| 74 linenumberformat.format(ln2), l2) | 74 linenumberformat.format(ln2), l2) |
| 75 continue | 75 continue |
| 76 if ln2 == "" and l2 == "\n": | 76 if ln2 == "" and l2 in ("\r\n", "\n", "\r"): |
| 77 yield ('d', linenumberformat.format(ln1), removeMarkers(l1), | 77 yield ('d', linenumberformat.format(ln1), removeMarkers(l1), |
| 78 emptylineno, '\n') | 78 emptylineno, l2) |
| 79 continue | 79 continue |
| 80 if ln1 == "" and l1 == "\n": | 80 if ln1 == "" and l1 in ("\r\n", "\n", "\r"): |
| 81 yield ('i', emptylineno, '\n', | 81 yield ('i', emptylineno, l1, |
| 82 linenumberformat.format(ln2), removeMarkers(l2)) | 82 linenumberformat.format(ln2), removeMarkers(l2)) |
| 83 continue | 83 continue |
| 84 yield ('r', linenumberformat.format(ln1), l1, | 84 yield ('r', linenumberformat.format(ln1), l1, |
| 85 linenumberformat.format(ln2), l2) | 85 linenumberformat.format(ln2), l2) |
| 86 | 86 |
