diff options
| author | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
|---|---|---|
| committer | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
| commit | e6ccd37b0563b4e7b34c41034766b9789e43ee5c (patch) | |
| tree | c12c8c2c6437fd7d5d3ec5bff27634a80759b808 /plugins/dirhistory | |
| parent | 30ef85664822595e29acdbc840c45d5772d84b5d (diff) | |
| parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
| download | zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.gz zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.bz2 zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.zip | |
Merge master (rebase being super annoying). Fix conflicts
Diffstat (limited to 'plugins/dirhistory')
| -rw-r--r-- | plugins/dirhistory/dirhistory.plugin.zsh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh index d101cfcae..0209981e3 100644 --- a/plugins/dirhistory/dirhistory.plugin.zsh +++ b/plugins/dirhistory/dirhistory.plugin.zsh @@ -49,7 +49,8 @@ function push_future() { } # Called by zsh when directory changes -function chpwd() { +chpwd_functions+=(chpwd_dirhistory) +function chpwd_dirhistory() { push_past $PWD # If DIRHISTORY_CD is not set... if [[ -z "${DIRHISTORY_CD+x}" ]]; then |