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/dirpersist | |
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/dirpersist')
-rw-r--r-- | plugins/dirpersist/dirpersist.plugin.zsh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh index 88d1129d4..616e2c3c6 100644 --- a/plugins/dirpersist/dirpersist.plugin.zsh +++ b/plugins/dirpersist/dirpersist.plugin.zsh @@ -11,7 +11,8 @@ if [[ -f ${dirstack_file} ]] && [[ ${#dirstack[*]} -eq 0 ]] ; then [[ -d $dirstack[1] ]] && cd $dirstack[1] && cd $OLDPWD fi -chpwd() { +chpwd_functions+=(chpwd_dirpersist) +chpwd_dirpersist() { if (( $DIRSTACKSIZE <= 0 )) || [[ -z $dirstack_file ]]; then return; fi local -ax my_stack my_stack=( ${PWD} ${dirstack} ) |