cleanup in alias handling

powerlevel9k.zsh-theme

@@ -10,27 +10,16 @@
 # https://github.com/robbyrussell/oh-my-zsh/blob/74177c5320b2a1b2f8c4c695c05984b57fd7c6ea/themes/agnoster.zsh-theme
 ################################################################
 
-################################################################
+if [[ -o 'aliases' ]]; then
-# For basic documentation, please refer to the README.md in the
+  'builtin' 'unsetopt' 'aliases'
-# top-level directory.
+  local _p9k_restore_aliases=1
-################################################################
+else
-
+  local _p9k_restore_aliases=0
-## Turn on for Debugging
+fi
-#PS4='%s%f%b%k%F{blue}%{λ%}%L %F{240}%N:%i%(?.. %F{red}%?) %1(_.%F{yellow}%-1_ .)%s%f%b%k '
-#zstyle ':vcs_info:*+*:*' debug true
-#set -o xtrace
 
 () {
-  'builtin' 'emulate' '-L' 'zsh'
+  emulate -L zsh
 
-  'builtin' 'local' "_p9k_aliases=$(
-      'builtin' 'alias' '-rL'
-      'builtin' 'alias' '-gL'
-      'builtin' 'alias' '-sL')"
-
-  'builtin' 'unalias' '-m' '*'
-
-  {
   if (( $+_p9k_sourced )); then
     prompt_powerlevel9k_setup
     return
@@ -57,7 +46,7 @@
   fi
 
   source $_p9k_installation_dir/internal/p10k.zsh
-  } always {
-    eval "$_p9k_aliases"
-  }
 }
+
+(( ! _p9k_restore_aliases )) || setopt aliases
+'builtin' 'unset' '_p9k_restore_aliases'