summary refs log tree commit diff
path: root/Completion/Unix
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2005-03-09 02:03:50 +0000
committerClint Adams <clint@users.sourceforge.net>2005-03-09 02:03:50 +0000
commit1f9166d4e1e666248efd5d6f0f44a97bf226c281 (patch)
treeeb59bc7da04ed9ba99fd0f8aeef43852441345ba /Completion/Unix
parent8d906d28225b7edc63d27232b9cb3e28d5df52ee (diff)
downloadzsh-1f9166d4e1e666248efd5d6f0f44a97bf226c281.tar.gz
zsh-1f9166d4e1e666248efd5d6f0f44a97bf226c281.tar.xz
zsh-1f9166d4e1e666248efd5d6f0f44a97bf226c281.zip
* 20951: Completion/Unix/Command/_baz: fix version detection and baz merge completion.
Diffstat (limited to 'Completion/Unix')
-rw-r--r--Completion/Unix/Command/_baz6
1 files changed, 3 insertions, 3 deletions
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')