adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update per-directory-history plugin to latest version (#5493)

Browse Source 
Latest version: February 17, 2016 - dd81201
This commit is contained in:
Marc Cornellà 2016-10-04 13:56:25 +02:00 committed by GitHub
parent 99dbf322da
commit 3cc61701bd
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/per-directory-history/README.md
View File

@ -27,9 +27,8 @@ Usage
2. The default mode if per directory history, interact with your history as normal. 2. The default mode if per directory history, interact with your history as normal.
3. Press ^G (the Control and G keys simultaneously) to toggle between local 3. Press ^G (the Control and G keys simultaneously) to toggle between local
and global histories. and global histories. If you would prefer a different shortcut to toggle
set the PER_DIRECTORY_HISTORY_TOGGLE environment variable.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Configuration Configuration

12
plugins/per-directory-history/per-directory-history.zsh
View File

@ -30,7 +30,7 @@
# #
################################################################################ ################################################################################
# #
# Copyright (c) 2012 Jim Hester # Copyright (c) 2014 Jim Hester
# #
# This software is provided 'as-is', without any express or implied warranty. # This software is provided 'as-is', without any express or implied warranty.
# In no event will the authors be held liable for any damages arising from the # In no event will the authors be held liable for any damages arising from the
@ -57,6 +57,7 @@
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
[[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history" [[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history"
[[ -z $PER_DIRECTORY_HISTORY_TOGGLE ]] && PER_DIRECTORY_HISTORY_TOGGLE='^G'
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# toggle global/directory history used for searching - ctrl-G by default # toggle global/directory history used for searching - ctrl-G by default
@ -76,7 +77,7 @@ function per-directory-history-toggle-history() {
autoload per-directory-history-toggle-history autoload per-directory-history-toggle-history
zle -N per-directory-history-toggle-history zle -N per-directory-history-toggle-history
bindkey '^G' per-directory-history-toggle-history bindkey $PER_DIRECTORY_HISTORY_TOGGLE per-directory-history-toggle-history
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# implementation details # implementation details
@ -108,7 +109,7 @@ function _per-directory-history-change-directory() {
} }
function _per-directory-history-addhistory() { function _per-directory-history-addhistory() {
print -Sr -- ${1%%$'\n'} print -Sr -- "${1%%$'\n'}"
fc -p $_per_directory_history_directory fc -p $_per_directory_history_directory
} }
@ -140,8 +141,9 @@ function _per-directory-history-set-global-history() {
#add functions to the exec list for chpwd and zshaddhistory #add functions to the exec list for chpwd and zshaddhistory
chpwd_functions=(${chpwd_functions[@]} "_per-directory-history-change-directory") autoload -U add-zsh-hook
zshaddhistory_functions=(${zshaddhistory_functions[@]} "_per-directory-history-addhistory") add-zsh-hook chpwd _per-directory-history-change-directory
add-zsh-hook zshaddhistory _per-directory-history-addhistory
#start in directory mode #start in directory mode
mkdir -p ${_per_directory_history_directory:h} mkdir -p ${_per_directory_history_directory:h}