Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

"different carriage returns" warning popup even for single file #1702

Open
nod5 opened this issue Feb 2, 2023 · 2 comments
Open

"different carriage returns" warning popup even for single file #1702

nod5 opened this issue Feb 2, 2023 · 2 comments

Comments

@nod5
Copy link

nod5 commented Feb 2, 2023

If we from the folder comparison results list select a file with "right only" or "left only" status and press "Enter" WinMerge opens it in a split view tab. The file contents is on one side and the other side is blank. Sometimes this triggers the warning popup "These files use different carriage returns". For example if the existing file used Unix style EOL and the blank half, for some reason, expects Windows style EOL.

Is that a bug? If not then consider this a feature request: make the blank side by default mimic the existing file's EOL style.

@sdottaka
Copy link
Member

sdottaka commented Feb 2, 2023

I don't consider this a bug, but I can understand the annoyance.

If you check "Don't ask this question again" as shown below, this message box will not appear the next time.

image

If you want to see this message box again, please uncheck it in the Options dialog window as follows.
image

@nod5
Copy link
Author

nod5 commented Feb 2, 2023

If you check "Don't ask this question again" as shown below, this message box will not appear the next time.

I often want the diff to show EOL differences, but not in this kind of case when there is only one file and a blank pane. Also not in some other cases.

I wish the EOL char diff options worked like this instead:

  1. The existing Options > Compare > General > Ignore Carriage Return Differences checkbox lets the user set a default that applies each time a new comparison tab is opened.

  2. A toolbar icon and hotkey is added to quickly toggle EOL diffing on/off for the active tab only.

  3. The statusbar field for EOL style ("Windows", "Unix", ...) changes color or in some other subtle way signals if there are any EOL differences in the compared documents. This would be a separate hint that always shows and would not be affected by the Ignore Carriage Return Differences setting or the quick toggle state.

I know we can click the arrow next to the options icons on the toolbar and toggle the setting there, but that takes more steps than a single click/hotkey and is a global setting. (That said adding a hotkey to toggle that global setting would be an improvement and I imagine a much smaller code change than my 123 proposal above.)

I also wish the EOL chars were visible as separate characters e.g. CR and LF symbols instead of the current down-left arrow symbol. That would be useful for example in cases where a single file contains different EOL characters.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants