diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-11-03 09:06:17 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-11-03 09:06:17 +0000 |
| commit | 51cb3f0a27ea185be2d703be822b2b4b23eba0b7 (patch) | |
| tree | 5db1bf8f6c42192fcf99306695b4e9ce715322d6 /Functions | |
| parent | 5a78f7af98401d4974b52b844994e4d783592b16 (diff) | |
| download | zsh-51cb3f0a27ea185be2d703be822b2b4b23eba0b7.tar.gz zsh-51cb3f0a27ea185be2d703be822b2b4b23eba0b7.tar.xz zsh-51cb3f0a27ea185be2d703be822b2b4b23eba0b7.zip | |
zsh-3.1.6-bart-8 zsh-3.1.6-bart-8
Diffstat (limited to 'Functions')
| -rw-r--r-- | Functions/Prompts/.distfiles | 2 | ||||
| -rw-r--r-- | Functions/Prompts/promptinit | 19 | ||||
| -rw-r--r-- | Functions/Zle/predict-on | 7 |
3 files changed, 10 insertions, 18 deletions
diff --git a/Functions/Prompts/.distfiles b/Functions/Prompts/.distfiles index 81b4f2c07..2c8ff8497 100644 --- a/Functions/Prompts/.distfiles +++ b/Functions/Prompts/.distfiles @@ -5,5 +5,5 @@ DISTFILES_SRC=' prompt_fire_setup prompt_suse_setup prompt_blue_setup prompt_green_setup prompt_white_setup prompt_combo_setup prompt_magenta_setup prompt_yellow_setup prompt_cyan_setup - prompt_off_setup promptinit + prompt_oliver_setup prompt_off_setup promptinit ' diff --git a/Functions/Prompts/promptinit b/Functions/Prompts/promptinit index 285b9e4d9..c249412cf 100644 --- a/Functions/Prompts/promptinit +++ b/Functions/Prompts/promptinit @@ -106,21 +106,12 @@ Options: } prompt () { - local -A prompt_opts - local opt - + local prompt_opts + set_prompt "$@" - - # Set prompt options - for opt in ${(k)prompt_opts}; do - if [[ $prompt_opts[$opt] != (|un)set ]]; then - echo "${0##*/}: value of prompt option must be 'set' or 'unset'" >&2 - return 1 - else - $prompt_opts[$opt]opt prompt$opt - fi - done + + (( $#prompt_opts )) && + setopt noprompt{bang,cr,percent,subst} prompt${^prompt_opts[@]} } promptinit "$@" - diff --git a/Functions/Zle/predict-on b/Functions/Zle/predict-on index 7c4133560..3a81cb3c6 100644 --- a/Functions/Zle/predict-on +++ b/Functions/Zle/predict-on @@ -59,7 +59,8 @@ insert-and-predict () { zle complete-word ${(s.:.)compconfig[predict_completer]} # Decide where to leave the cursor. The dummy loop is used to # get out of that `case'. - while true; do + repeat 1 + do case $compconfig[predict_cursor] in (complete) # At the place where the completion left it, if it is after @@ -69,7 +70,8 @@ insert-and-predict () { (key) # Or maybe at the n'th occurrence of the character typed. pos=${BUFFER[(in:nchar:)${KEYS[-1]}]} - if [[ pos -gt curs ]]; then + if [[ pos -gt curs ]] + then CURSOR=$pos break fi @@ -78,7 +80,6 @@ insert-and-predict () { # Or else at the previous position. CURSOR=$curs esac - break done fi fi |