[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-412-gb2add89

[Ville Skyttä]

The following commit has been merged in the master branch:
commit b2add89f4c99d49c1627e5cc084aeabe8b9f0a6f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Jul 22 21:13:55 2011 +0300

    imagemagick: Don't fall through to other completions after successful option argument completion.

diff --git a/completions/imagemagick b/completions/imagemagick
index 5f9f9ec..df605de 100644
--- a/completions/imagemagick
+++ b/completions/imagemagick
@@ -126,6 +126,8 @@ _ImageMagick()
             return 0
             ;;
     esac
+
+    return 1
 }
 
 _convert()
@@ -133,7 +135,7 @@ _convert()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -153,7 +155,7 @@ _mogrify()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -172,7 +174,7 @@ _display()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -191,7 +193,7 @@ _animate()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -209,7 +211,7 @@ _identify()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -226,7 +228,7 @@ _montage()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -244,7 +246,7 @@ _composite()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -262,7 +264,7 @@ _compare()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -279,7 +281,7 @@ _conjure()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -296,7 +298,7 @@ _import()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )
@@ -313,7 +315,7 @@ _stream()
     local cur prev words cword
     _init_completion || return
 
-    _ImageMagick
+    _ImageMagick && return
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" -help )' -- "$cur" ) )

-- 
bash-completion