diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-08-31 13:29:54 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-03 12:50:55 -0400 |
| commit | 82c76f6b5c2718622a532fb759231e8d24171413 (patch) | |
| tree | b0126f6d9b3ed508c1a6d9b21df56e2523e0555f /plugins/dirpersist | |
| parent | fe92ea98e0633784508e85d6b756b1c3f667b2a4 (diff) | |
| parent | ba5fd57c1ff4a8523715bab6acc35dbbeff88af7 (diff) | |
| download | zsh-82c76f6b5c2718622a532fb759231e8d24171413.tar.gz zsh-82c76f6b5c2718622a532fb759231e8d24171413.tar.bz2 zsh-82c76f6b5c2718622a532fb759231e8d24171413.zip | |
Merge changes from #4241 into installer-portable-colors
Conflicts:
tools/install.sh
tools/upgrade.sh
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} ) |