OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ba1dea
)
MergeDoc.cpp: Remove unused variables
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Thu, 31 Dec 2020 01:32:48 +0000
(10:32 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Thu, 31 Dec 2020 01:32:48 +0000
(10:32 +0900)
Src/MergeDoc.cpp
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.cpp
b/Src/MergeDoc.cpp
index
1c888a6
..
c2ad654
100644
(file)
--- a/
Src/MergeDoc.cpp
+++ b/
Src/MergeDoc.cpp
@@
-59,19
+59,8
@@
using std::swap;
-/** @brief Max len of path in caption. */
-static const UINT CAPTION_PATH_MAX = 50;
-
int CMergeDoc::m_nBuffersTemp = 2;
-/** @brief EOL types */
-static LPCTSTR crlfs[] =
-{
- _T ("\x0d\x0a"), // DOS/Windows style
- _T ("\x0a"), // UNIX style
- _T ("\x0d") // Macintosh style
-};
-
static void SaveBuffForDiff(CDiffTextBuffer & buf, const String& filepath, int nStartLine = 0, int nLines = -1);
/////////////////////////////////////////////////////////////////////////////