From: Laurent Ganier <laoran@users.sourceforge.net>
Date: Mon, 1 Sep 2003 22:28:56 +0000 (+0000)
Subject: [ 797957 ] correct line number for last real line (in statusbar)
X-Git-Tag: 2.16.5~7809
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=93e5fb5eede2b32396fc7d9efecbadc8211b4b7b;p=winmerge-jp%2Fwinmerge-jp.git

[ 797957 ] correct line number for last real line (in statusbar)
---

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 08ce8b00a..80edf0331 100644
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -1018,10 +1018,10 @@ OnUpdateCaret()
 		int nScreenLine = GetCursorPos().y;
 		int nRealLine = ComputeRealLine(nScreenLine);
 		CString sLine;
-		int chars = GetLineLength(nScreenLine);
-		CString sEol = GetTextBufferEol(nScreenLine);
+		int chars;
+		CString sEol;
 		// Is this a ghost line ?
-		if (!m_pTextBuffer->GetFullLineLength(nScreenLine))
+		if (m_pTextBuffer->GetLineFlags(nScreenLine) & LF_GHOST)
 		{
 			// Ghost lines display eg "Line 12-13"
 			sLine.Format(_T("%d-%d"), nRealLine, nRealLine+1);
diff --git a/Src/readme.txt b/Src/readme.txt
index 25f91fb03..d49421f04 100644
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-09-02 Laoran
+ [ 797957 ] correct line number for last real line (in statusbar)
+  WinMerge: MergeEditView.cpp
+
 2003-09-01 Laoran
  [ 798272 ] save settings for the dockable diff bar
   WinMerge: ChildFrm.cpp ChildFrm.h MainFrm.cpp