bind: Add option and argument (non-)completions

bash_completion

@@ -73,9 +73,6 @@ complete -A helptopic help
 # unalias completes with aliases
 complete -a unalias
 
-# bind completes with readline bindings (make this more intelligent)
-complete -A binding bind
-
 # type and which complete on commands
 complete -c command type which
 

completions/Makefile.am

@@ -27,6 +27,7 @@ bashcomp_DATA = 2to3 \
 		autoscan \
 		avctrl \
 		badblocks \
+		bind \
 		bk \
 		brctl \
 		btdownloadheadless.py \

completions/bind

@@ -0,0 +1,36 @@
+# bash bind completion                                     -*- shell-script -*-
+
+_bind()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        -l|-p|-P|-s|-S|-v|-V|-r|-x|-X)
+            return
+            ;;
+        -m)
+            COMPREPLY=( $( compgen -W "emacs emacs-standard emacs-meta
+                emacs-ctlx vi vi-move vi-command vi-insert" -- "$cur" ) )
+            return
+            ;;
+        -f)
+            _filedir
+            return
+            ;;
+        -q|-u)
+            COMPREPLY=( $( compgen -W '$( "$1" -l )' -- "$cur" ) )
+            return
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_usage "$1" )' -- "$cur" ) )
+        return
+    fi
+
+    COMPREPLY=( $( compgen -A binding -- "$cur" ) )
+} &&
+complete -F _bind bind
+
+# ex: filetype=sh

test/completion/bind.exp

@@ -0,0 +1 @@
+assert_source_completions bind

test/lib/completions/bind.exp

@@ -0,0 +1,21 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "bind -"
+sync_after_int
+
+assert_complete_any "bind k"
+sync_after_int
+
+
+teardown