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:
874ee53
)
Determine the language of syntax highlighting with the extension obtained with the...
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Wed, 16 Jun 2021 14:18:56 +0000
(23:18 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Wed, 16 Jun 2021 14:18:56 +0000
(23:18 +0900)
Src/MergeDoc.cpp
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.cpp
b/Src/MergeDoc.cpp
index
6cb36eb
..
4e6ffb4
100644
(file)
--- a/
Src/MergeDoc.cpp
+++ b/
Src/MergeDoc.cpp
@@
-3033,7
+3033,7
@@
bool CMergeDoc::OpenDocs(int nFiles, const FileLocation ifileloc[],
if (bFiltersEnabled && m_pInfoUnpacker->m_textType.length())
sext[nBuffer] = m_pInfoUnpacker->m_textType;
else
- sext[nBuffer] = GetFileExt(
fileloc[nBuffer].filepath
.c_str(), m_strDesc[nBuffer].c_str());
+ sext[nBuffer] = GetFileExt(
m_ptBuf[nBuffer]->GetTempFileName()
.c_str(), m_strDesc[nBuffer].c_str());
ForEachView(nBuffer, [&](auto& pView) {
bTyped[nBuffer] = pView->SetTextType(sext[nBuffer].c_str());
if (bTyped[nBuffer])