_command_names and path

_command_names and path

[Clint Adams]

_command_names will complete executable files in the current
directory even if "." isn't in the path.  What's the best way to
avoid this?

Re: _command_names and path

[Sven Wischnowsky]

Clint Adams wrote:

> _command_names will complete executable files in the current
> directory even if "." isn't in the path.  What's the best way to
> avoid this?

Probably changing _command_names to use `_files -P/ -W/ ...' if `.' is
not in $path.


Bye
  Sven

-- 
Sven Wischnowsky                           wischnow@berkom.de

Re: _command_names and path

[Clint Adams]

> Probably changing _command_names to use `_files -P/ -W/ ...' if `.' is
> not in $path.

Index: Completion/Zsh/Type/_command_names
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Type/_command_names,v
retrieving revision 1.3
diff -u -r1.3 _command_names
--- Completion/Zsh/Type/_command_names	2001/06/21 09:33:16	1.3
+++ Completion/Zsh/Type/_command_names	2002/01/27 20:42:15
@@ -8,8 +8,17 @@
 
 defs=(
   'commands:external command:compadd -k commands'
-  'executables:executable file or directory:_path_files -/g \*\(-\*\)'
 )
+
+if [[ -n "$path[(r).]" ]]; then
+  defs=( "$defs[@]"
+         'executables:executable file or directory:_path_files -/g \*\(-\*\)'
+  )
+else
+  defs=( "$defs[@]"
+         'executables:executable file or directory:_files -P/ -W/ -/g \*\(-\*\)'
+  )
+fi
 
 if [[ "$1" = -e ]]; then
   shift

Re: _command_names and path

[Sven Wischnowsky]

Clint Adams wrote:

> > Probably changing _command_names to use `_files -P/ -W/ ...' if `.' is
> > not in $path.
> 
> ...
> +
> +if [[ -n "$path[(r).]" ]]; then
> +  defs=( "$defs[@]"
> +         'executables:executable file or directory:_path_files -/g \*\(-\*\)'
> +  )
> +else
> +  defs=( "$defs[@]"
> +         'executables:executable file or directory:_files -P/ -W/ -/g \*\(-\*\)'
> +  )
> +fi

I've been thinking about this, too, at the weekend. We need to
complete files after things like `./<TAB>', too.

So we can make this slightly simpler.

Bye
  Sven

Index: Completion/Zsh/Type/_command_names
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Type/_command_names,v
retrieving revision 1.4
diff -u -r1.4 _command_names
--- Completion/Zsh/Type/_command_names	2002/01/27 21:57:54	1.4
+++ Completion/Zsh/Type/_command_names	2002/01/28 16:31:03
@@ -10,15 +10,10 @@
   'commands:external command:compadd -k commands'
 )
 
-if [[ -n "$path[(r).]" ]]; then
+[[ -n "$path[(r).]" || $PREFIX = */* ]] &&
   defs=( "$defs[@]"
          'executables:executable file or directory:_path_files -/g \*\(-\*\)'
   )
-else
-  defs=( "$defs[@]"
-         'executables:executable file or directory:_files -P/ -W/ -/g \*\(-\*\)'
-  )
-fi
 
 if [[ "$1" = -e ]]; then
   shift

-- 
Sven Wischnowsky                           wischnow@berkom.de