The following commit has been merged in the master branch:
commit 81dd740a576ed9cd9648a33de654e77dae5e29d9
Author: Ville Skyttä <[email protected]>
Date: Fri Nov 25 20:57:03 2011 +0200
vi and friends: Fix /etc/ld.so.conf.d/* completion (Alioth: #312409).
diff --git a/bash_completion b/bash_completion
index 9bd43bd..c239576 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1848,7 +1848,7 @@ _install_xspec '!*.fig' xfig
_install_xspec '!*.@(mid?(i)|cmf)' playmidi
_install_xspec '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)'
timidity
_install_xspec
'!*.@(669|abc|am[fs]|d[bs]m|dmf|far|it|mdl|m[eo]d|mid?(i)|mt[2m]|okta|p[st]m|s[3t]m|ult|umx|wav|xm)'
modplugplay modplug123
-_install_xspec
'*.@(o|so|so.!(conf)|a|[rs]pm|gif|jp?(e)g|mp3|mp?(e)g|avi|asf|ogg|class)' vi
vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
+_install_xspec
'*.@(o|so|so.!(conf|*/*)|a|[rs]pm|gif|jp?(e)g|mp3|mp?(e)g|avi|asf|ogg|class)'
vi vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
_install_xspec '!*.@(zip|z|gz|tgz)' bzme
# konqueror not here on purpose, it's more than a web/html browser
_install_xspec '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx
opera galeon dillo elinks amaya firefox mozilla-firefox iceweasel google-chrome
chromium-browser epiphany
diff --git a/test/completion/vi.exp b/test/completion/vi.exp
new file mode 100644
index 0000000..b019140
--- /dev/null
+++ b/test/completion/vi.exp
@@ -0,0 +1 @@
+assert_source_completions vi
diff --git a/test/fixtures/_filedir/a b/i
b/test/fixtures/shared/ld.so.conf.d/foo.txt
similarity index 100%
copy from test/fixtures/_filedir/a b/i
copy to test/fixtures/shared/ld.so.conf.d/foo.txt
diff --git a/test/fixtures/_filedir/a b/i
b/test/fixtures/shared/ld.so.conf.d/libfoo.conf
similarity index 100%
copy from test/fixtures/_filedir/a b/i
copy to test/fixtures/shared/ld.so.conf.d/libfoo.conf
diff --git a/test/fixtures/_filedir/a b/i
b/test/fixtures/shared/ld.so.conf.d/libfoo.so
similarity index 100%
copy from test/fixtures/_filedir/a b/i
copy to test/fixtures/shared/ld.so.conf.d/libfoo.so
diff --git a/test/fixtures/_filedir/a b/i
b/test/fixtures/shared/ld.so.conf.d/libfoo.so.1
similarity index 100%
copy from test/fixtures/_filedir/a b/i
copy to test/fixtures/shared/ld.so.conf.d/libfoo.so.1
diff --git a/test/lib/completions/cpio.exp b/test/lib/completions/vi.exp
similarity index 54%
copy from test/lib/completions/cpio.exp
copy to test/lib/completions/vi.exp
index 93f6f3c..db3e3de 100644
--- a/test/lib/completions/cpio.exp
+++ b/test/lib/completions/vi.exp
@@ -11,15 +11,11 @@ proc teardown {} {
setup
-assert_complete_any "cpio --"
-
-
+assert_complete_any "vi "
sync_after_int
-assert_complete [exec bash -c "compgen -A user"] "cpio -R "
-
-
+assert_complete {libfoo.conf foo.txt} "vi
$::srcdir/fixtures/shared/ld.so.conf.d/"
sync_after_int
--
bash-completion
_______________________________________________
Bash-completion-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
