Enable mixed EOLs per document
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
#2483 Enable mixed EOLs per document
As discussed in patch item:
#1880711 Handle embedded nulls in CrystalEdit
http://winmerge.org/patch/1880711
This patch enables per-document mixed EOLs. Per document mixed EOLs are enabled when files are loaded and multiple EOL styles found, but global mixed EOLs are not enabled.
So user can have single-EOL style file compares open. And then open new compare with files having mixed EOL styles. Mixed EOL styles are enabled only for those new files, other file compares remain in single EOL style.
Original and altered files.
Logged In: YES
user_id=631874
Originator: YES
Committed to SVN trunk.
Completed: At revision: 5085
Logged In: YES
user_id=652377
Originator: NO
The German translation "Gemischt" from "Mixed" don't fit in the status bar. :-/
Logged In: YES
user_id=631874
Originator: YES
I was afraid that not all translations fit.. But just (once again) didn't have a time to start testing translations.
Panel widths are defined in begin of file Src/ChildFrm.cpp. Maybe that _EOL_ width should be make identical (=80) to encoding panel width? Or would e.g. 60 be enough?
Reopening.
Logged In: YES
user_id=652377
Originator: NO
> Or would e.g. 60 be enough?
I think this should be enough. "Gemischt" fit now and I have still a space form 2 or 3 "m"'s.
Logged In: YES
user_id=631874
Originator: YES
Can you commit that change as a fix?
Logged In: YES
user_id=652377
Originator: NO
Committed to SVN (In Revision 5104):
Index: ChildFrm.cpp
--- ChildFrm.cpp (revision 5103)
+++ ChildFrm.cpp (working copy)
@@ -49,7 +49,7 @@
/** @brief Encoding status panel width */
static UINT ENCODING_PANEL_WIDTH = 80;
/** @brief EOL type status panel width */
-static UINT EOL_PANEL_WIDTH = 40;
+static UINT EOL_PANEL_WIDTH = 60;
static CString EolString(const CString & sEol);
Logged In: YES
user_id=631874
Originator: YES
Thanks!
Closing again.