diff options
| author | Jim Hester <james.f.hester@gmail.com> | 2012-09-21 10:19:39 -0400 |
|---|---|---|
| committer | Jim Hester <james.f.hester@gmail.com> | 2012-09-21 10:19:39 -0400 |
| commit | cc831508d7c2e839e1c4effe31ac2d92f2741f94 (patch) | |
| tree | f5a445e49a15d964002c279d3b04b4a4f2ba9579 /plugins/per-directory-history | |
| parent | baa187e4b903f39422a84b580e6e617ec3738e09 (diff) | |
| download | zsh-cc831508d7c2e839e1c4effe31ac2d92f2741f94.tar.gz zsh-cc831508d7c2e839e1c4effe31ac2d92f2741f94.tar.bz2 zsh-cc831508d7c2e839e1c4effe31ac2d92f2741f94.zip | |
Use HISTFILE evironment variable directly rather than copying it
Use the HISTFILE environment variable in place of copying it to
_per_directory_history_global so that users can change the environment variable
after sourcing per-directory-history and have the global variable set correctly
Diffstat (limited to 'plugins/per-directory-history')
| -rw-r--r-- | plugins/per-directory-history/per-directory-history.plugin.zsh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/per-directory-history/per-directory-history.plugin.zsh b/plugins/per-directory-history/per-directory-history.plugin.zsh index ce36db6af..22383b8b9 100644 --- a/plugins/per-directory-history/per-directory-history.plugin.zsh +++ b/plugins/per-directory-history/per-directory-history.plugin.zsh @@ -81,7 +81,6 @@ bindkey '^G' per-directory-history-toggle-history # implementation details #------------------------------------------------------------------------------- -_per_directory_history_global=$HISTFILE _per_directory_history_directory="$HISTORY_BASE${PWD:A}/history" function _per-directory-history-change-directory() { @@ -89,7 +88,7 @@ function _per-directory-history-change-directory() { mkdir -p ${_per_directory_history_directory:h} if [[ $_per_directory_history_is_global == false ]]; then #save to the global history - fc -AI $_per_directory_history_global + fc -AI $HISTFILE #save history to previous file local prev="$HISTORY_BASE${OLDPWD:A}/history" mkdir -p ${prev:h} @@ -115,7 +114,7 @@ function _per-directory-history-addhistory() { function _per-directory-history-set-directory-history() { if [[ $_per_directory_history_is_global == true ]]; then - fc -AI $_per_directory_history_global + fc -AI $HISTFILE local original_histsize=$HISTSIZE HISTSIZE=0 HISTSIZE=$original_histsize @@ -131,8 +130,8 @@ function _per-directory-history-set-global-history() { local original_histsize=$HISTSIZE HISTSIZE=0 HISTSIZE=$original_histsize - if [[ -e "$_per_directory_history_global" ]]; then - fc -R "$_per_directory_history_global" + if [[ -e "$HISTFILE" ]]; then + fc -R "$HISTFILE" fi fi _per_directory_history_is_global=true |