_oldlist and _complete_help oddities

_oldlist and _complete_help oddities

[Andrej Borsenkow]

bor@itsrm2% ls <TAB>
bor@itsrm2% ls
Completing file
CVS/            ChangeLog       ChangeLog.3.0   Completion/     Config/
Doc/            Etc/            Functions/      INSTALL         LICENCE
META-FAQ        Makefile        Makefile.in     Misc/           README
Src/            StartupFiles/   Test/           Util/
acconfig.h
aclocal.m4      aczsh.m4        config.cache    config.guess*   config.h
config.h.in     config.log      config.status*  config.sub*
configure*
configure.in    install-sh*     mkinstalldirs*  stamp-h
stamp-h.in
bor@itsrm2% ls ^Xh
Completing file
CVS/            ChangeLog       ChangeLog.3.0   Completion/     Config/
Doc/            Etc/            Functions/      INSTALL         LICENCE
META-FAQ        Makefile        Makefile.in     Misc/           README
Src/            StartupFiles/   Test/           Util/
acconfig.h
aclocal.m4      aczsh.m4        config.cache    config.guess*   config.h
config.h.in     config.log      config.status*  config.sub*
configure*
configure.in    install-sh*     mkinstalldirs*  stamp-h
stamp-h.in

List is not redrawn.

bor@itsrm2% zstyle -L
zstyle ':completion:*' completer _oldlist _complete _match
zstyle :completion::approximate: max-errors 3
zstyle ':completion:*' menu 'select=0'
zstyle ':completion:*::::default' list-colors ''
zstyle ':completion:*:match:*' original yes
zstyle ':completion:*:match:*' insert-unambiguous yes
zstyle ':completion:*:paths' ambiguous yes
zstyle ':completion:*:oldlist' list _match
zstyle ':completion:*' list-rows-first yes
zstyle ':completion:*:(directories|(globbed-|all-|)files)' matcher
'r:|[.-]=**'
zstyle ':completion:*' group-name ''
zstyle ':completion:*:descriptions' format 'Completing %d'

-andrej

Have a nice DOS!
B >>

Re: _oldlist and _complete_help oddities

[Sven Wischnowsky]

Andrej Borsenkow wrote:

> bor@itsrm2% ls <TAB>
> bor@itsrm2% ls
> ...
> bor@itsrm2% ls ^Xh
> Completing file
> CVS/            ChangeLog       ChangeLog.3.0   Completion/     Config/
> ...
> 
> List is not redrawn.

Oops. _oldlist should not only ignore the list from _complete_help, it 
should also avoid to re-use an old list if _complete_help is called.

And now the tests there really make me think that there has to be a
cleaner way...

Bye
 Sven

Index: Completion/Core/_oldlist
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Core/_oldlist,v
retrieving revision 1.3
diff -u -r1.3 _oldlist
--- Completion/Core/_oldlist	2000/04/11 09:40:13	1.3
+++ Completion/Core/_oldlist	2000/04/11 10:39:22
@@ -14,7 +14,7 @@
 # completer named by the oldlist_list key.
 
 if [[ -n $compstate[old_list] && $list != never &&
-      $LASTWIDGET != _complete_help ]]; then
+      $LASTWIDGET != _complete_help && $WIDGET != _complete_help ]]; then
   if [[ $WIDGET = *list* && ( $list = always || $list != shown ) ]]; then
     compstate[old_list]=keep
     return 0
@@ -35,7 +35,7 @@
 # existing list (even if it was generated by another widget).
 
 if [[ -z $compstate[old_insert] && -n $compstate[old_list] &&
-      $LASTWIDGET != _complete_help ]]; then
+      $LASTWIDGET != _complete_help && $WIDGET != _complete_help ]]; then
   compstate[old_list]=keep
   return 0
 elif [[ $WIDGET = *complete(|-prefix|-word) ]] &&

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de