diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-03-28 15:00:46 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-03-28 15:00:46 +0000 |
| commit | 0390d69f27554935e0f84b33982ae3739e75fa76 (patch) | |
| tree | f429e737eadd80b962b3fd965c343dadf81ea967 | |
| parent | 109c0f20f8f5351f55f023c2447c6750921b2998 (diff) | |
| download | zsh-0390d69f27554935e0f84b33982ae3739e75fa76.tar.gz zsh-0390d69f27554935e0f84b33982ae3739e75fa76.tar.xz zsh-0390d69f27554935e0f84b33982ae3739e75fa76.zip | |
24776: clarify compinit message when compaudit fails
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/compinit | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3eac24b12..15e0fb30a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-03-28 Peter Stephenson <pws@csr.com> + * 24776: Completion/compinit: clarify the message printed + when compaudit finds problems. + * 24775: Completion/Zsh/Command/_cd, Doc/Zsh/compsys.yo: improve option handling. diff --git a/Completion/compinit b/Completion/compinit index 2942f435d..a4edd2449 100644 --- a/Completion/compinit +++ b/Completion/compinit @@ -417,8 +417,9 @@ if [[ -n "$_i_check" ]]; then if ! eval compaudit; then if [[ -n "$_i_q" ]]; then if [[ "$_i_fail" = ask ]]; then - if ! read -q "?Ignore insecure $_i_q and continue [ny]? "; then - print -u2 "run compaudit to see list of insecure $_i_q" + if ! read -q \ +"?zsh compinit: insecure $_i_q, run compaudit for list. +Ignore insecure $_i_q and continue [y] or abort compinit [n]? "; then print -u2 "$0: initialization aborted" unfunction compinit compdef unset _comp_dumpfile _comp_secure compprefuncs comppostfuncs \ |