From 1e1f2f6033cb4fa1ce78f7218aec72ca2a8b43ca Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 6 Feb 2017 15:14:00 +0000 Subject: [PATCH] ide: Diff cosmetics git-svn-id: svn://ultimatepp.org/upp/trunk@10826 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/TextDiffCtrl/TextDiff.cpp | 2 +- uppsrc/usvn/Diff.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/uppsrc/TextDiffCtrl/TextDiff.cpp b/uppsrc/TextDiffCtrl/TextDiff.cpp index ac8c3a14b..61b02bd42 100644 --- a/uppsrc/TextDiffCtrl/TextDiff.cpp +++ b/uppsrc/TextDiffCtrl/TextDiff.cpp @@ -22,7 +22,7 @@ Vector GetLineMap(Stream& stream) while(!stream.IsEof()) { String s = stream.GetLine(); const char *p = s, *e = s.End(), *f = e; - while(e > p && (byte)e[-1] != 9 && (byte)e[-1] < ' ') + while(e > p && /*(byte)e[-1] != 9 && */(byte)e[-1] < ' ') e--; if(e == p) emp++; diff --git a/uppsrc/usvn/Diff.cpp b/uppsrc/usvn/Diff.cpp index 8dab1637c..deb91746f 100644 --- a/uppsrc/usvn/Diff.cpp +++ b/uppsrc/usvn/Diff.cpp @@ -56,6 +56,7 @@ void SvnDiff::Execute(const String& f) r.SetIndex(0); Load(); } + DiffDlg::Execute(f); }