From 91c0d310f2c6c631eb3ebbf5e06d45014cddc4bf Mon Sep 17 00:00:00 2001 From: Jackbennett Date: Wed, 25 May 2016 11:22:27 +0100 Subject: [PATCH 1/6] Disable history switching behavior of ctrl+tab. Sequential switching. --- config/ConEmu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ConEmu.xml b/config/ConEmu.xml index 929cf24..b048569 100644 --- a/config/ConEmu.xml +++ b/config/ConEmu.xml @@ -253,7 +253,7 @@ - + From 27c571636d2a245103a13a7d4d9e1c8b41f9d9ad Mon Sep 17 00:00:00 2001 From: Alexandr Date: Tue, 27 Sep 2016 18:48:23 +0300 Subject: [PATCH 2/6] Added closing process in get_git_status (#1) After execution command: git add * git continues to operate without closing. The process does not stop. --- vendor/clink.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vendor/clink.lua b/vendor/clink.lua index 11e6433..8f44e17 100644 --- a/vendor/clink.lua +++ b/vendor/clink.lua @@ -203,9 +203,12 @@ end -- @return {bool} --- function get_git_status() - for line in io.popen("git status --porcelain 2>nul"):lines() do + local file = io.popen("git status --no-lock-index --porcelain 2>nul") + for line in file:lines() do + file:close() return false end + file:close() return true end From 44e0a040bdbf0314725caf7d5e97d55bba2cc155 Mon Sep 17 00:00:00 2001 From: Benjamin Staneck Date: Wed, 5 Oct 2016 02:16:22 +0200 Subject: [PATCH 3/6] :arrow_up: Update Git to v2.10.1 Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.1.windows.1 --- vendor/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/sources.json b/vendor/sources.json index 255946a..971d4f8 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,8 +1,8 @@ [ { "name": "git-for-windows", - "version": "v2.10.0.windows.1", - "url": "https://github.com/git-for-windows/git/releases/download/v2.10.0.windows.1/PortableGit-2.10.0-32-bit.7z.exe" + "version": "v2.10.1.windows.1", + "url": "https://github.com/git-for-windows/git/releases/download/v2.10.1.windows.1/PortableGit-2.10.1-32-bit.7z.exe" }, { "name": "clink", From eb73f6f7722f7747a5caa846d7c6dc401cbe8707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=BA?= Date: Tue, 11 Oct 2016 14:41:47 +0800 Subject: [PATCH 4/6] fix error when path has a space --- vendor/user-aliases.cmd.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/user-aliases.cmd.example b/vendor/user-aliases.cmd.example index 01df318..03e4d01 100644 --- a/vendor/user-aliases.cmd.example +++ b/vendor/user-aliases.cmd.example @@ -9,7 +9,7 @@ gl=git log --oneline --all --graph --decorate $* ls=ls --show-control-chars -F --color $* pwd=cd clear=cls -history=cat %CMDER_ROOT%\config\.history +history=cat "%CMDER_ROOT%\config\.history" unalias=alias /d $1 vi=vim $* cmderr=cd /d "%CMDER_ROOT%" From a78186f50222e3bae7a38b78a3ac3d7f7352a1e8 Mon Sep 17 00:00:00 2001 From: Adrien Lamarque Date: Fri, 14 Oct 2016 23:36:22 +0200 Subject: [PATCH 5/6] Fix for slow startup under certain conditions (#1122) Fixes #1122 by simply calling CreateProcess before the SendMessageTimeout calls that are used to propagate environment variable changes. --- launcher/src/CmderLauncher.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index 24f35c8..acfd6eb 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -169,8 +169,7 @@ void StartCmder(std::wstring path, bool is_single_mode) } } // Ensure EnvironmentVariables are propagated. - SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG, 5000, NULL); - SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM) L"Environment", SMTO_ABORTIFHUNG, 5000, NULL); // For Windows >= 8 + STARTUPINFO si = { 0 }; si.cb = sizeof(STARTUPINFO); @@ -178,12 +177,15 @@ void StartCmder(std::wstring path, bool is_single_mode) si.lpTitle = appId; si.dwFlags = STARTF_TITLEISAPPID; #endif - PROCESS_INFORMATION pi; if (!CreateProcess(conEmuPath, args, NULL, NULL, false, 0, NULL, NULL, &si, &pi)) { MessageBox(NULL, _T("Unable to create the ConEmu Process!"), _T("Error"), MB_OK); return; } + + LRESULT lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); + lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM) L"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); // For Windows >= 8 + } bool IsUserOnly(std::wstring opt) From 0b43758a34ae16a77665a34fefd455d79b8acb08 Mon Sep 17 00:00:00 2001 From: Werner Roets Date: Sun, 30 Oct 2016 02:57:24 +0200 Subject: [PATCH 6/6] Fixed 3 typos --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 06acbf5..d9ca2e3 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ You can open multiple tabs each containing one of the following shells: |Cmder|cmd.exe|Windows 'cmd.exe' shell enhanced with Git, Git aware prompt, Clink(GNU Readline), and Aliases.| |Cmder as Admin|cmd.exe|Administrative Windows 'cmd.exe' Cmder shell.| |PowerShell|powershell.exe|Windows PowerShell enhanced with Git and Git aware prompt .| -|PowerShell as Admin|powershell.exe|Administrative Windows 'powerhell.exe' Cmder shell.| +|PowerShell as Admin|powershell.exe|Administrative Windows 'powershell.exe' Cmder shell.| |Bash|bash.exe|Unix/Linux like bash shell running on Windows.| |Bash as Admin|bash.exe|Administrative Unix/Linux like bash shell running on Windows.| |Mintty|bash.exe|Unix/Linux like bash shell running on Windows. See below for Mintty configuration differences| @@ -91,7 +91,7 @@ User specific configuration is possible using the cmder specific shell config fi |PowerShell|$ENV:CMDER_ROOT\config\user-profile.ps1| |Bash/Mintty|$CMDER_ROOT/config/user-profile.sh| -Note: Bash and Mintty sessions will also source the '$HOME/.bashrc' file it it exists after it sources '$CMDER_ROOT/config/user-profile.sh'. +Note: Bash and Mintty sessions will also source the '$HOME/.bashrc' file if it exists after it sources '$CMDER_ROOT/config/user-profile.sh'. ### Linux like 'profile.d' support for all supported shell types. You can write *.cmd|*.bat, *.ps1, and *.sh scripts and just drop them in the %CMDER_ROOT%\config\profile.d folder to add startup config to Cmder. @@ -114,7 +114,7 @@ Aliases defined using the `alias.bat` command will automatically be saved in the #### Bash.exe|Mintty.exe Aliases Bash shells support simple and complex aliases with optional parameters natively so they work a little different. Typing `alias name=command` will create an alias only for the current running session. To make an alias permanent add it to either your `$CMDER_ROOT/config/user-profile.sh` or your `$HOME/.bashrc`. -If you add bash aliases to `$CMDER_ROOT/config/user-profile.sh` they will portable and follow your Cmder folder if you copy it to another machine. `$HOME/.bashrc` defined aliases are not portable. +If you add bash aliases to `$CMDER_ROOT/config/user-profile.sh` they will be portable and follow your Cmder folder if you copy it to another machine. `$HOME/.bashrc` defined aliases are not portable. #### PowerShell.exe Aliases PowerShell has native simple alias support, for example `[new-alias | set-alias] alias command`, so complex aliases with optional parameters are not supported in PowerShell sessions. Type `get-help [new-alias|set-alias] -full` for help on PowerShell aliases.