diff --git a/.clang-format b/.clang-format index 3b3af3d2b4..cff106f82f 100644 --- a/.clang-format +++ b/.clang-format @@ -9,7 +9,6 @@ AllowShortBlocksOnASingleLine: true AllowShortFunctionsOnASingleLine: true #AllowShortIfStatementsOnASingleLine: true AllowShortLoopsOnASingleLine: false -BinPackParameters: true BreakBeforeBraces: Linux BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: true @@ -52,3 +51,7 @@ SortIncludes: true IncludeBlocks: Regroup AlwaysBreakTemplateDeclarations: true AlwaysBreakBeforeMultilineStrings: false +AlignEscapedNewlines: LeftWithLastLine +AlignOperands: true +BinPackParameters: false +BinPackArguments: false diff --git a/Plugin/wxTerminalCtrl/wxTerminalCtrl.cpp b/Plugin/wxTerminalCtrl/wxTerminalCtrl.cpp index b8302f9db5..0ea97408b0 100644 --- a/Plugin/wxTerminalCtrl/wxTerminalCtrl.cpp +++ b/Plugin/wxTerminalCtrl/wxTerminalCtrl.cpp @@ -100,6 +100,8 @@ void wxTerminalCtrl::StartShell() env.push_back({ "WD", wxFileName(shell_exec).GetPath() }); #endif + // required to get colours + env.push_back({ "TERM", "xterm-256color" }); LOG_DEBUG(TERM_LOG()) << "Starting shell process:" << shell_exec << endl; if (m_shellCommand == "bash") { m_shell = ::CreateAsyncProcess(this, shell_exec + " --login -i", IProcessRawOutput, wxEmptyString, &env); diff --git a/submodules/lexilla b/submodules/lexilla index e64c971c76..6bbeb6c055 160000 --- a/submodules/lexilla +++ b/submodules/lexilla @@ -1 +1 @@ -Subproject commit e64c971c76764edc2b25a92968f3be4bcf8ceade +Subproject commit 6bbeb6c055db5d6d450dadb34e1fac53b01e4175 diff --git a/submodules/wxdap b/submodules/wxdap index d001f9676c..c5ee347427 160000 --- a/submodules/wxdap +++ b/submodules/wxdap @@ -1 +1 @@ -Subproject commit d001f9676c18338dcb4a0297aed0feb31e0f7388 +Subproject commit c5ee34742728f97fa30d0877b925b260466057ba