diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2000-04-28 09:31:54 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2000-04-28 09:31:54 +0000 |
| commit | bcb9190ff95501972232dbd47f734a3a33d0323c (patch) | |
| tree | b40dfffb181fface2b8cbe4094f6b6d3814c8fc0 | |
| parent | b19f915a4f3a986bd48b32e16cda0ea2cb5acbe7 (diff) | |
| download | zsh-bcb9190ff95501972232dbd47f734a3a33d0323c.tar.gz zsh-bcb9190ff95501972232dbd47f734a3a33d0323c.tar.xz zsh-bcb9190ff95501972232dbd47f734a3a33d0323c.zip | |
10999: compinstall fixes
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Core/compinstall | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 6be546983..15a7ddca2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-04-28 Peter Stephenson <pws@cambridgesiliconradio.com> + + * pws: 10999: Completion/Core/compinstall: some idiot didn't + get searching of alternative files for definitions to work properly. + 2000-04-28 Sven Wischnowsky <wischnow@informatik.hu-berlin.de> * 10992: Src/Zle/complist.c: avoid wrapping around both diff --git a/Completion/Core/compinstall b/Completion/Core/compinstall index 78579b9ec..ad266eb59 100644 --- a/Completion/Core/compinstall +++ b/Completion/Core/compinstall @@ -69,9 +69,19 @@ If you have some already defined by compinstall, edit the name of the file where these can be found. Note that this will only work if they are exactly the form in which compinstall inserted them. If you leave the line as it is, or empty, I won't search." - vared -ch -p 'file> ' newifile - [[ -z $newifile || $ifile = $newifile ]] && foundold=false + while true; do + vared -ch -p 'file> ' newifile + if [[ -n $newifile && $ifile != $newifile ]]; then + if __ci_test_ifile $newifile; then + foundold=true + break + fi + print "I couldn't find any definitions there. Edit a new filename, or +leave the line blank to ignore it." + fi + done fi +ifile=$newifile if [[ $foundold = true ]]; then sed -n "/^[ ]*$startline/,/^[ ]*$endline/p" $ifile | |