prompt: add sp option to prompt_setup functions

This was a change in zsh 5.4.1 where prompt_sp is now reset on calls to
prompt, unlike previous behavior where it was set by default. This
restores the previous default behavior.

Refs #1423, but is not a complete fix because we need to wait for
external prompts to update as well.
main
Kaleb Elwert 7 years ago
parent 5e295b0835
commit 730fc4690e

@ -76,7 +76,7 @@ function prompt_cloud_preview {
function prompt_cloud_setup { function prompt_cloud_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Set the theme prefix to a cloud or to the user's given characters. # Set the theme prefix to a cloud or to the user's given characters.
if [[ -n "$1" ]]; then if [[ -n "$1" ]]; then

@ -32,7 +32,7 @@ prompt_damoekri_precmd() {
function prompt_damoekri_setup { function prompt_damoekri_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

@ -38,7 +38,7 @@ function prompt_giddie_precmd {
function prompt_giddie_setup { function prompt_giddie_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Load required functions. # Load required functions.
autoload -Uz vcs_info autoload -Uz vcs_info

@ -32,7 +32,7 @@ function prompt_kylewest_precmd {
function prompt_kylewest_setup { function prompt_kylewest_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

@ -23,7 +23,7 @@ function prompt_minimal_precmd {
function prompt_minimal_setup { function prompt_minimal_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

@ -26,7 +26,7 @@ function prompt_nicoulaj_precmd {
function prompt_nicoulaj_setup { function prompt_nicoulaj_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

@ -107,7 +107,7 @@ function prompt_paradox_preexec {
function prompt_paradox_setup { function prompt_paradox_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

@ -25,7 +25,7 @@ function prompt_peepcode_precmd {
function prompt_peepcode_setup { function prompt_peepcode_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

@ -28,7 +28,7 @@ function prompt_skwp_precmd {
function prompt_skwp_setup { function prompt_skwp_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

@ -36,7 +36,7 @@ function prompt_smiley_precmd {
function prompt_smiley_setup { function prompt_smiley_setup {
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(percent subst) prompt_opts=(percent sp subst)
# Add hook for calling git-info before each command. # Add hook for calling git-info before each command.
add-zsh-hook precmd prompt_smiley_precmd add-zsh-hook precmd prompt_smiley_precmd

@ -88,7 +88,7 @@ function prompt_sorin_precmd {
function prompt_sorin_setup { function prompt_sorin_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
_prompt_sorin_precmd_async_pid=0 _prompt_sorin_precmd_async_pid=0
_prompt_sorin_precmd_async_data=$(mktemp "${TMPDIR:-/tmp}/sorin-prompt-async-XXXXXXXXXX") _prompt_sorin_precmd_async_data=$(mktemp "${TMPDIR:-/tmp}/sorin-prompt-async-XXXXXXXXXX")

@ -32,7 +32,7 @@ function prompt_steeef_precmd {
function prompt_steeef_setup { function prompt_steeef_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent subst) prompt_opts=(cr percent sp subst)
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

Loading…
Cancel
Save