diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/compinit | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index e0a3e1324..cb321790e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-05-18 Peter Stephenson <p.w.stephenson@ntlworld.com> + * unposted: Completion/compinit: fix unwanted output from + typeset. + * 25068: Completion/compinit: fix some warnings with WARN_CREATE_GLOBAL. diff --git a/Completion/compinit b/Completion/compinit index de19390a1..b577b6dc3 100644 --- a/Completion/compinit +++ b/Completion/compinit @@ -118,12 +118,11 @@ typeset -gA _compautos typeset -gA _lastcomp # Remember dumpfile. -typeset -g _comp_dumpfile if [[ -n $_i_dumpfile ]]; then # Explicitly supplied dumpfile. - _comp_dumpfile="$_i_dumpfile" + typeset -g _comp_dumpfile="$_i_dumpfile" else - _comp_dumpfile="${ZDOTDIR:-$HOME}/.zcompdump" + typeset -g comp_dumpfile="${ZDOTDIR:-$HOME}/.zcompdump" fi # The standard options set in completion functions. @@ -160,8 +159,7 @@ _comp_options=( # have a valid stdin descriptor (zle closes it before calling widgets) # and don't get confused by user's ZERR trap handlers. -typeset -g _comp_setup -_comp_setup='setopt localoptions localtraps ${_comp_options[@]}; +typeset -g _comp_setup='setopt localoptions localtraps ${_comp_options[@]}; local IFS=$'\'\ \\t\\r\\n\\0\'' exec </dev/null; trap - ZERR |