From 40e7c82c26f3ce138dc656a651c8b6bacc66b363 Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Wed, 20 Jul 2005 22:05:38 +0000 Subject: [PATCH] Cosmetic: Add function header comment to CMergeDoc::GetWordDiffArray Src: MergeDocLineDiffs.cpp --- Src/MergeDocLineDiffs.cpp | 5 +++++ Src/readme.txt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Src/MergeDocLineDiffs.cpp b/Src/MergeDocLineDiffs.cpp index 7d24534cc..d2c102d98 100644 --- a/Src/MergeDocLineDiffs.cpp +++ b/Src/MergeDocLineDiffs.cpp @@ -315,6 +315,11 @@ void CMergeDoc::Computelinediff(CCrystalTextView * pView1, CCrystalTextView * pV } } +/** + * @brief Return array of differences in specified line + * This is used by algorithm for line diff coloring + * (Line diff coloring is distinct from the selection highlight code) + */ void CMergeDoc::GetWordDiffArray(int nLineIndex, wdiffarray *pworddiffs) { if (nLineIndex >= m_pLeftView->GetLineCount()) return; diff --git a/Src/readme.txt b/Src/readme.txt index 9559f1860..f18a4daa0 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,6 +1,8 @@ 2005-07-20 Perry PATCH: [ 1241753 ] Fix DirViewColItems int64 cast warnings Src: DirViewColItems.cpp + Cosmetic: Add function header comment to CMergeDoc::GetWordDiffArray + Src: MergeDocLineDiffs.cpp 2005-07-19 Kimmo PATCH: [ 1238194 ] Use proper member names in MergeDiffDetailView -- 2.11.0