Merge branch 'master' into dev

6 years ago · ed8dd826c5
parent d9f0922945 7d9b3c924c
commit ed8dd826c5
1 changed files with 2 additions and 2 deletions
--- a/gitstatus/gitstatus.plugin.zsh
+++ b/gitstatus/gitstatus.plugin.zsh
@ -508,5 +508,5 @@ function gitstatus_check() {
  [[ -n ${(P)${:-GITSTATUS_DAEMON_PID_${1}}} ]]
 }

-(( ! p9k_lean_restore_aliases )) || setopt aliases
-'builtin' 'unset' 'p9k_lean_restore_aliases'
+(( ! _gitstatus_restore_aliases )) || setopt aliases
+'builtin' 'unset' '_gitstatus_restore_aliases'