touch up clink.lua

⬆️ Update git-for-windows to v2.15.0.windows.1
Merge pull request #1417 from gucong3000/patch-2
2025-07-16 12:39:38 +08:00 · 2017-11-03 13:13:51 +01:00 · 2017-11-01 11:32:18 +00:00 · 2017-10-31 21:09:23 +00:00 · 2017-10-29 10:46:38 +01:00 · 2017-10-28 14:21:38 +02:00
23 changed files with 624 additions and 168 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,3 +15,5 @@ Version v*
 config/user-*
 config/aliases
 config/profile.d
+.github_changelog_generator
+launcher/.vs
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,13 +1,13 @@
 # Change Log

-## [v1.3.0-pre](https://github.com/cmderdev/cmder/tree/v1.3.0-pre) (2016-03-20)
-[Full Changelog](https://github.com/cmderdev/cmder/compare/v1.2.9...v1.3.0-pre)
-
+## [1.3.2](https://github.com/cmderdev/cmder/tree/1.3.2) (2016-12-01)
 **Implemented enhancements:**

 - Change appveyor.yml to publish all resulting artifacts from builds. [\#717](https://github.com/cmderdev/cmder/issues/717)
 - Stuff that should not be in the release zips [\#662](https://github.com/cmderdev/cmder/issues/662)
+- Make cmder auto start with windows and auto minimize to the status bar. [\#532](https://github.com/cmderdev/cmder/issues/532)
 - v1.2.0: Errors because of PowerShell execution policy [\#483](https://github.com/cmderdev/cmder/issues/483)
+- Updating Vendors with chocolatey [\#442](https://github.com/cmderdev/cmder/issues/442)
 - Alias without it's opposit [\#281](https://github.com/cmderdev/cmder/issues/281)
 - Improve new UX [\#230](https://github.com/cmderdev/cmder/issues/230)
 - Different Font for the Lambda [\#211](https://github.com/cmderdev/cmder/issues/211)
@ -16,13 +16,16 @@
 - Include Scoop as package manager [\#42](https://github.com/cmderdev/cmder/issues/42)
 - Complete aliases on tab [\#38](https://github.com/cmderdev/cmder/issues/38)
 - Path ordering issue - wrong find.exe executes by default [\#37](https://github.com/cmderdev/cmder/issues/37)
+- User conemu cfg [\#1109](https://github.com/cmderdev/cmder/pull/1109) ([daxgames](https://github.com/daxgames))
 - Msys bash [\#702](https://github.com/cmderdev/cmder/pull/702) ([daxgames](https://github.com/daxgames))
 - Added code to check for the existence of a customized ini file.. [\#427](https://github.com/cmderdev/cmder/pull/427) ([kodybrown](https://github.com/kodybrown))
- New build and pack scripts [\#152](https://github.com/cmderdev/cmder/pull/152) ([bliker](https://github.com/bliker))
+- New build and pack scripts [\#152](https://github.com/cmderdev/cmder/pull/152) ([samvasko](https://github.com/samvasko))
 - Ability to change Font Size using Ctrl+MouseWheel [\#125](https://github.com/cmderdev/cmder/pull/125) ([saaguero](https://github.com/saaguero))

 **Fixed bugs:**

+- Git process not ending. [\#1060](https://github.com/cmderdev/cmder/issues/1060)
+- Git: fatal: Unable to create '.git/index.lock': File exists. [\#1044](https://github.com/cmderdev/cmder/issues/1044)
 - Aliases with environment variables not working [\#684](https://github.com/cmderdev/cmder/issues/684)
 - msysgit is not injected into path. [\#493](https://github.com/cmderdev/cmder/issues/493)
 - cmder display error [\#491](https://github.com/cmderdev/cmder/issues/491)
@ -37,22 +40,135 @@

 **Closed issues:**

+- some kind of project profile [\#1175](https://github.com/cmderdev/cmder/issues/1175)
+- Does cmder support the notion of a plugin [\#1173](https://github.com/cmderdev/cmder/issues/1173)
+- Cygwin? [\#1155](https://github.com/cmderdev/cmder/issues/1155)
+- CMDER ERROR [\#1154](https://github.com/cmderdev/cmder/issues/1154)
+- Remapping hot keys [\#1150](https://github.com/cmderdev/cmder/issues/1150)
+- What is mintty in here? [\#1149](https://github.com/cmderdev/cmder/issues/1149)
+- No make [\#1146](https://github.com/cmderdev/cmder/issues/1146)
+- How can I set the path of cmder properly at the start ?  [\#1136](https://github.com/cmderdev/cmder/issues/1136)
+- Powershell Slow Startup [\#1130](https://github.com/cmderdev/cmder/issues/1130)
+- python for cmder [\#1129](https://github.com/cmderdev/cmder/issues/1129)
+- Haskell repl \(ghci\) crashes only in cmder works elsewhere [\#1125](https://github.com/cmderdev/cmder/issues/1125)
+- Latest update causes `error: failed to push some refs to git@gitlab....` [\#1124](https://github.com/cmderdev/cmder/issues/1124)
+- Connection to SSH agent refused [\#1123](https://github.com/cmderdev/cmder/issues/1123)
+- Slow on startup [\#1122](https://github.com/cmderdev/cmder/issues/1122)
+- Shell script fail [\#1121](https://github.com/cmderdev/cmder/issues/1121)
+- Ctrl+` shorcut does not work in version 161002 [\#1113](https://github.com/cmderdev/cmder/issues/1113)
+- Git LFS not working with newer cmder versions [\#1112](https://github.com/cmderdev/cmder/issues/1112)
+- Processes dying due to lack of memory? [\#1106](https://github.com/cmderdev/cmder/issues/1106)
+- Broken links [\#1103](https://github.com/cmderdev/cmder/issues/1103)
+- "\config\profile.d\Active"' is not recognized as an internal or external command, operable program or batch file. [\#1102](https://github.com/cmderdev/cmder/issues/1102)
+- Can't run 'git commit' [\#1098](https://github.com/cmderdev/cmder/issues/1098)
+- Unable to use keybase K:\ [\#1096](https://github.com/cmderdev/cmder/issues/1096)
+- Can not Run mintty in v1.3.1 [\#1094](https://github.com/cmderdev/cmder/issues/1094)
+- Shortcut for new tab ?? [\#1093](https://github.com/cmderdev/cmder/issues/1093)
+- Bad symbols [\#1092](https://github.com/cmderdev/cmder/issues/1092)
+- cmder turns slow when using GIT command after update to the latest version [\#1091](https://github.com/cmderdev/cmder/issues/1091)
+- $ENV:CMDER\_START has a double quote too much [\#1079](https://github.com/cmderdev/cmder/issues/1079)
+- Incorrect checksum ? [\#1075](https://github.com/cmderdev/cmder/issues/1075)
+- Unplugging the battery detaches the Quake console [\#1074](https://github.com/cmderdev/cmder/issues/1074)
+- Mouse right click copy and paste at same time. [\#1072](https://github.com/cmderdev/cmder/issues/1072)
+- strange display on Chinese windows 8 [\#1071](https://github.com/cmderdev/cmder/issues/1071)
+- Permanently add all SSH keys to ssh-agent [\#1062](https://github.com/cmderdev/cmder/issues/1062)
+- Wrong dir privilege in bash on Windows ? [\#1059](https://github.com/cmderdev/cmder/issues/1059)
+- Invalid [\#1058](https://github.com/cmderdev/cmder/issues/1058)
+- Python virtualenv not activating in Windows 10 Cmder [\#1057](https://github.com/cmderdev/cmder/issues/1057)
+- prompt is Garbled [\#1054](https://github.com/cmderdev/cmder/issues/1054)
+- startup is so slow [\#1053](https://github.com/cmderdev/cmder/issues/1053)
+- ~ doesn't work in cmder? [\#1051](https://github.com/cmderdev/cmder/issues/1051)
+- \[Solved myself\] .bash\_history and winscp.rnd are not in Cmder's directories [\#1050](https://github.com/cmderdev/cmder/issues/1050)
+- First run config fails with exclamation in path [\#1049](https://github.com/cmderdev/cmder/issues/1049)
+- Can't run npm or any Node Module on Cmder \(Windows 7\) [\#1047](https://github.com/cmderdev/cmder/issues/1047)
+- Cannot start cmder [\#1046](https://github.com/cmderdev/cmder/issues/1046)
+- About letter overlapping [\#1045](https://github.com/cmderdev/cmder/issues/1045)
+- %cmder\_root%\config\user-aliases.ps1 is not created  on a fresh install of v1.3.0 [\#1040](https://github.com/cmderdev/cmder/issues/1040)
+- Cmder looking for user-aliases in wrong path [\#1039](https://github.com/cmderdev/cmder/issues/1039)
+- multiple hg.exe processes spawned [\#1035](https://github.com/cmderdev/cmder/issues/1035)
+- cls command spacing as well as spacing for input not wrapping to next line, global env vars not highlighted [\#1032](https://github.com/cmderdev/cmder/issues/1032)
+- Cmder getting raped by dr.web quarantine system [\#1031](https://github.com/cmderdev/cmder/issues/1031)
+- cmder no longer using path variables [\#1029](https://github.com/cmderdev/cmder/issues/1029)
+- Can I switch vim in cmder to gvim installed by myself? [\#1021](https://github.com/cmderdev/cmder/issues/1021)
+- \[Windows10 Bash\] Could use UP/Down/Home/End....key in cmder [\#1017](https://github.com/cmderdev/cmder/issues/1017)
+- {lamb} problem again... :-\( [\#1012](https://github.com/cmderdev/cmder/issues/1012)
+- High-lighting text and copying is broken [\#1008](https://github.com/cmderdev/cmder/issues/1008)
+- issue with updating ConEmuPack.160619.7z [\#1006](https://github.com/cmderdev/cmder/issues/1006)
+- using touch in cli doesn't work anymore with latest update [\#1002](https://github.com/cmderdev/cmder/issues/1002)
+- When resizing cmder window an extra path line appears.   [\#1000](https://github.com/cmderdev/cmder/issues/1000)
+- v1.3.0-pre doesn't support running inside program files folder [\#998](https://github.com/cmderdev/cmder/issues/998)
+- Text cursor disappears when window resized [\#997](https://github.com/cmderdev/cmder/issues/997)
+- how to use clip command in the cmder?  [\#996](https://github.com/cmderdev/cmder/issues/996)
+- {git}{hg} appearing in path print out rather than the values they represent [\#995](https://github.com/cmderdev/cmder/issues/995)
+- Don't just prepend the git path. [\#994](https://github.com/cmderdev/cmder/issues/994)
+- `ls` et al slow after updating cmder [\#993](https://github.com/cmderdev/cmder/issues/993)
+- Attempt to concatenate local 'package\_version' \(a nil value\) [\#991](https://github.com/cmderdev/cmder/issues/991)
+- After auto-update git/hg indication and lambda in prompt are broken [\#990](https://github.com/cmderdev/cmder/issues/990)
+- Lack of Proxy Setting [\#989](https://github.com/cmderdev/cmder/issues/989)
+- Clink completion failing [\#987](https://github.com/cmderdev/cmder/issues/987)
+- \ [\#986](https://github.com/cmderdev/cmder/issues/986)
+- default configuration does not support Chinese named file listing with ls [\#985](https://github.com/cmderdev/cmder/issues/985)
+- When cmder opened in visual studio code, there is wrong path [\#981](https://github.com/cmderdev/cmder/issues/981)
+- Is It Possible to recover the files removed by `rm -rf`  [\#979](https://github.com/cmderdev/cmder/issues/979)
+- . [\#973](https://github.com/cmderdev/cmder/issues/973)
+- right click context menu open cmd without color [\#972](https://github.com/cmderdev/cmder/issues/972)
+- git branch name is not red when there are pending changes [\#967](https://github.com/cmderdev/cmder/issues/967)
+- git checkout autocomplete is showing files [\#966](https://github.com/cmderdev/cmder/issues/966)
+- Cmder proxy Ubuntu Bash on Windows [\#964](https://github.com/cmderdev/cmder/issues/964)
+- Update version on Chocolatey [\#959](https://github.com/cmderdev/cmder/issues/959)
+- ConEmu Injecting hooks fail [\#958](https://github.com/cmderdev/cmder/issues/958)
+- chocolatey.lua:1: module 'tables' not found [\#957](https://github.com/cmderdev/cmder/issues/957)
+- cmder \(from cmder\_mini.zip\) crashes on startup on windows 7 pro x64 [\#955](https://github.com/cmderdev/cmder/issues/955)
+- Feature: add some extra prompt-tuning hooks to profile.ps1 from user-profile.ps1 [\#950](https://github.com/cmderdev/cmder/issues/950)
+- Provide alternate icon colors [\#947](https://github.com/cmderdev/cmder/issues/947)
+- "\cmder\config\settings was unexpected at this time" and {lamb} is shown instead of lambda symbol [\#937](https://github.com/cmderdev/cmder/issues/937)
+- Cannot save settings [\#936](https://github.com/cmderdev/cmder/issues/936)
+- init.bat fails and shows {lamb} and {git} [\#935](https://github.com/cmderdev/cmder/issues/935)
+- Cmder minimizing when losing focus. [\#934](https://github.com/cmderdev/cmder/issues/934)
+- init.bat always uses "npm" as window title [\#933](https://github.com/cmderdev/cmder/issues/933)
+- `ls` return vertical list instead of horizontal? [\#924](https://github.com/cmderdev/cmder/issues/924)
+- Arrow keys in Windows 10 Linux Subsystem [\#919](https://github.com/cmderdev/cmder/issues/919)
+- Arrow keys do not work with bash \(Win10/Linux Subsystem\) [\#914](https://github.com/cmderdev/cmder/issues/914)
+- Aliased commands: Syntax Highlighting Lost [\#912](https://github.com/cmderdev/cmder/issues/912)
+- 'vim' hangs when loading in cmder bash session [\#910](https://github.com/cmderdev/cmder/issues/910)
+- Unix commands not working in windows 10 [\#908](https://github.com/cmderdev/cmder/issues/908)
+- git 2.8 ? [\#905](https://github.com/cmderdev/cmder/issues/905)
+- Confusing "Settings" \> "Integration" dialog behavior [\#904](https://github.com/cmderdev/cmder/issues/904)
+- v1.3.0 antivirus [\#903](https://github.com/cmderdev/cmder/issues/903)
+- Feature Request: Send to all/group [\#896](https://github.com/cmderdev/cmder/issues/896)
+- Updating git-for-windows after installing the full cmder? [\#887](https://github.com/cmderdev/cmder/issues/887)
 - Tab autocompetion for git is inconsistent \(doesn't work with git add\) [\#885](https://github.com/cmderdev/cmder/issues/885)
 - Line-wrapping breaks when using backspace key in a git repo with Cmder mini and Git for Windows. [\#883](https://github.com/cmderdev/cmder/issues/883)
 - Cmder opens off screen  [\#881](https://github.com/cmderdev/cmder/issues/881)
 - ctrl+l with powershell in quake mode clears the first prompt line as well [\#879](https://github.com/cmderdev/cmder/issues/879)
+- Enconding ? [\#877](https://github.com/cmderdev/cmder/issues/877)
+- the {cmd} task [\#876](https://github.com/cmderdev/cmder/issues/876)
+- Failed to start cmder, app crashed [\#871](https://github.com/cmderdev/cmder/issues/871)
 - Cmder Windows Pinning Issue \[weird\] [\#869](https://github.com/cmderdev/cmder/issues/869)
 - Why not use @ECHO OFF? [\#868](https://github.com/cmderdev/cmder/issues/868)
 - alias with && doesn't work [\#859](https://github.com/cmderdev/cmder/issues/859)
+- Having trouble with packaged conemu install, how can I point to a different one? [\#858](https://github.com/cmderdev/cmder/issues/858)
+- path entry for \<git\>/cmd instead of \<git\>/bin?  [\#853](https://github.com/cmderdev/cmder/issues/853)
+- Cmder lists path on window resize. [\#851](https://github.com/cmderdev/cmder/issues/851)
 - Alias with multi-word git commit message not working [\#847](https://github.com/cmderdev/cmder/issues/847)
+- cmder and vim compatibility problem [\#846](https://github.com/cmderdev/cmder/issues/846)
+- Unable to git pull,push or any action [\#845](https://github.com/cmderdev/cmder/issues/845)
 - switch to use master a the default development branch [\#836](https://github.com/cmderdev/cmder/issues/836)
+- Missing git support, install posth-git [\#834](https://github.com/cmderdev/cmder/issues/834)
 - Git branch information is broken for submodules [\#833](https://github.com/cmderdev/cmder/issues/833)
+- "-ExecutionPolicy' is not recognized as an internal or external command" [\#830](https://github.com/cmderdev/cmder/issues/830)
+- How to upgrade from v1.1.4.1 to v1.2 ? [\#825](https://github.com/cmderdev/cmder/issues/825)
+- Startup warning [\#821](https://github.com/cmderdev/cmder/issues/821)
+- Cmder prompt screwed up with latest Windows 10 Build [\#820](https://github.com/cmderdev/cmder/issues/820)
 - Cmder does not open in last open window position [\#816](https://github.com/cmderdev/cmder/issues/816)
 - CMDer won't open Sublime [\#814](https://github.com/cmderdev/cmder/issues/814)
 - integrating Git for Windows vs. Git for Windows SDK? [\#813](https://github.com/cmderdev/cmder/issues/813)
+- Installer for cmder? [\#812](https://github.com/cmderdev/cmder/issues/812)
 - When will the next version be available? [\#811](https://github.com/cmderdev/cmder/issues/811)
+- Netcat is missing [\#810](https://github.com/cmderdev/cmder/issues/810)
 - how to use /? to get the help doc in the `cmder` [\#808](https://github.com/cmderdev/cmder/issues/808)
 - \[Enhancement\] Powershell and Babun \(cygwin + zsh\) [\#807](https://github.com/cmderdev/cmder/issues/807)
+- Cmder - Warning: Missing git support  [\#806](https://github.com/cmderdev/cmder/issues/806)
 - iul [\#800](https://github.com/cmderdev/cmder/issues/800)
 - Update clink settings [\#793](https://github.com/cmderdev/cmder/issues/793)
 - how to add the environment variable to the cmder? [\#792](https://github.com/cmderdev/cmder/issues/792)
@ -62,17 +178,24 @@
 - How to remove "Cmder Here" in the context menu after .\cmder.exe /REGISTER ALL? [\#787](https://github.com/cmderdev/cmder/issues/787)
 - \[v1.2.9\] Can not alias with env. variables. [\#784](https://github.com/cmderdev/cmder/issues/784)
 - How should i add a context menu entry? [\#780](https://github.com/cmderdev/cmder/issues/780)
+- Branch name not visible and vagrant commands not working [\#778](https://github.com/cmderdev/cmder/issues/778)
+- Run command to start [\#775](https://github.com/cmderdev/cmder/issues/775)
 - CMDER\_START should always be set to USERPROFILE unless explicitly set through /START parameter [\#772](https://github.com/cmderdev/cmder/issues/772)
 - Startup Error: cmder\vendor\profile.ps1 cannot be loaded. [\#769](https://github.com/cmderdev/cmder/issues/769)
 - How to make Cmder stop displaying warning? [\#768](https://github.com/cmderdev/cmder/issues/768)
+- Security Warning - cmder\vendor\profile.ps1 [\#767](https://github.com/cmderdev/cmder/issues/767)
 - Unable to install cmder using Install-Package in Windows 10 [\#762](https://github.com/cmderdev/cmder/issues/762)
+- How do confirm exe's are safe? md5? checksum? [\#761](https://github.com/cmderdev/cmder/issues/761)
 - Option to disable preview stacking with multiple tabs [\#758](https://github.com/cmderdev/cmder/issues/758)
+- 'ls' is no longer recognized command [\#757](https://github.com/cmderdev/cmder/issues/757)
 - I can't run de Cmder.exe [\#755](https://github.com/cmderdev/cmder/issues/755)
 - Multiple location references when maximizing [\#753](https://github.com/cmderdev/cmder/issues/753)
 - CLink completions for npm increase cmder startup time for one second [\#750](https://github.com/cmderdev/cmder/issues/750)
+- Prevent other apps from overwriting the prompt? [\#749](https://github.com/cmderdev/cmder/issues/749)
 - cmder.exe infected with Variant.Kazy.767238 [\#748](https://github.com/cmderdev/cmder/issues/748)
 - cmder.exe considered harmful by Bitdefender [\#744](https://github.com/cmderdev/cmder/issues/744)
 - curl ntlm auth stopped working [\#741](https://github.com/cmderdev/cmder/issues/741)
+- Sublime Integration fails - Can't find "C:\Programs"? [\#727](https://github.com/cmderdev/cmder/issues/727)
 - Cmder and gulp, not friend? [\#725](https://github.com/cmderdev/cmder/issues/725)
 - Antivirus deleting some files in cmder \(reporting them as infected\) [\#724](https://github.com/cmderdev/cmder/issues/724)
 - Windows Defender on Windows 10 finds Trojan in extracted files [\#713](https://github.com/cmderdev/cmder/issues/713)
@ -86,6 +209,7 @@
 - Tab-Complete paths not working \[1.2.9\] [\#691](https://github.com/cmderdev/cmder/issues/691)
 - The directory be duplicate displayed [\#689](https://github.com/cmderdev/cmder/issues/689)
 - Don't work at my windows 7 \(misiing api-ms-win-crt-runtime-l1-1-0.dll\) [\#682](https://github.com/cmderdev/cmder/issues/682)
+- Use tab to cycle through auto complete, like the original cmd does? [\#681](https://github.com/cmderdev/cmder/issues/681)
 - git: 'pull' is not a git command. See 'git --help'. [\#679](https://github.com/cmderdev/cmder/issues/679)
 - Error in NPM-Prompt [\#678](https://github.com/cmderdev/cmder/issues/678)
 - msysgit commands not working [\#675](https://github.com/cmderdev/cmder/issues/675)
@ -102,6 +226,7 @@
 - Is there any hotkey jump to "Search" box? [\#647](https://github.com/cmderdev/cmder/issues/647)
 - File /vendor/conemu-maximus5/ConEmu.exe not found. [\#646](https://github.com/cmderdev/cmder/issues/646)
 - As admin CMDER\_ROOT not set in Powershell  [\#643](https://github.com/cmderdev/cmder/issues/643)
+- Emoji support [\#642](https://github.com/cmderdev/cmder/issues/642)
 - Having ls, cat, etc [\#641](https://github.com/cmderdev/cmder/issues/641)
 - Cmder having Permission Errors for Windows 10 [\#640](https://github.com/cmderdev/cmder/issues/640)
 - Powershell - Msys Aliases [\#639](https://github.com/cmderdev/cmder/issues/639)
@ -109,10 +234,10 @@
 - Invoke-Expression : The term 'Invoke-Expression' is not recognized [\#636](https://github.com/cmderdev/cmder/issues/636)
 - it doesn't like Docker [\#631](https://github.com/cmderdev/cmder/issues/631)
 - Latest release : Windows 7 : Windows cannot find ".../vendor/conemu-maximus5/CpmE,u.exe" [\#629](https://github.com/cmderdev/cmder/issues/629)
+- Strange Vim behaviour after Git for Windows upgrade [\#628](https://github.com/cmderdev/cmder/issues/628)
 -  msysGit has been superseded ,consider to switch to Git for Windows 2.x? [\#627](https://github.com/cmderdev/cmder/issues/627)
 - tail command not found [\#625](https://github.com/cmderdev/cmder/issues/625)
 - Cmder console remain unused text on screen [\#623](https://github.com/cmderdev/cmder/issues/623)
- how i can change the mysysgit folder [\#620](https://github.com/cmderdev/cmder/issues/620)
 - er con emu [\#617](https://github.com/cmderdev/cmder/issues/617)
 - first google hit for cmder shows 404 [\#616](https://github.com/cmderdev/cmder/issues/616)
 - \[ Solved \] How to I change to width of Split screen divider \( border \) line.  [\#613](https://github.com/cmderdev/cmder/issues/613)
@ -130,17 +255,20 @@
 - PowerShell Profile Aliases ignored in Cmder [\#593](https://github.com/cmderdev/cmder/issues/593)
 - "Inject ConEmuHk" settings slows git down considerably [\#592](https://github.com/cmderdev/cmder/issues/592)
 - Suggestion about transparency [\#591](https://github.com/cmderdev/cmder/issues/591)
+- Powerline integration with cmder [\#590](https://github.com/cmderdev/cmder/issues/590)
 - Wrong place [\#589](https://github.com/cmderdev/cmder/issues/589)
 - Misleading install instructions? [\#588](https://github.com/cmderdev/cmder/issues/588)
 - ENHANCE: Only add git to path if not exist [\#586](https://github.com/cmderdev/cmder/issues/586)
 - new console confirmation - with Ctrl-T [\#583](https://github.com/cmderdev/cmder/issues/583)
 - start-ssh-agent not found [\#580](https://github.com/cmderdev/cmder/issues/580)
 - Missing DLL [\#579](https://github.com/cmderdev/cmder/issues/579)
+- Invoking ConEmu instead of ConEmu64 on Windows 10 64-bit [\#574](https://github.com/cmderdev/cmder/issues/574)
 - windows 10 incompatibility [\#572](https://github.com/cmderdev/cmder/issues/572)
 - FIX: Incorrect startup directory. [\#571](https://github.com/cmderdev/cmder/issues/571)
 - WARNING: Enable-GitColors is Obsolete and will be removed in a future version of posh-git. [\#568](https://github.com/cmderdev/cmder/issues/568)
 - Path issue on startup - Invalid download path [\#567](https://github.com/cmderdev/cmder/issues/567)
 - The term 'vim' is not recognized [\#566](https://github.com/cmderdev/cmder/issues/566)
+- Using .bashrc [\#565](https://github.com/cmderdev/cmder/issues/565)
 - Persist tab "View \(palette\)" selection [\#562](https://github.com/cmderdev/cmder/issues/562)
 - git add --interactive fails [\#560](https://github.com/cmderdev/cmder/issues/560)
 - Tab names as directory names [\#559](https://github.com/cmderdev/cmder/issues/559)
@ -157,14 +285,19 @@
 - can we use Vundle to manage Cmder's vim plugins? Need some setup? [\#535](https://github.com/cmderdev/cmder/issues/535)
 - Error on Windows 7 [\#534](https://github.com/cmderdev/cmder/issues/534)
 - api-ms-win-crt-runtime l1-109.dll is missing [\#531](https://github.com/cmderdev/cmder/issues/531)
+- Git checks for 'commits' every time a folder is changed? [\#529](https://github.com/cmderdev/cmder/issues/529)
+- Powershell tab title issue [\#528](https://github.com/cmderdev/cmder/issues/528)
 - conhost.exe keeps on crashing. [\#527](https://github.com/cmderdev/cmder/issues/527)
+- storage in userprofile \(instead of fixed config dir relative to the executable\) [\#526](https://github.com/cmderdev/cmder/issues/526)
 - Cmder crashes when AVG falsely flags it as a virus. [\#522](https://github.com/cmderdev/cmder/issues/522)
 - Incomplete git installation packaged with cmder v1.2  [\#521](https://github.com/cmderdev/cmder/issues/521)
 - api-ms-win-crt-runtime-l1-1-0.dll error [\#518](https://github.com/cmderdev/cmder/issues/518)
 - Can't set alias in 1.2 anymore  [\#515](https://github.com/cmderdev/cmder/issues/515)
 - git not properly setup in v1.2 [\#513](https://github.com/cmderdev/cmder/issues/513)
+- Character persistence on cmder windows [\#506](https://github.com/cmderdev/cmder/issues/506)
 - Git: fatal: Unable to find remote helper for 'https' [\#503](https://github.com/cmderdev/cmder/issues/503)
 - api-ms-win-crt-runtime-l1-1-0.dll error [\#501](https://github.com/cmderdev/cmder/issues/501)
+- ncurses borders incorrectly displayed with ssh.exe [\#499](https://github.com/cmderdev/cmder/issues/499)
 - gitk not found due to changed PATH for msysgit  [\#498](https://github.com/cmderdev/cmder/issues/498)
 - {hg} on every folder [\#494](https://github.com/cmderdev/cmder/issues/494)
 - Missing dll, APPCRT140.dll [\#485](https://github.com/cmderdev/cmder/issues/485)
@ -195,6 +328,8 @@
 - Vim help not working in cmder [\#415](https://github.com/cmderdev/cmder/issues/415)
 - How to update bash [\#399](https://github.com/cmderdev/cmder/issues/399)
 - could you put the version number into the download file [\#396](https://github.com/cmderdev/cmder/issues/396)
+- git-p4.py \[Errno 2\] No such file or directory [\#392](https://github.com/cmderdev/cmder/issues/392)
+- ConEmu auto attach with Cmder aliases [\#388](https://github.com/cmderdev/cmder/issues/388)
 - Cmder unable to find .ssh folder [\#387](https://github.com/cmderdev/cmder/issues/387)
 - extra character appears at the beginning,when used the arrow keys\(up,down\) navigate through the history  [\#384](https://github.com/cmderdev/cmder/issues/384)
 - create alias with multi word parameter [\#376](https://github.com/cmderdev/cmder/issues/376)
@ -203,6 +338,7 @@
 - Is Cmder known to cause a false positive alert from some virus checking software? [\#371](https://github.com/cmderdev/cmder/issues/371)
 - How to disable the crosshair [\#369](https://github.com/cmderdev/cmder/issues/369)
 - Text reflow and line selection [\#359](https://github.com/cmderdev/cmder/issues/359)
+- Using the context menu doesn't open a new tab in Single Instance Mode [\#356](https://github.com/cmderdev/cmder/issues/356)
 - Git client side vulnerability  [\#354](https://github.com/cmderdev/cmder/issues/354)
 - Ctrl+Shift+Arrow does not work as expected [\#345](https://github.com/cmderdev/cmder/issues/345)
 - i can not read windows path in cmder [\#342](https://github.com/cmderdev/cmder/issues/342)
@ -218,19 +354,24 @@
 - Use system-wide Git [\#315](https://github.com/cmderdev/cmder/issues/315)
 - Version update information is broken \(not found\) [\#310](https://github.com/cmderdev/cmder/issues/310)
 - feature request vim-airline [\#306](https://github.com/cmderdev/cmder/issues/306)
+- Integrate PSReadLine [\#301](https://github.com/cmderdev/cmder/issues/301)
 - Full Screen [\#295](https://github.com/cmderdev/cmder/issues/295)
 - Configure Powershell to match CMD [\#294](https://github.com/cmderdev/cmder/issues/294)
 - Tab Close on CTRL-W [\#293](https://github.com/cmderdev/cmder/issues/293)
 - v1.1.4.1 /REGISTER ALL has broken icon [\#292](https://github.com/cmderdev/cmder/issues/292)
 - CD in root not working.. [\#289](https://github.com/cmderdev/cmder/issues/289)
 - How to enable 256 color? [\#288](https://github.com/cmderdev/cmder/issues/288)
+- Support comments in /config/aliases [\#286](https://github.com/cmderdev/cmder/issues/286)
 - Executing linux executables ./ doesn't work :S [\#285](https://github.com/cmderdev/cmder/issues/285)
+- Moved Documents folder, running "ls" gives "ls: My Documents: No such file or directory" [\#284](https://github.com/cmderdev/cmder/issues/284)
 - er [\#283](https://github.com/cmderdev/cmder/issues/283)
 - \[1.1.4.1\] Auto Completion not working [\#280](https://github.com/cmderdev/cmder/issues/280)
 - Git and lamb macro/symbols not expanded in Windows 10 preview [\#279](https://github.com/cmderdev/cmder/issues/279)
 - cmder vs cmd using non-blocking STDIN [\#269](https://github.com/cmderdev/cmder/issues/269)
 - Possible to blur translucent console? [\#267](https://github.com/cmderdev/cmder/issues/267)
 - Duplicate Root Fires Twice? [\#266](https://github.com/cmderdev/cmder/issues/266)
+- bug when using up and down key [\#264](https://github.com/cmderdev/cmder/issues/264)
+- ps scripts: support space in foldernames [\#261](https://github.com/cmderdev/cmder/issues/261)
 - utils [\#260](https://github.com/cmderdev/cmder/issues/260)
 - Character mix [\#259](https://github.com/cmderdev/cmder/issues/259)
 - strange issue no trace in google  [\#257](https://github.com/cmderdev/cmder/issues/257)
@ -240,47 +381,64 @@
 - "MSVCP120.dll is missing from your computer." [\#246](https://github.com/cmderdev/cmder/issues/246)
 - Cmder.exe not opening on Windows 7 SP 1 [\#240](https://github.com/cmderdev/cmder/issues/240)
 - Resize Tab Bar [\#236](https://github.com/cmderdev/cmder/issues/236)
+- Accented characters [\#234](https://github.com/cmderdev/cmder/issues/234)
 - Clicking in the window causes cmder to lock up [\#232](https://github.com/cmderdev/cmder/issues/232)
 - Add cmder to Windows context menu [\#231](https://github.com/cmderdev/cmder/issues/231)
 - libiconv-2.dll is missing [\#228](https://github.com/cmderdev/cmder/issues/228)
+- color scheme lost after CTRL+C on git status [\#227](https://github.com/cmderdev/cmder/issues/227)
 - Can't create process, ErrCode=0x000000C1, Description: %1 is not a valid Win32 application. [\#226](https://github.com/cmderdev/cmder/issues/226)
 - Cant get powerline fonts to work \(need utf-8?\) [\#225](https://github.com/cmderdev/cmder/issues/225)
 - Can't use aliases + && [\#224](https://github.com/cmderdev/cmder/issues/224)
 - {git}, {lamb} and strange new console options [\#223](https://github.com/cmderdev/cmder/issues/223)
+- CJK problem [\#222](https://github.com/cmderdev/cmder/issues/222)
 - Wire up 'title' to "rename tab" [\#221](https://github.com/cmderdev/cmder/issues/221)
 - system PATH overriding path set in init.bat [\#219](https://github.com/cmderdev/cmder/issues/219)
 - command autocompletion not working [\#218](https://github.com/cmderdev/cmder/issues/218)
+- Launcher opens new window separately [\#217](https://github.com/cmderdev/cmder/issues/217)
+- Theme not applied on Run command prompt here [\#216](https://github.com/cmderdev/cmder/issues/216)
 - Closes tab on Ctrl-C action [\#215](https://github.com/cmderdev/cmder/issues/215)
+- "Your alias cannot contain a space" [\#214](https://github.com/cmderdev/cmder/issues/214)
 - Problems with vim colors [\#213](https://github.com/cmderdev/cmder/issues/213)
 - lambda bug when i install clink [\#212](https://github.com/cmderdev/cmder/issues/212)
 - Did doskey break in the newest dev update? [\#207](https://github.com/cmderdev/cmder/issues/207)
 - Bug within the version of msysgit 1.8.5.2 [\#206](https://github.com/cmderdev/cmder/issues/206)
+- Blank line [\#205](https://github.com/cmderdev/cmder/issues/205)
+- F7 support for command history? [\#204](https://github.com/cmderdev/cmder/issues/204)
 - SSH Keys and push passphrase [\#202](https://github.com/cmderdev/cmder/issues/202)
 - git diff highlight colors on ssh [\#201](https://github.com/cmderdev/cmder/issues/201)
 - Cursor becomes fat, and i can't do anything [\#200](https://github.com/cmderdev/cmder/issues/200)
+- Open cmder as Tab from the file explorer [\#197](https://github.com/cmderdev/cmder/issues/197)
 - include zsh and tmux from cygwin [\#194](https://github.com/cmderdev/cmder/issues/194)
 - How to enable ssh-agent? [\#193](https://github.com/cmderdev/cmder/issues/193)
+- Git Not working [\#192](https://github.com/cmderdev/cmder/issues/192)
 - Open cmder in 64-bit on 64-bit windows [\#191](https://github.com/cmderdev/cmder/issues/191)
+- Output is very slow [\#188](https://github.com/cmderdev/cmder/issues/188)
 - Running cmder from the file explorer [\#187](https://github.com/cmderdev/cmder/issues/187)
+- Add hotkey to switch tabs [\#186](https://github.com/cmderdev/cmder/issues/186)
 - how to config installed msysgit  [\#183](https://github.com/cmderdev/cmder/issues/183)
 - Windows 8.1 High-DPI Scaling [\#182](https://github.com/cmderdev/cmder/issues/182)
 - how to disabled command line error beep? [\#179](https://github.com/cmderdev/cmder/issues/179)
+- Child shells yields broken prompt [\#178](https://github.com/cmderdev/cmder/issues/178)
 - Crash at start on Windows 8.1 [\#176](https://github.com/cmderdev/cmder/issues/176)
 - Crashes with mintty.exe [\#175](https://github.com/cmderdev/cmder/issues/175)
 - Chinese characters looked terribly awful when monospace is checked [\#171](https://github.com/cmderdev/cmder/issues/171)
 - Copy and paste w/ mouse buttons [\#170](https://github.com/cmderdev/cmder/issues/170)
+- generation of Pipe symbol not possible [\#168](https://github.com/cmderdev/cmder/issues/168)
 - Lambda prompt bug [\#164](https://github.com/cmderdev/cmder/issues/164)
 - Can't select and copy text [\#163](https://github.com/cmderdev/cmder/issues/163)
 - not running in windows XP SP3 [\#161](https://github.com/cmderdev/cmder/issues/161)
 - german characters not displaying [\#160](https://github.com/cmderdev/cmder/issues/160)
+- Moving files with ../ [\#158](https://github.com/cmderdev/cmder/issues/158)
 - Transparent image. A Detail but I would like to get it to work [\#156](https://github.com/cmderdev/cmder/issues/156)
 - Taskbar icon after pinning the program reverts to default ConEmu icon. Systray icon is always ConEmu's. [\#154](https://github.com/cmderdev/cmder/issues/154)
 - A neat way to add sublime text seamlessly. [\#153](https://github.com/cmderdev/cmder/issues/153)
 - how to update cygwin shipped together within cmder [\#151](https://github.com/cmderdev/cmder/issues/151)
+- attach to GUI was requested, but there is no console processes! [\#150](https://github.com/cmderdev/cmder/issues/150)
 - The system cannot find the path specified. [\#148](https://github.com/cmderdev/cmder/issues/148)
 - Changes to PATH do not persist [\#146](https://github.com/cmderdev/cmder/issues/146)
 - git clone templates not found / Unable to find remote helper for 'https' [\#144](https://github.com/cmderdev/cmder/issues/144)
 - handle could not be opened / terminal is not fully functional [\#143](https://github.com/cmderdev/cmder/issues/143)
+- Create windows installer [\#142](https://github.com/cmderdev/cmder/issues/142)
 - Auto-create fast new tab shortcuts for additional tasks [\#140](https://github.com/cmderdev/cmder/issues/140)
 - ssh-agent, ssh-add, ssh all crash as soon as I open a PowerShell window [\#139](https://github.com/cmderdev/cmder/issues/139)
 - Problems using cmder as an SSH client [\#137](https://github.com/cmderdev/cmder/issues/137)
@ -359,12 +517,45 @@

 **Merged pull requests:**

+- Development [\#1169](https://github.com/cmderdev/cmder/pull/1169) ([Stanzilla](https://github.com/Stanzilla))
+- Fix typo in init.bat [\#1157](https://github.com/cmderdev/cmder/pull/1157) ([winks](https://github.com/winks))
+- Bump clink-completions to 0.3.2 [\#1153](https://github.com/cmderdev/cmder/pull/1153) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Fixed 3 typos [\#1143](https://github.com/cmderdev/cmder/pull/1143) ([panzer-planet](https://github.com/panzer-planet))
+- Fix for slow startup under certain conditions \(\#1122\) [\#1131](https://github.com/cmderdev/cmder/pull/1131) ([lamarqua](https://github.com/lamarqua))
+- Development [\#1127](https://github.com/cmderdev/cmder/pull/1127) ([Stanzilla](https://github.com/Stanzilla))
+- fix error when path has a space [\#1126](https://github.com/cmderdev/cmder/pull/1126) ([gucong3000](https://github.com/gucong3000))
+- Added closing process in get\_git\_status [\#1101](https://github.com/cmderdev/cmder/pull/1101) ([alexandr-san4ez](https://github.com/alexandr-san4ez))
+- Update Readme.md [\#1082](https://github.com/cmderdev/cmder/pull/1082) ([nverno](https://github.com/nverno))
+- Fix bash login when $CMDER\_ROOT has spaces [\#1078](https://github.com/cmderdev/cmder/pull/1078) ([orionlee](https://github.com/orionlee))
+- Parse the original prompt for cwd and env names [\#1070](https://github.com/cmderdev/cmder/pull/1070) ([janschulz](https://github.com/janschulz))
+- Added kill ssh-agent to build.ps1 [\#1042](https://github.com/cmderdev/cmder/pull/1042) ([daxgames](https://github.com/daxgames))
+- Development [\#1037](https://github.com/cmderdev/cmder/pull/1037) ([Stanzilla](https://github.com/Stanzilla))
+- Minor update in README.md [\#1016](https://github.com/cmderdev/cmder/pull/1016) ([Mansuro](https://github.com/Mansuro))
+- Added rainbow icons [\#1014](https://github.com/cmderdev/cmder/pull/1014) ([JoshuaKGoldberg](https://github.com/JoshuaKGoldberg))
+- Fix git branch colouring [\#1011](https://github.com/cmderdev/cmder/pull/1011) ([MoFo88](https://github.com/MoFo88))
+- Bump clink-completions to 0.3.1 [\#992](https://github.com/cmderdev/cmder/pull/992) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Fix git branch name never shown as dirty [\#974](https://github.com/cmderdev/cmder/pull/974) ([janschulz](https://github.com/janschulz))
+- Disable history switching behavior of ctrl+tab. Sequential switching. [\#963](https://github.com/cmderdev/cmder/pull/963) ([Jackbennett](https://github.com/Jackbennett))
+- Register cmder in the context menu from powershell [\#962](https://github.com/cmderdev/cmder/pull/962) ([Jackbennett](https://github.com/Jackbennett))
+- cmd: change the prompt in lua [\#961](https://github.com/cmderdev/cmder/pull/961) ([janschulz](https://github.com/janschulz))
+- Custom prompt hooks protected from later overwriting [\#952](https://github.com/cmderdev/cmder/pull/952) ([Jackbennett](https://github.com/Jackbennett))
+- Update clink-completions to 0.3.0 [\#946](https://github.com/cmderdev/cmder/pull/946) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
+- Added :verbose-output subroutine, made aliases update more functional [\#945](https://github.com/cmderdev/cmder/pull/945) ([daxgames](https://github.com/daxgames))
+- fixed git not working in cmder cmd session and added some comments [\#943](https://github.com/cmderdev/cmder/pull/943) ([daxgames](https://github.com/daxgames))
+- More variable quoting in init.bat [\#941](https://github.com/cmderdev/cmder/pull/941) ([janschulz](https://github.com/janschulz))
+- Add quotes around all variables [\#940](https://github.com/cmderdev/cmder/pull/940) ([janschulz](https://github.com/janschulz))
+- Fix missing "\" when building dirpath to psmodules [\#916](https://github.com/cmderdev/cmder/pull/916) ([liftir](https://github.com/liftir))
+- upgraded git to 2.8.1 [\#911](https://github.com/cmderdev/cmder/pull/911) ([daxgames](https://github.com/daxgames))
+- Added proxy support [\#909](https://github.com/cmderdev/cmder/pull/909) ([daxgames](https://github.com/daxgames))
+- fixed - not running user-aliases.cmd if aliases variable is overridde… [\#892](https://github.com/cmderdev/cmder/pull/892) ([daxgames](https://github.com/daxgames))
 - Merge latest Development [\#890](https://github.com/cmderdev/cmder/pull/890) ([MartiUK](https://github.com/MartiUK))
 - Process profile.d scripts before adding user aliases [\#874](https://github.com/cmderdev/cmder/pull/874) ([daxgames](https://github.com/daxgames))
 - Prefer use of first line @echo off vs. @ per line to turn off echo pe… [\#873](https://github.com/cmderdev/cmder/pull/873) ([daxgames](https://github.com/daxgames))
 - silenced bash profile.d when profile.d is empty [\#872](https://github.com/cmderdev/cmder/pull/872) ([daxgames](https://github.com/daxgames))
 - Various fixes for profile.d support [\#867](https://github.com/cmderdev/cmder/pull/867) ([daxgames](https://github.com/daxgames))
 - Revert "Set CMDER\_START to homeprofile" [\#866](https://github.com/cmderdev/cmder/pull/866) ([janschulz](https://github.com/janschulz))
+- better git path handling [\#865](https://github.com/cmderdev/cmder/pull/865) ([janschulz](https://github.com/janschulz))
+- Enhanced alias.bat to allow file storage path [\#862](https://github.com/cmderdev/cmder/pull/862) ([daxgames](https://github.com/daxgames))
 - Fix cmd plugin.d [\#860](https://github.com/cmderdev/cmder/pull/860) ([daxgames](https://github.com/daxgames))
 - Added profile.d like support for all supported shells [\#855](https://github.com/cmderdev/cmder/pull/855) ([daxgames](https://github.com/daxgames))
 - Typo in Readme.md [\#852](https://github.com/cmderdev/cmder/pull/852) ([janschulz](https://github.com/janschulz))
--- a/Cmder.bat
+++ b/Cmder.bat
@ -1,7 +1,7 @@
@echo off
 SET CMDER_ROOT=%~dp0

-:: Remove trailing '\'
+:: Remove Trailing '\'
@if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1%

 if exist "%~1" (
--- a/21
+++ b/21
@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Samuel Vasko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Cmder

-[![Join the chat at https://gitter.im/cmderdev/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cmderdev/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva/branch/master?svg=true)](https://ci.appveyor.com/project/MartiUK/cmder)
+[![Join the chat at https://gitter.im/cmderdev/cmder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cmderdev/cmder?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://ci.appveyor.com/api/projects/status/github/cmderdev/cmder?branch=master&svg=true)](https://ci.appveyor.com/project/MartiUK/cmder)

 Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, comes with a Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) (further enhanced by [clink-completions](https://github.com/vladimir-kotikov/clink-completions)) and a custom prompt layout.

@ -14,7 +14,7 @@ The main advantage of Cmder is portability. It is designed to be totally self-co

 1. Download the [latest release](https://github.com/cmderdev/cmder/releases/)
 2. Extract the archive
-3. (optional) Place your own executable files into the `bin` folder to be injected into your PATH
+3. (optional) Place your own executable files into the `bin` folder to be injected into your PATH. (nb: This path should not be `C:\Program Files` or anywhere else that would require Administrator access for modifying configuration files)
 4. Run Cmder.exe

 ## Integration
@ -38,6 +38,9 @@ In a file explorer window right click in or on a directory to see "Cmder Here" i
 * <kbd>Ctrl</kbd> + <kbd>W</kbd> : Close tab
 * <kbd>Ctrl</kbd> + <kbd>D</kbd> : Close tab (if pressed on empty command)
 * <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>#Number</kbd> : Fast new tab: <kbd>1</kbd> - CMD, <kbd>2</kbd> - PowerShell
+* <kbd>Ctrl</kbd> + <kbd>Tab</kbd> : Switch to next tab
+* <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd> : Switch to previous tab
+* <kbd>Ctrl</kbd> + <kbd>#Number</kbd> : Switch to tab #Number
 * <kbd>Alt</kbd> + <kbd>Enter</kbd>: Fullscreen

 ### Shell
@ -59,7 +62,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 +94,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.
@ -109,16 +112,39 @@ You can define simple aliases for `cmd.exe` sessions with a command like `alias

 Cmd.exe aliases can also be more complex. See: [DOSKEY.EXE documentation](http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/doskey.mspx?mfr=true) for additional details on complex aliases/macros for 'cmd.exe'

-Aliases defined using the `alias.bat` command will automatically be saved in the `%CMDER_ROOT%\config\aliases` file
+Aliases defined using the `alias.bat` command will automatically be saved in the `%CMDER_ROOT%\config\user-aliases.cmd` file
+
+To make an alias and/or any other profile settings permanent add it to one of the following:
+
+Note: These are loaded in this order by '$CMDER_ROOT/vendor/init.bat'.  Anyhing stored in '%CMDER_ROOT%' will be a portable setting and will follow cmder to another machine.
+
+* '%CMDER_ROOT%\\config\\profile.d\\\*.cmd and \*.bat'
+* '%CMDER_ROOT%\\config\\user-aliases.cmd'
+* '%CMDER_ROOT%\\config\\user-profile.cmd'

 #### 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`.
+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.

-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.
+To make an alias and/or any other profile settings permanent add it to one of the following:
+
+Note: These are loaded in this order by '$CMDER_ROOT/vendor/git-for-windows/etc/profile.d/cmder.sh'.  Anyhing stored in '$CMDER_ROOT' will be a portable setting and will follow cmder to another machine.
+
+* '$CMDER_ROOT/config/profile.d/*.sh'
+* '$CMDER_ROOT/config/user-profile.sh'
+* '$HOME/.bashrc'
+
+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.

+To make an alias and/or any other profile settings permanent add it to one of the following:
+
+Note: These are loaded in this order by '$ENV:CMDER_ROOT\\vendor\\user-profile.ps1'.  Anyhing stored in '$ENV:CMDER_ROOT' will be a portable setting and will follow cmder to another machine.
+
+* '$ENV:CMDER_ROOT\\config\\profile.d\\\*.ps1'
+* '$ENV:CMDER_ROOT\\config\\user-profile.ps1'
+
 ### SSH Agent

 To start SSH agent simply call `start-ssh-agent`, which is in the `vendor/git-for-windows/cmd` folder.
@ -131,7 +157,7 @@ If you want to run SSH agent on startup, include the line `@call "%GIT_INSTALL_R
 1. Click the '+' button to add a task.
 1. Name the new task in the top text box.
 1. Provide task parameters, this is optional.
-1. Add ```cmd /c "[path_to_external_env]\bin\bash --login -i" -new_console:d:%USERPROFILE%``` to the `Commands` text box.
+1. Add ```cmd /c "[path_to_external_env]\bin\bash --login -i" -new_console``` to the `Commands` text box.

 Recommended Optional Steps:

@ -150,11 +176,11 @@ Uncomment and edit the below line in the script to use Cmder config even when la
 # CMDER_ROOT=${USERPROFILE}/cmder  # This is not required if launched from Cmder.
 ```

-## Current development branch
+## Current development builds

 You can download builds of the current development branch by going to AppVeyor via the following link:

-[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/cmderdev/cmder?svg=True)](https://ci.appveyor.com/project/MartiUK/cmder/branch/development/artifacts)
+[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/cmderdev/cmder?svg=True)](https://ci.appveyor.com/project/MartiUK/cmder/branch/master/artifacts)

 ## License

--- a/appveyor.yml
+++ b/appveyor.yml
@ -15,7 +15,7 @@ branches:
 #---------------------------------#

 # Operating system (build VM template)
-os: Windows Server 2012 R2
+os: Visual Studio 2017

 #---------------------------------#
 #       build configuration       #
@ -44,6 +44,9 @@ artifacts:
  - path: build\cmder_mini.zip
    name: cmdermini

+  - path: build\hashes.txt
+    name: hashes
+
 #---------------------------------#
 #         notifications           #
 #---------------------------------#
--- a/bin/alias.bat
+++ b/bin/alias.bat
@ -64,7 +64,7 @@ if "%aliases%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
 )

 :: validate alias
-for /f "delims== tokens=1,2 usebackq" %%G in (`echo "%_x%"`) do (
+for /f "delims== tokens=1,* usebackq" %%G in (`echo "%_x%"`) do (
  set alias_name=%%G
  set alias_value=%%H
 )
@ -96,7 +96,7 @@ set del_alias=%~1
 findstr /b /v /i "%del_alias%=" "%ALIASES%" >> "%ALIASES%.tmp"
 type "%ALIASES%".tmp > "%ALIASES%" & @del /f /q "%ALIASES%.tmp"
 doskey %del_alias%=
-doskey /macrofile=%ALIASES%
+doskey /macrofile="%ALIASES%"
 goto:eof

 :p_reload
--- a/config/ConEmu.xml
+++ b/config/ConEmu.xml
@ -153,7 +153,7 @@
 			<value name="ComSpec.UpdateEnv" type="hex" data="00"/>
 			<value name="ComSpec.EnvAddPath" type="hex" data="01"/>
 			<value name="ComSpec.EnvAddExePath" type="hex" data="01"/>
-			<value name="ComSpec.UncPaths" type="hex" data="00"/>
+			<value name="ComSpec.UncPaths" type="hex" data="01"/>
 			<value name="ComSpec.Path" type="string" data=""/>
 			<value name="ConsoleTextSelection" type="hex" data="01"/>
 			<value name="CTS.AutoCopy" type="hex" data="01"/>
@ -253,7 +253,7 @@
 			<value name="TabsLocation" type="hex" data="01"/>
 			<value name="TabSelf" type="hex" data="01"/>
 			<value name="TabLazy" type="hex" data="01"/>
-			<value name="TabRecent" type="hex" data="01"/>
+			<value name="TabRecent" type="hex" data="00"/>
 			<value name="TabDblClick" type="dword" data="00000001"/>
 			<value name="TabsOnTaskBar" type="hex" data="02"/>
 			<value name="TaskBarOverlay" type="hex" data="01"/>
@ -488,7 +488,7 @@
 				<key name="Task1" modified="2015-11-24 14:49:10" build="151119">
 					<value name="Name" type="string" data="{cmd::Cmder as Admin}"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="*cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="*cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
@ -497,7 +497,7 @@
 				<key name="Task2" modified="2015-11-24 14:49:10" build="151119">
 					<value name="Name" type="string" data="{cmd::Cmder}"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
@ -507,7 +507,7 @@
 					<value name="Name" type="string" data="{Powershell::PowerShell as Admin}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="*PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console:d:&quot;%USERPROFILE%&quot;"/>
+					<value name="Cmd1" type="string" data="*PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Flags" type="dword" data="00000000"/>
@ -516,7 +516,7 @@
 					<value name="Name" type="string" data="{Powershell::Powershell}"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console:d:&quot;%USERPROFILE%&quot;"/>
+					<value name="Cmd1" type="string" data="PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command &quot;Invoke-Expression '. ''%ConEmuDir%\..\profile.ps1'''&quot; -new_console"/>
 					<value name="Cmd2" type="string" data="%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
@ -527,7 +527,7 @@
 					<value name="Flags" type="dword" data="00000000"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data="/icon &quot;%ConEmuDir%\..\git-for-windows\usr\share\git\git-for-windows.ico&quot;"/>
-					<value name="Cmd1" type="string" data="*%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="*%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 				</key>
@ -536,10 +536,10 @@
 					<value name="Flags" type="dword" data="00000000"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data="/icon &quot;%ConEmuDir%\..\git-for-windows\usr\share\git\git-for-windows.ico&quot;"/>
-					<value name="Cmd1" type="string" data="%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console:d:%userProfile%"/>
+					<value name="Cmd1" type="string" data="%ConEmuDir%\..\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
-					<value name="Cmd2" type="string" data="%CMDER_ROOT%vendor\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console:d:%userProfile%"/>
+					<value name="Cmd2" type="string" data="%CMDER_ROOT%vendor\git-for-windows\usr\bin\mintty.exe /bin/bash -l -new_console"/>
 				</key>
 				<key name="Task7" modified="2015-11-24 14:49:10" build="151119">
 					<value name="Name" type="string" data="{bash::bash as Admin}"/>
@ -548,14 +548,14 @@
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
-					<value name="Cmd1" type="string" data="*cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="*cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash&quot; --login -i -new_console"/>
 				</key>
 				<key name="Task8" modified="2015-11-24 14:49:10" build="151119">
 					<value name="Name" type="string" data="{bash::bash}"/>
 					<value name="Flags" type="dword" data="00000000"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\icons\cmder.ico&quot;"/>
-					<value name="Cmd1" type="string" data="cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="cmd /c &quot;%ConEmuDir%\..\git-for-windows\bin\bash&quot; --login -i -new_console"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 				</key>
--- a/config/Readme.md
+++ b/config/Readme.md
@ -3,12 +3,12 @@
 All config files must be in this folder. If there is no option to set this folder 
 directly, it has to be hardlinked.

-* `aliases`: aliases in cmd; called form vendor\init.bat; autocreated from
-  `vendor\aliases.example`.
-* `*.lua`: clink completitions and prompt filters; called from vendor\cmder.lua after all
-  other prompt filter and clink completitons are initialized; add your own.
-* `user_profile.{sh|bat|ps1}`: startup files for bash|cmd|powershell tasks; called from their
-  respective startup scripts in `vendor\`; autocreated on first start of such a task
-* `.history`: the current commandline history; autoupdated on close
-* `settings`: settings for readline; overwritten on update
-* `ConEmu.xml`: settings from ConEmu (=the UI of cmder -> Preferences); overwritten on update
+* `user-aliases.cmd`: aliases in cmd; called from vendor\init.bat; autocreated from
+  `vendor\user-aliases.cmd.example`.
+* `*.lua`: clink completions and prompt filters; autoloaded after all
+  prompt filter and clink completions are initialized; add your own.
+* `user-profile.{sh|cmd|ps1}`: startup files for bash|cmd|powershell tasks; called from their
+  respective startup scripts in `vendor\`; autocreated on first start of such a task.
+* `.history`: the current commandline history; autoupdated on close.
+* `settings`: settings for readline; overwritten on update.
+* `ConEmu.xml`: settings from ConEmu (=the UI of cmder -> Preferences); overwritten on update.
--- a/launcher/CmderLauncher.vcxproj
+++ b/launcher/CmderLauncher.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@ -19,13 +19,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
--- a/launcher/src/CmderLauncher.cpp
+++ b/launcher/src/CmderLauncher.cpp
@ -95,7 +95,7 @@ bool FileExists(const wchar_t * filePath)
 	return false;
 }

-void StartCmder(std::wstring path, bool is_single_mode)
+void StartCmder(std::wstring path, bool is_single_mode, std::wstring taskName = L"")
 {
 #if USE_TASKBAR_API
 	wchar_t appId[MAX_PATH] = { 0 };
@ -103,6 +103,9 @@ void StartCmder(std::wstring path, bool is_single_mode)
 	wchar_t exeDir[MAX_PATH] = { 0 };
 	wchar_t icoPath[MAX_PATH] = { 0 };
 	wchar_t cfgPath[MAX_PATH] = { 0 };
+	wchar_t backupCfgPath[MAX_PATH] = { 0 };
+	wchar_t cpuCfgPath[MAX_PATH] = { 0 };
+	wchar_t userCfgPath[MAX_PATH] = { 0 };
 	wchar_t oldCfgPath[MAX_PATH] = { 0 };
 	wchar_t conEmuPath[MAX_PATH] = { 0 };
 	wchar_t args[MAX_PATH * 2 + 256] = { 0 };
@ -117,19 +120,27 @@ void StartCmder(std::wstring path, bool is_single_mode)

 	PathCombine(icoPath, exeDir, L"icons\\cmder.ico");

-	// Check for machine-specific config file.
-	PathCombine(oldCfgPath, exeDir, L"config\\ConEmu-%COMPUTERNAME%.xml");
-	ExpandEnvironmentStrings(oldCfgPath, oldCfgPath, sizeof(oldCfgPath) / sizeof(oldCfgPath[0]));
-	if (!PathFileExists(oldCfgPath)) {
+	// Check for machine-specific then user config source file.
+	PathCombine(cpuCfgPath, exeDir, L"config\\ConEmu-%COMPUTERNAME%.xml");
+	ExpandEnvironmentStrings(cpuCfgPath, cpuCfgPath, sizeof(cpuCfgPath) / sizeof(cpuCfgPath[0]));
+
+	PathCombine(userCfgPath, exeDir, L"config\\user-ConEmu.xml");
+ 
+	if (PathFileExists(cpuCfgPath)) {
+		wcsncpy_s(oldCfgPath, cpuCfgPath, sizeof(cpuCfgPath));
+		wcsncpy_s(backupCfgPath, cpuCfgPath, sizeof(cpuCfgPath));
+	}
+	else if (PathFileExists(userCfgPath)) {
+		wcsncpy_s(oldCfgPath, userCfgPath,sizeof(userCfgPath));
+		wcsncpy_s(backupCfgPath, userCfgPath, sizeof(userCfgPath));
+	}
+	else {
 		PathCombine(oldCfgPath, exeDir, L"config\\ConEmu.xml");
+		wcsncpy_s(backupCfgPath, userCfgPath, sizeof(userCfgPath));
 	}

-	// Check for machine-specific config file.
-	PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu-%COMPUTERNAME%.xml");
-	ExpandEnvironmentStrings(cfgPath, cfgPath, sizeof(cfgPath) / sizeof(cfgPath[0]));
-	if (!PathFileExists(cfgPath)) {
-		PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml");
-	}
+	// Set path to vendored ConEmu config file
+	PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml");

 	SYSTEM_INFO sysInfo;
 	GetNativeSystemInfo(&sysInfo);
@ -151,6 +162,14 @@ void StartCmder(std::wstring path, bool is_single_mode)
 			exit(1);
 		}
 	}
+	else if (!CopyFile(cfgPath, backupCfgPath, FALSE))
+	{
+		MessageBox(NULL,
+			(GetLastError() == ERROR_ACCESS_DENIED)
+			? L"Failed to backup ConEmu.xml file to ./config folder!"
+			: L"Failed to backup ConEmu.xml file to ./config folder!", MB_TITLE, MB_ICONSTOP);
+		exit(1);
+	}

 	if (is_single_mode)
 	{
@ -161,6 +180,10 @@ void StartCmder(std::wstring path, bool is_single_mode)
 		swprintf_s(args, L"/Icon \"%s\" /Title Cmder", icoPath);
 	}

+	if (!taskName.empty()) {
+		swprintf_s(args, L"%s /run {%s}", args, taskName.c_str());
+	}
+
 	SetEnvironmentVariable(L"CMDER_ROOT", exeDir);
 	if (!streqi(path.c_str(), L""))
 	{
@ -169,8 +192,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 +200,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)
@ -302,6 +327,10 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	{
 		StartCmder(opt.second, true);
 	}
+	else if (streqi(opt.first.c_str(), L"/TASK"))
+	{
+		StartCmder(L"", false, opt.second);
+	}
 	else if (streqi(opt.first.c_str(), L"/REGISTER"))
 	{
 		RegisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
@ -314,7 +343,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 	else
 	{
-		MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n  /START <path>\n  /SINGLE <path>\n  /REGISTER [USER/ALL]\n  /UNREGISTER [USER/ALL]", MB_TITLE, MB_OK);
+		MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n  /START <path>\n  /SINGLE <path>\n  /TASK <name>\n /REGISTER [USER/ALL]\n  /UNREGISTER [USER/ALL]", MB_TITLE, MB_OK);
 		return 1;
 	}

--- a/1
+++ b/1
@ -19,3 +19,4 @@ appveyor.yml
 vendor\cmder.sh
 vendor\git-prompt.sh
 config\user-*
+.github_changelog_generator
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@ -53,6 +53,10 @@ Param(
    [switch]$Compile
 )

+# Get the scripts and cmder root dirs we are building in.
+$ScriptRoot = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition
+$cmder_root = $ScriptRoot.replace("\scripts","")
+
 # Dot source util functions into this scope
 . ".\utils.ps1"
 $ErrorActionPreference = "Stop"
@ -75,6 +79,14 @@ if ($config -ne "") {
    } else { $ConEmuXml = "" }
 } else { $ConEmuXml = "" }

+# Kill ssh-agent.exe if it is running from the $env:cmder_root we are building
+foreach ($ssh_agent in $(get-process ssh-agent -erroraction silentlycontinue)) {
+  if ([string]$($ssh_agent.path) -match [string]$cmder_root.replace('\','\\')) {
+    write-verbose $("Stopping " + $ssh_agent.path + "!")
+    stop-process $ssh_agent.id
+  }
+}
+
 $vend = $pwd
 foreach ($s in $sources) {
    Write-Verbose "Getting $($s.name) from URL $($s.url)"
--- a/scripts/pack.ps1
+++ b/scripts/pack.ps1
@ -53,6 +53,6 @@ $version = Invoke-Expression "git describe --abbrev=0 --tags"

 foreach ($t in $targets.GetEnumerator()) {
    Create-Archive $cmderRoot "$saveTo\$($t.Name)" $t.Value
-    $hash = (Digest-MD5 "$saveTo\$($t.Name)")
-    Add-Content "$saveTo\hashes.txt" $hash
+    $hash = (Digest-Hash "$saveTo\$($t.Name)")
+    Add-Content -path "$saveTo\hashes.txt" -value ($t.Name + ' ' + $hash)
 }
--- a/scripts/utils.ps1
+++ b/scripts/utils.ps1
@ -1,4 +1,4 @@
-function Ensure-Exists ($path) {
+function Ensure-Exists($path) {
    if (-not (Test-Path $path)) {
        Write-Error "Missing required $path! Ensure it is installed"
        exit 1
@ -6,7 +6,7 @@ function Ensure-Exists ($path) {
    return $true > $null
 }

-function Ensure-Executable ($command) {
+function Ensure-Executable($command) {
    try { Get-Command $command -ErrorAction Stop > $null }
    catch {
        If( ($command -eq "7z") -and (Test-Path "$env:programfiles\7-zip\7z.exe") ){
@ -22,12 +22,13 @@ function Ensure-Executable ($command) {
    }
 }

-function Delete-Existing ($path) {
+function Delete-Existing($path) {
    Write-Verbose "Remove $path"
    Remove-Item -Recurse -force $path -ErrorAction SilentlyContinue
 }

-function Extract-Archive ($source, $target) {
+function Extract-Archive($source, $target) {
+    Write-Verbose $("Extracting Archive '$cmder_root\vendor\" + $source.replace('/','\') + " to '$cmder_root\vendor\$target'")
    Invoke-Expression "7z x -y -o`"$($target)`" `"$source`"  > `$null"
    if ($lastexitcode -ne 0) {
        Write-Error "Extracting of $source failied"
@ -35,7 +36,7 @@ function Extract-Archive ($source, $target) {
    Remove-Item $source
 }

-function Create-Archive ($source, $target, $params) {
+function Create-Archive($source, $target, $params) {
    $command = "7z a -x@`"$source\packignore`" $params $target $source  > `$null"
    Write-Verbose "Running: $command"
    Invoke-Expression $command
@ -46,22 +47,22 @@ function Create-Archive ($source, $target, $params) {

 # If directory contains only one child directory
 # Flatten it instead
-function Flatten-Directory ($name) {
+function Flatten-Directory($name) {
    $child = (Get-Childitem $name)[0]
    Rename-Item $name -NewName "$($name)_moving"
    Move-Item -Path "$($name)_moving\$child" -Destination $name
    Remove-Item -Recurse "$($name)_moving"
 }

-function Digest-MD5 ($path) {
+function Digest-Hash($path) {
    if(Get-Command Get-FileHash -ErrorAction SilentlyContinue){
-        return (Get-FileHash -Algorithm MD5 -Path $path).Hash
+        return (Get-FileHash -Algorithm SHA256 -Path $path).Hash
    }

    return Invoke-Expression "md5sum $path"
 }

-function Register-Cmder(){
+function Register-Cmder() {
    [CmdletBinding()]
    Param
    (
@ -75,7 +76,7 @@ function Register-Cmder(){
        $Command = "%V"

        , # Defaults to the icons folder in the cmder package.
-        $icon = (Split-Path $PathToExe | join-path -ChildPath 'icons/cmder.ico')
+        $icon = (Split-Path $PathToExe | Join-Path -ChildPath 'icons/cmder.ico')
    )
    Begin
    {
@ -99,7 +100,7 @@ function Register-Cmder(){
    }
 }

-function Unregister-Cmder{
+function Unregister-Cmder {
    Begin
    {
        New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT > $null
@ -123,9 +124,9 @@ function Download-File {
    # I think this is the problem
    $File = $File -Replace "/", "\"
    Write-Verbose "Downloading from $Url to $File"
-    $wc = new-object System.Net.WebClient
+    $wc = New-Object System.Net.WebClient
    if ($env:https_proxy) {
-      $wc.proxy = (new-object System.Net.WebProxy($env:https_proxy))
+      $wc.proxy = (New-Object System.Net.WebProxy($env:https_proxy))
    }
    $wc.Proxy.Credentials=[System.Net.CredentialCache]::DefaultNetworkCredentials;
    $wc.DownloadFile($Url, $File)
--- a/vendor/clink.lua
+++ b/vendor/clink.lua
@ -3,9 +3,10 @@
 -- !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
 -- !!! Use "%CMDER_ROOT%\config\<whatever>.lua" to add your lua startup scripts

+-- luacheck: globals clink

 -- At first, load the original clink.lua file
-- this is needed as we set the script path to this dir and therefore the original 
+-- this is needed as we set the script path to this dir and therefore the original
 -- clink.lua is not loaded.
 local clink_lua_file = clink.get_env('CMDER_ROOT')..'\\vendor\\clink\\clink.lua'
 dofile(clink_lua_file)
@ -18,12 +19,35 @@ dofile(clink_lua_file)
 -- which echo) don't get the ugly '{lamb}' shown.
 ---
 function set_prompt_filter()
+    -- get_cwd() is differently encoded than the clink.prompt.value, so everything other than
+    -- pure ASCII will get garbled. So try to parse the current directory from the original prompt
+    -- and only if that doesn't work, use get_cwd() directly.
+    -- The matching relies on the default prompt which ends in X:\PATH\PATH>
+    -- (no network path possible here!)
+    local old_prompt = clink.prompt.value
+    local cwd = old_prompt:match('.*(.:[^>]*)>')
+    if cwd == nil then cwd = clink.get_cwd() end
+
+    -- environment systems like pythons virtualenv change the PROMPT and usually
+    -- set some variable. But the variables are differently named and we would never
+    -- get them all, so try to parse the env name out of the PROMPT.
+    -- envs are usually put in round or square parentheses and before the old prompt
+    local env = old_prompt:match('.*%(([^%)]+)%).+:')
+    -- also check for square brackets
+    if env == nil then env = old_prompt:match('.*%[([^%]]+)%].+:') end
+
+    -- build our own prompt
    -- orig: $E[1;32;40m$P$S{git}{hg}$S$_$E[1;30;40m{lamb}$S$E[0m
    -- color codes: "\x1b[1;37;40m"
-    cwd = clink.get_cwd()
-    prompt = "\x1b[1;32;40m{cwd} {git}{hg} \n\x1b[1;30;40m{lamb} \x1b[0m"
-    new_value = string.gsub(prompt, "{cwd}", cwd)
-    clink.prompt.value = string.gsub(new_value, "{lamb}", "λ")
+    local cmder_prompt = "\x1b[1;32;40m{cwd} {git}{hg}{svn} \n\x1b[1;39;40m{lamb} \x1b[0m"
+    local lambda
+    cmder_prompt = string.gsub(cmder_prompt, "{cwd}", cwd)
+    if env == nil then
+        lambda = "λ"
+    else
+        lambda = "("..env..") λ"
+    end
+    clink.prompt.value = string.gsub(cmder_prompt, "{lamb}", lambda)
 end

 ---
@ -81,6 +105,20 @@ local function get_hg_dir(path)
    return get_dir_contains(path, '.hg')
 end

+local function get_svn_dir(path)
+    return get_dir_contains(path, '.svn')
+end
+function get_svn_branch(svn_dir)
+    for line in io.popen("svn info 2>nul"):lines() do
+        local m = line:match("^Relative URL:")
+        if m then
+            return line:sub(line:find("/")+1,line:len())
+        end
+    end
+
+    return false
+end
+
 -- adapted from from clink-completions' git.lua
 local function get_git_dir(path)

@ -96,7 +134,7 @@ local function get_git_dir(path)

    -- Checks if provided directory contains git directory
    local function has_git_dir(dir)
-        return #clink.find_dirs(dir..'/.git') > 0 and dir..'/.git'
+        return clink.is_dir(dir..'/.git') and dir..'/.git'
    end

    local function has_git_file(dir)
@ -142,8 +180,15 @@ end
 -- @return {bool}
 ---
 function get_hg_status()
-    for line in io.popen("hg status"):lines() do
-        return false
+    for line in io.popen("hg status -0"):lines() do
+       return false
+    end
+    return true
+end
+
+function get_svn_status()
+    for line in io.popen("svn status -q"):lines() do
+       return false
    end
    return true
 end
@ -159,6 +204,7 @@ function hg_prompt_filter()
    if get_hg_dir() then
        -- if we're inside of mercurial repo then try to detect current branch
        local branch = get_hg_branch()
+        local color
        if branch then
            -- Has branch => therefore it is a mercurial folder, now figure out status
            if get_hg_status() then
@ -182,7 +228,7 @@ end
 -- @return {nil|git branch name}
 ---
 function get_git_branch(git_dir)
-    local git_dir = git_dir or get_git_dir()
+    git_dir = git_dir or get_git_dir()

    -- If git directory not found then we're probably outside of repo
    -- or something went wrong. The same is when head_file is nil
@ -203,9 +249,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

@ -221,6 +270,7 @@ function git_prompt_filter()
    if git_dir then
        -- if we're inside of git repo then try to detect current branch
        local branch = get_git_branch(git_dir)
+        local color
        if branch then
            -- Has branch => therefore it is a git folder, now figure out status
            if get_git_status() then
@ -239,10 +289,38 @@ function git_prompt_filter()
    return false
 end

+function svn_prompt_filter()
+    -- Colors for svn status
+    local colors = {
+        clean = "\x1b[1;37;40m",
+        dirty = "\x1b[31;1m",
+    }
+
+    if get_svn_dir() then
+        -- if we're inside of svn repo then try to detect current branch
+        local branch = get_svn_branch()
+        local color
+        if branch then
+            if get_svn_status() then
+                color = colors.clean
+            else
+                color = colors.dirty
+            end
+
+            clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", color.."("..branch..")")
+            return false
+        end
+    end
+
+    -- No mercurial present or not in mercurial file
+    clink.prompt.value = string.gsub(clink.prompt.value, "{svn}", "")
+    return false
+end
 -- insert the set_prompt at the very beginning so that it runs first
 clink.prompt.register_filter(set_prompt_filter, 1)
 clink.prompt.register_filter(hg_prompt_filter, 50)
 clink.prompt.register_filter(git_prompt_filter, 50)
+clink.prompt.register_filter(svn_prompt_filter, 50)

 local completions_dir = clink.get_env('CMDER_ROOT')..'/vendor/clink-completions/'
 for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
--- a/vendor/cmder.sh
+++ b/vendor/cmder.sh
@ -38,25 +38,25 @@ export PATH
 # Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
 # to source them at startup.
 if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
-  mkdir -p ${CMDER_ROOT}/config/profile.d
+  mkdir -p "${CMDER_ROOT}/config/profile.d"
 fi

 if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
  unset profile_d_scripts
-  pushd ${CMDER_ROOT}/config/profile.d >/dev/null
-  profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null)
+  pushd "${CMDER_ROOT}/config/profile.d" >/dev/null
+  profile_d_scripts=$(ls *.sh 2>/dev/null)

  if [ ! "x${profile_d_scripts}" = "x" ] ; then
    for x in ${profile_d_scripts} ; do
-      # echo Sourcing "${x}"...
-      . $x
+      # echo Sourcing "${CMDER_ROOT}/config/profile.d/${x}"...
+      . "${CMDER_ROOT}/config/profile.d/${x}"
    done
  fi
  popd >/dev/null
 fi

-if [ -f ${CMDER_ROOT}/config/user-profile.sh ] ; then
-    . ${CMDER_ROOT}/config/user-profile.sh
+if [ -f "${CMDER_ROOT}/config/user-profile.sh" ] ; then
+    . "${CMDER_ROOT}/config/user-profile.sh"
 else
    echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
    cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"
--- a/vendor/cmder_exinit
+++ b/vendor/cmder_exinit
@ -51,29 +51,29 @@ if [ ! "$CMDER_ROOT" = "" ] ; then
  # Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
  # to source them at startup.
  if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
-    mkdir -p ${CMDER_ROOT}/config/profile.d
+    mkdir -p "${CMDER_ROOT}/config/profile.d"
  fi
  
  if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
    unset profile_d_scripts
-    pushd ${CMDER_ROOT}/config/profile.d >/dev/null
+    pushd "${CMDER_ROOT}/config/profile.d" >/dev/null
    if [ ! "x${ZSH_VERSION}" = "x"  ]; then
-      profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.zsh 2>/dev/null)
+      profile_d_scripts=$(ls *.zsh 2>/dev/null)
    elif [ ! "x${BASH_VERSION}" = "x"  ]; then
-      profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null)
+      profile_d_scripts=$(ls *.sh 2>/dev/null)
    fi
  
    if [ ! "x${profile_d_scripts}" = "x" ] ; then
      for x in ${profile_d_scripts} ; do
-        # echo Sourcing "${x}"...
-        . $x
+        # echo Sourcing "${CMDER_ROOT}/config/profile.d/${x}"...
+        . "${CMDER_ROOT}/config/profile.d/${x}"
      done
    fi
    popd >/dev/null
  fi
  
-  if [ -f ${CMDER_ROOT}/config/user-profile.sh ] ; then
-    . ${CMDER_ROOT}/config/user-profile.sh
+  if [ -f "${CMDER_ROOT}/config/user-profile.sh" ] ; then
+    . "${CMDER_ROOT}/config/user-profile.sh"
  else
    echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
    cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"
--- a/vendor/git-prompt.sh
+++ b/vendor/git-prompt.sh
@ -1,22 +1,39 @@
-PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
-PS1="$PS1"'\[\033[32m\]'       # change to green
-PS1="$PS1"'\u@\h '             # user@host<space>
-PS1="$PS1"'\[\033[33m\]'       # change to brownish yellow
-PS1="$PS1"'\w'                 # current working directory
-if test -z "$WINELOADERNOEXEC"
+if test -f /etc/profile.d/git-sdk.sh
 then
-	GIT_EXEC_PATH="$(git --exec-path 2>/dev/null)"
-	COMPLETION_PATH="${GIT_EXEC_PATH%/libexec/git-core}"
-	COMPLETION_PATH="${COMPLETION_PATH%/lib/git-core}"
-	COMPLETION_PATH="$COMPLETION_PATH/share/git/completion"
-	if test -f "$COMPLETION_PATH/git-prompt.sh"
-	then
-		. "$COMPLETION_PATH/git-completion.bash"
-		. "$COMPLETION_PATH/git-prompt.sh"
-		PS1="$PS1"'\[\033[36m\]'  # change color to cyan
-		PS1="$PS1"'`__git_ps1`'   # bash function
-	fi
+  TITLEPREFIX=SDK-${MSYSTEM#MINGW}
+else
+  TITLEPREFIX=$MSYSTEM
 fi
-PS1="$PS1"'\[\033[0m\]'        # change color
-PS1="$PS1"'\n'                 # new line
-PS1="$PS1"'λ '                 # prompt: always λ 
+
+if test -f ~/.config/git/git-prompt.sh
+then
+  . ~/.config/git/git-prompt.sh
+else
+  PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]' # set window title
+  # PS1="$PS1"'\n'                 # new line
+  PS1="$PS1"'\[\033[32m\]'       # change to green
+  PS1="$PS1"'\u@\h '             # user@host<space>
+  # PS1="$PS1"'\[\033[35m\]'       # change to purple
+  # PS1="$PS1"'$MSYSTEM '          # show MSYSTEM
+  PS1="$PS1"'\[\033[33m\]'       # change to brownish yellow
+  PS1="$PS1"'\w'                 # current working directory
+  if test -z "$WINELOADERNOEXEC"
+  then
+    GIT_EXEC_PATH="$(git --exec-path 2>/dev/null)"
+    COMPLETION_PATH="${GIT_EXEC_PATH%/libexec/git-core}"
+    COMPLETION_PATH="${COMPLETION_PATH%/lib/git-core}"
+    COMPLETION_PATH="$COMPLETION_PATH/share/git/completion"
+    if test -f "$COMPLETION_PATH/git-prompt.sh"
+    then
+      . "$COMPLETION_PATH/git-completion.bash"
+      . "$COMPLETION_PATH/git-prompt.sh"
+      PS1="$PS1"'\[\033[36m\]'  # change color to cyan
+      PS1="$PS1"'`__git_ps1`'   # bash function
+    fi
+  fi
+  PS1="$PS1"'\[\033[0m\]'        # change color
+  PS1="$PS1"'\n'                 # new line
+  PS1="$PS1"'λ '                 # prompt: always λ 
+fi
+
+MSYS2_PS1="$PS1"               # for detection by MSYS2 SDK's bash.basrc
--- a/vendor/init.bat
+++ b/vendor/init.bat
@ -121,12 +121,12 @@ if not defined aliases (
 :: Make sure we have a self-extracting user-aliases.cmd file
 setlocal enabledelayedexpansion
 if not exist "%user-aliases%" (
-    echo Creating intial user-aliases store in "%user-aliases%"...
+    echo Creating initial user-aliases store in "%user-aliases%"...
    copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
 ) else (
    type "%user-aliases%" | findstr /i ";= Add aliases below here" >nul
    if "!errorlevel!" == "1" (
-        echo Creating intial user-aliases store in "%user-aliases%"...
+        echo Creating initial user-aliases store in "%user-aliases%"...
        copy "%CMDER_ROOT%\%user-aliases%" "%user-aliases%.old_format" 
        copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%" 
    )
@ -149,9 +149,9 @@ call "%user-aliases%"
 :: manually extracting the archive rather than executing the 7z sfx
 if exist "%CMDER_ROOT%\vendor\git-for-windows\post-install.bat" (
    call :verbose-output Running Git for Windows one time Post Install....
-    cd /d "%CMDER_ROOT%\vendor\git-for-windows\"
+    pushd "%CMDER_ROOT%\vendor\git-for-windows\"
    "%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe" --no-needs-console --hide --no-cd --command=post-install.bat
-    cd /d %USERPROFILE%
+    pushd "%USERPROFILE%"
 )

 :: Set home path
@ -160,10 +160,9 @@ if not defined HOME set "HOME=%USERPROFILE%"
 :: This is either a env variable set by the user or the result of
 :: cmder.exe setting this variable due to a commandline argument or a "cmder here"
 if defined CMDER_START (
-    cd /d "%CMDER_START%"
+    pushd "%CMDER_START%"
 )

-
 if exist "%CMDER_ROOT%\config\user-profile.cmd" (
    REM Create this file and place your own command in there
    call "%CMDER_ROOT%\config\user-profile.cmd"
@ -173,7 +172,14 @@ if exist "%CMDER_ROOT%\config\user-profile.cmd" (
    echo :: use this file to run your own startup commands
    echo :: use  in front of the command to prevent printing the command
    echo.
+    echo :: uncomment this to have the ssh agent load when cmder starts
    echo :: call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd"
+    echo.
+    echo :: uncomment this next two lines to use pageant as the ssh authentication agent
+    echo :: SET SSH_AUTH_SOCK=/tmp/.ssh-pageant-auth-sock
+    echo :: call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-pageant.cmd"
+    echo.
+    echo :: you can add your plugins to the cmder path like so
    echo :: set "PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%"
    echo.
    ) > "%CMDER_ROOT%\config\user-profile.cmd"
--- a/vendor/profile.ps1
+++ b/vendor/profile.ps1
@ -4,23 +4,31 @@
 # !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
 # !!! Use "%CMDER_ROOT%\config\user-profile.ps1" to add your own startup commands

-# We do this for Powershell as Admin Sessions because CMDER_ROOT is not beng set.
-if (! $ENV:CMDER_ROOT ) {
-    $ENV:CMDER_ROOT = resolve-path( $ENV:ConEmuDir + "\..\.." )
-}
-
-# Remove trailing '\'
-$ENV:CMDER_ROOT = (($ENV:CMDER_ROOT).trimend("\"))
-
 # Compatibility with PS major versions <= 2
 if(!$PSScriptRoot) {
    $PSScriptRoot = Split-Path $Script:MyInvocation.MyCommand.Path
 }

+# We do this for Powershell as Admin Sessions because CMDER_ROOT is not beng set.
+if (! $ENV:CMDER_ROOT ) {
+    if ( $ENV:ConEmuDir ) {
+        $ENV:CMDER_ROOT = resolve-path( $ENV:ConEmuDir + "\..\.." )
+    } else {
+        $ENV:CMDER_ROOT = resolve-path( $PSScriptRoot + "\.." )
+    }
+}
+
+# Remove trailing '\'
+$ENV:CMDER_ROOT = (($ENV:CMDER_ROOT).trimend("\"))
+
+# do not load bundled psget if a module installer is already available
+# -> recent PowerShell versions include PowerShellGet out of the box
+$moduleInstallerAvailable = [bool](Get-Command -Name 'Install-Module' -ErrorAction SilentlyContinue | Out-Null)
+
 # Add Cmder modules directory to the autoload path.
 $CmderModulePath = Join-path $PSScriptRoot "psmodules/"

-if( -not $env:PSModulePath.Contains($CmderModulePath) ){
+if(-not $moduleInstallerAvailable -and -not $env:PSModulePath.Contains($CmderModulePath) ){
    $env:PSModulePath = $env:PSModulePath.Insert(0, "$CmderModulePath;")
 }

@ -46,16 +54,23 @@ try {
    $env:Path += $(";" + $env:CMDER_ROOT + "\vendor\git-for-windows\bin")
 }

-try {
-    Import-Module -Name "posh-git" -ErrorAction Stop >$null
-    $gitStatus = $true
-} catch {
-    Write-Warning "Missing git support, install posh-git with 'Install-Module posh-git' and restart cmder."
-    $gitStatus = $false
+$gitLoaded = $false
+function Import-Git($Loaded){
+    if($Loaded) { return }
+    $GitModule = Get-Module -Name Posh-Git -ListAvailable
+    if($GitModule | select version | where version -le ([version]"0.6.1.20160330")){
+        Import-Module Posh-Git > $null
+    }
+    if(-not ($GitModule) ) {
+        Write-Warning "Missing git support, install posh-git with 'Install-Module posh-git' and restart cmder."
+    }
+    # Make sure we only run once by alawys returning true
+    return $true
 }

 function checkGit($Path) {
    if (Test-Path -Path (Join-Path $Path '.git') ) {
+        $gitLoaded = Import-Git $gitLoaded
        Write-VcsStatus
        return
    }
@ -65,24 +80,6 @@ function checkGit($Path) {
    }
 }

-# Set up a Cmder prompt, adding the git prompt parts inside git repos
-function global:prompt {
-    $realLASTEXITCODE = $LASTEXITCODE
-    $Host.UI.RawUI.ForegroundColor = "White"
-    Write-Host $pwd.ProviderPath -NoNewLine -ForegroundColor Green
-    if($gitStatus){
-        checkGit($pwd.ProviderPath)
-    }
-    $global:LASTEXITCODE = $realLASTEXITCODE
-    Write-Host "`nλ" -NoNewLine -ForegroundColor "DarkGray"
-    return " "
-}
-
-# Load special features come from posh-git
-if ($gitStatus) {
-    Start-SshAgent -Quiet
-}
-
 # Move to the wanted location
 # This is either a env variable set by the user or the result of
 # cmder.exe setting this variable due to a commandline argument or a "cmder here"
@ -97,6 +94,36 @@ if (Get-Module PSReadline -ErrorAction "SilentlyContinue") {
 # Enhance Path
 $env:Path = "$Env:CMDER_ROOT\bin;$env:Path;$Env:CMDER_ROOT"

+#
+# Prompt Section
+#   Users should modify their user-profile.ps1 as it will be safe from updates.
+#
+
+# Pre assign the hooks so the first run of cmder gets a working prompt.
+[ScriptBlock]$PrePrompt = {}
+[ScriptBlock]$PostPrompt = {}
+[ScriptBlock]$CmderPrompt = {
+    $Host.UI.RawUI.ForegroundColor = "White"
+    Microsoft.PowerShell.Utility\Write-Host $pwd.ProviderPath -NoNewLine -ForegroundColor Green
+    checkGit($pwd.ProviderPath)
+}
+
+<#
+This scriptblock runs every time the prompt is returned.
+Explicitly use functions from MS namespace to protect from being overridden in the user session.
+Custom prompt functions are loaded in as constants to get the same behaviour
+#>
+[ScriptBlock]$Prompt = {
+    $realLASTEXITCODE = $LASTEXITCODE
+    $host.UI.RawUI.WindowTitle = Microsoft.PowerShell.Management\Split-Path $pwd.ProviderPath -Leaf
+    PrePrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
+    CmderPrompt
+    Microsoft.PowerShell.Utility\Write-Host "`nλ " -NoNewLine -ForegroundColor "DarkGray"
+    PostPrompt | Microsoft.PowerShell.Utility\Write-Host -NoNewline
+    $global:LASTEXITCODE = $realLASTEXITCODE
+    return " "
+}
+
 # Drop *.ps1 files into "$ENV:CMDER_ROOT\config\profile.d"
 # to source them at startup.
 if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
@ -104,7 +131,7 @@ if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
 }

 pushd $ENV:CMDER_ROOT\config\profile.d
-foreach ($x in ls *.ps1) {
+foreach ($x in Get-ChildItem *.ps1) {
  # write-host write-host Sourcing $x
  . $x
 }
@ -115,6 +142,48 @@ if(Test-Path $CmderUserProfilePath) {
    # Create this file and place your own command in there.
    . "$CmderUserProfilePath"
 } else {
-    Write-Host "Creating user startup file: $CmderUserProfilePath"
-    "# Use this file to run your own startup commands" | Out-File $CmderUserProfilePath
+# This multiline string cannot be indented, for this reason I've not indented the whole block
+
+Write-Host -BackgroundColor Darkgreen -ForegroundColor White "First Run: Creating user startup file: $CmderUserProfilePath"
+
+$UserProfileTemplate = @'
+# Use this file to run your own startup commands
+
+## Prompt Customization
+<#
+.SYNTAX
+    <PrePrompt><CMDER DEFAULT>
+    λ <PostPrompt> <repl input>
+.EXAMPLE
+    <PrePrompt>N:\Documents\src\cmder [master]
+    λ <PostPrompt> |
+#>
+
+[ScriptBlock]$PrePrompt = {
+
 }
+
+# Replace the cmder prompt entirely with this.
+# [ScriptBlock]$CmderPrompt = {}
+
+[ScriptBlock]$PostPrompt = {
+
+}
+
+## <Continue to add your own>
+
+
+'@
+
+New-Item -ItemType File -Path $CmderUserProfilePath -Value $UserProfileTemplate > $null
+
+}
+
+# Once Created these code blocks cannot be overwritten
+Set-Item -Path function:\PrePrompt   -Value $PrePrompt   -Options Constant
+Set-Item -Path function:\CmderPrompt -Value $CmderPrompt -Options Constant
+Set-Item -Path function:\PostPrompt  -Value $PostPrompt  -Options Constant
+
+# Functions can be made constant only at creation time
+# ReadOnly at least requires `-force` to be overwritten
+Set-Item -Path function:\prompt  -Value $Prompt  -Options ReadOnly
--- a/vendor/sources.json
+++ b/vendor/sources.json
@ -1,22 +1,22 @@
 [
    {
        "name": "git-for-windows",
-        "version": "v2.9.0.windows.1",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.9.0.windows.1/PortableGit-2.9.0-32-bit.7z.exe"
+        "version": "v2.15.0.windows.1",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.15.0.windows.1/PortableGit-2.15.0-32-bit.7z.exe"
    },
    {
        "name": "clink",
-        "version": "0.4.8",
-        "url": "https://github.com/mridgers/clink/releases/download/0.4.8/clink_0.4.8.zip"
+        "version": "0.4.9",
+        "url": "https://github.com/Stanzilla/clink/releases/download/0.4.9/clink_DEV.zip"
    },
    {
        "name": "conemu-maximus5",
-        "version": "160710",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v16.07.10/ConEmuPack.160710.7z"
+        "version": "171025",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v17.10.25/ConEmuPack.171025.7z"
    },
    {
        "name": "clink-completions",
-        "version": "0.3.1",
-        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.1.zip"
+        "version": "0.3.3",
+        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.3.zip"
    }
 ]
--- 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%"