Fix osdn.net ticket #47553: Allow text to wrap in the Table Compare Window and unwrap...

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 2690570..6f0f6d8 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -3261,7 +3261,8 @@ void CMergeEditView::RefreshOptions()
                SetDisableBSAtSOL(false);
        }
 
-       SetWordWrapping(GetOptionsMgr()->GetBool(OPT_WORDWRAP));
+       SetWordWrapping(GetOptionsMgr()->GetBool(
+               GetDocument()->m_ptBuf[0]->GetTableEditing() ?  OPT_WORDWRAP_TABLE : OPT_WORDWRAP));
        SetViewLineNumbers(GetOptionsMgr()->GetBool(OPT_VIEW_LINENUMBERS));
 
        SetViewTabs(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE));