diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2011-03-11 18:26:02 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2011-03-11 18:26:02 +0000 |
| commit | 336836987fda996158835551942efee01ac8fac2 (patch) | |
| tree | 7eb4dd40a959bf6959859a8261753b36f3fdeb30 | |
| parent | f2dca9e155f25ee57f15df7dc2dc81489e1abbae (diff) | |
| download | zsh-336836987fda996158835551942efee01ac8fac2.tar.gz zsh-336836987fda996158835551942efee01ac8fac2.tar.xz zsh-336836987fda996158835551942efee01ac8fac2.zip | |
fix completion funny with dynamic directories
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Zsh/Context/_dynamic_directory_name | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index bdbc02d84..237578f2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-03-11 Peter Stephenson <pws@csr.com> + * unposted: Completion/Zsh/Context/_dynamic_directory_name: + Mikael spotted that completion doesn't work if + $zsh_directory_name_functions is set but zsh_directory_name + isn't defined. + * users/15864: Completion/Zsh/Context/_dynamic_directory_name, Doc/Zsh/contrib.yo, Doc/Zsh/expn.yo, Functions/Chpwd/.distfiles, Functions/Chpwd/zsh_directory_name_cdr, @@ -14322,5 +14327,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5219 $ +* $Revision: 1.5220 $ ***************************************************** diff --git a/Completion/Zsh/Context/_dynamic_directory_name b/Completion/Zsh/Context/_dynamic_directory_name index fbea15a7a..f449c3b12 100644 --- a/Completion/Zsh/Context/_dynamic_directory_name +++ b/Completion/Zsh/Context/_dynamic_directory_name @@ -5,7 +5,7 @@ integer ret=1 if [[ -n $functions[zsh_directory_name] || \ ${+zsh_directory_name_functions} -ne 0 ]] ; then - zsh_directory_name c && ret=0 + [[ -n $functions[zsh_directory_name] ]] && zsh_directory_name c && ret=0 for func in $zsh_directory_name_functions; do $func c && ret=0 done |