__load_completion: Load "xspec" completions dynamically too

Allows overriding these completions by placing alternate ones to
separate completion files.

Closes #192

bash_completion

@@ -1957,7 +1957,6 @@ _install_xspec()
     for cmd in $@; do
         _xspecs[$cmd]=$xspec
     done
-    complete -F _filedir_xspec $@
 }
 # bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510
 _install_xspec '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat lbunzip2 lbzcat
@@ -2055,6 +2054,9 @@ __load_completion()
         done
     done
 
+    # Look up simple "xspec" completions
+    [[ "${_xspecs[$cmd]}" ]] && complete -F _filedir_xspec "$cmd" && return 0
+
     return 1
 }
 

test/completion/acroread.exp

@@ -1,3 +1 @@
-assert_xspec_completion_installed acroread
-
-source "$::srcdir/lib/completions/acroread.exp"
+assert_source_completions acroread

test/completion/kdvi.exp

@@ -1,3 +1 @@
-assert_xspec_completion_installed kdvi
-
-source "$::srcdir/lib/completions/kdvi.exp"
+assert_source_completions kdvi

test/completion/kpdf.exp

@@ -1,3 +1 @@
-assert_xspec_completion_installed kpdf
-
-source "$::srcdir/lib/completions/kpdf.exp"
+assert_source_completions kpdf

test/completion/vi.exp

@@ -1,3 +1 @@
-assert_xspec_completion_installed vi
-
-source "$::srcdir/lib/completions/vi.exp"
+assert_source_completions vi

test/lib/library.exp

@@ -602,21 +602,6 @@ proc assert_source_completions {command {file ""}} {
 }
 
 
-# Assert that a _filedir_xspec completion is installed for specified command
-# @param string $command  Command to check completion installation for.
-proc assert_xspec_completion_installed {command} {
-    set test "Completion via _filedir_xspec() should be installed"
-    set cmd "complete -p $command"
-    send "$cmd\r"
-
-    set expected "^$cmd\r\ncomplete -F _filedir_xspec $command\r\n/@$"
-    expect {
-        -re $expected { pass "$test" }
-        -re /@ { fail "$test at prompt" }
-    }
-}
-
-
 # Sort list.
 # `exec sort' is used instead of `lsort' to achieve exactly the
 #  same sort order as in bash.