diff options
| -rw-r--r-- | gitstatus/gitstatus.plugin.zsh | 22 | ||||
| -rw-r--r-- | internal/configure.zsh | 4 | ||||
| -rw-r--r-- | internal/p10k.zsh | 24 | ||||
| -rw-r--r-- | powerlevel10k.zsh-theme | 2 |
4 files changed, 26 insertions, 26 deletions
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh index 32c20f32..46861e32 100644 --- a/gitstatus/gitstatus.plugin.zsh +++ b/gitstatus/gitstatus.plugin.zsh @@ -398,13 +398,13 @@ function _gitstatus_daemon"${1:-}"() { local gitstatus_plugin_dir_var=_gitstatus_plugin_dir$fsuf local gitstatus_plugin_dir=${(P)gitstatus_plugin_dir_var} - set -- -d $gitstatus_plugin_dir -s $uname_s -m $uname_m -p "printf . >&$pipe_fd" -- \ + builtin set -- -d $gitstatus_plugin_dir -s $uname_s -m $uname_m -p "printf . >&$pipe_fd" -- \ _gitstatus_set_daemon$fsuf - [[ ${GITSTATUS_AUTO_INSTALL:-1} == (|-|+)<1-> ]] || set -- -n "$@" - source $gitstatus_plugin_dir/install || return - [[ -n $_gitstatus_zsh_daemon ]] || return - [[ -n $_gitstatus_zsh_version ]] || return - [[ $_gitstatus_zsh_downloaded == [01] ]] || return + [[ ${GITSTATUS_AUTO_INSTALL:-1} == (|-|+)<1-> ]] || builtin set -- -n "$@" + builtin source $gitstatus_plugin_dir/install || return + [[ -n $_gitstatus_zsh_daemon ]] || return + [[ -n $_gitstatus_zsh_version ]] || return + [[ $_gitstatus_zsh_downloaded == [01] ]] || return if (( UID == EUID )); then local home=~ @@ -426,14 +426,14 @@ function _gitstatus_daemon"${1:-}"() { [[ $_gitstatus_zsh_daemon == \ ${GITSTATUS_CACHE_DIR:-${XDG_CACHE_HOME:-$HOME/.cache}/gitstatus}/* ]] || return - set -- -f "$@" + builtin set -- -f "$@" _gitstatus_zsh_daemon= _gitstatus_zsh_version= _gitstatus_zsh_downloaded= - source $gitstatus_plugin_dir/install || return - [[ -n $_gitstatus_zsh_daemon ]] || return - [[ -n $_gitstatus_zsh_version ]] || return - [[ $_gitstatus_zsh_downloaded == 1 ]] || return + builtin source $gitstatus_plugin_dir/install || return + [[ -n $_gitstatus_zsh_daemon ]] || return + [[ -n $_gitstatus_zsh_version ]] || return + [[ $_gitstatus_zsh_downloaded == 1 ]] || return HOME=$home $_gitstatus_zsh_daemon -G $_gitstatus_zsh_version "${(@)args}" >&$pipe_fd } always { diff --git a/internal/configure.zsh b/internal/configure.zsh index 5b3df9ad..9c92c233 100644 --- a/internal/configure.zsh +++ b/internal/configure.zsh @@ -59,11 +59,11 @@ function p9k_configure() { _p9k_can_configure || return ( set -- -f - source $__p9k_root_dir/internal/wizard.zsh + builtin source $__p9k_root_dir/internal/wizard.zsh ) local ret=$? case $ret in - 0) source $__p9k_cfg_path; _p9k__force_must_init=1;; + 0) builtin source $__p9k_cfg_path; _p9k__force_must_init=1;; 69) return 0;; *) return $ret;; esac diff --git a/internal/p10k.zsh b/internal/p10k.zsh index 095ad31c..4f635df1 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -49,10 +49,10 @@ if ! autoload -Uz is-at-least || ! is-at-least 5.1; then return 1 fi -source "${__p9k_root_dir}/internal/configure.zsh" -source "${__p9k_root_dir}/internal/worker.zsh" -source "${__p9k_root_dir}/internal/parser.zsh" -source "${__p9k_root_dir}/internal/icons.zsh" +builtin source "${__p9k_root_dir}/internal/configure.zsh" +builtin source "${__p9k_root_dir}/internal/worker.zsh" +builtin source "${__p9k_root_dir}/internal/parser.zsh" +builtin source "${__p9k_root_dir}/internal/icons.zsh" # For compatibility with Powerlevel9k. It's not recommended to use mnemonic color # names in the configuration except for colors 0-7 as these are standard. @@ -5624,7 +5624,7 @@ _p9k_set_instant_prompt() { [[ -n $RPROMPT ]] || unset RPROMPT } -typeset -gri __p9k_instant_prompt_version=27 +typeset -gri __p9k_instant_prompt_version=28 _p9k_dump_instant_prompt() { local user=${(%):-%n} @@ -5908,7 +5908,7 @@ _p9k_dump_instant_prompt() { exec 2>&1 {fd_null}>&- typeset -gi __p9k_instant_prompt_active=1 typeset -g __p9k_instant_prompt_dump_file=${XDG_CACHE_HOME:-~/.cache}/p10k-dump-${(%):-%n}.zsh - if source $__p9k_instant_prompt_dump_file 2>/dev/null && (( $+functions[_p9k_preinit] )); then + if builtin source $__p9k_instant_prompt_dump_file 2>/dev/null && (( $+functions[_p9k_preinit] )); then _p9k_preinit fi function _p9k_instant_prompt_cleanup() { @@ -6414,12 +6414,12 @@ _p9k_precmd_impl() { fi if (( ret == 0 )); then ( - source "$__p9k_root_dir"/internal/wizard.zsh + builtin source "$__p9k_root_dir"/internal/wizard.zsh ) if (( $? )); then instant_prompt_disabled=1 else - source "$__p9k_cfg_path" + builtin source "$__p9k_cfg_path" _p9k__force_must_init=1 _p9k_must_init fi @@ -8019,9 +8019,9 @@ _p9k_init_vcs() { typeset -g _p9k_preinit="function _p9k_preinit() { (( $+commands[git] )) || { unfunction _p9k_preinit; return 1 } - [[ \$ZSH_VERSION == ${(q)ZSH_VERSION} ]] || return - [[ -r ${(q)gitstatus_dir}/gitstatus.plugin.zsh ]] || return - source ${(q)gitstatus_dir}/gitstatus.plugin.zsh _p9k_ || return + [[ \$ZSH_VERSION == ${(q)ZSH_VERSION} ]] || return + [[ -r ${(q)gitstatus_dir}/gitstatus.plugin.zsh ]] || return + builtin source ${(q)gitstatus_dir}/gitstatus.plugin.zsh _p9k_ || return GITSTATUS_AUTO_INSTALL=${(q)GITSTATUS_AUTO_INSTALL} \ GITSTATUS_DAEMON=${(q)GITSTATUS_DAEMON} \ GITSTATUS_CACHE_DIR=${(q)GITSTATUS_CACHE_DIR} \ @@ -8037,7 +8037,7 @@ _p9k_init_vcs() { ${${_POWERLEVEL9K_VCS_RECURSE_UNTRACKED_DIRS:#0}:+-e} \ -a POWERLEVEL9K }" - source $gitstatus_dir/gitstatus.plugin.zsh _p9k_ || return + builtin source $gitstatus_dir/gitstatus.plugin.zsh _p9k_ || return () { trap 'return 130' INT { diff --git a/powerlevel10k.zsh-theme b/powerlevel10k.zsh-theme index cd49dd4c..d17862af 100644 --- a/powerlevel10k.zsh-theme +++ b/powerlevel10k.zsh-theme @@ -74,7 +74,7 @@ function _p9k_init_locale() { done fi fi - source $__p9k_root_dir/internal/p10k.zsh || true + builtin source $__p9k_root_dir/internal/p10k.zsh || true } (( $+__p9k_instant_prompt_active )) && unsetopt prompt_cr prompt_sp || setopt prompt_cr prompt_sp |