diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_baz | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index e2511c27f..377856a77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-09 Clint Adams <clint@zsh.org> + + * 20951: Completion/Unix/Command/_baz: fix version detection + and baz merge completion. + 2005-03-07 Clint Adams <clint@zsh.org> * 20946: Completion/Linux/Command/_iwconfig: completion for diff --git a/Completion/Unix/Command/_baz b/Completion/Unix/Command/_baz index 9b172f851..525a28848 100644 --- a/Completion/Unix/Command/_baz +++ b/Completion/Unix/Command/_baz @@ -8,7 +8,7 @@ local hide_short # ask the user which version of baz this is if ! zstyle -s ":completion:${curcontext}" baz-version baz_version; then # ask baz instead - baz_version="${${$($BAZ --version)#baz baz-}%% from regexps.com*}" + baz_version="${${$($BAZ --version)#baz Bazaar version }%% \(thelove@canonical.com*}" fi # test whether to hide short options from completion @@ -496,8 +496,8 @@ cmd_new_merges=('::version:_baz_versions') local cmd_branch cmd_branch=(':SOURCE-REVISION:_baz_revisions' ':TAG-VERSION:_baz_versions') -local cmd_star_merge -cmd_star_merge=(':FROM:_baz_revisions') +local cmd_merge +cmd_merge=(':FROM:_baz_revisions') local cmd_missing cmd_whats_missing cmd_missing=('::revision:_baz_revisions') |