aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2003-12-05 17:06:50 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2003-12-05 17:06:50 +0000
commit9f60e77f35eae5227e4ec10c8be3e244140bec6a (patch)
tree65bebc0f4bac8ade0dcdb7368bd6c57271682c60
parentf490c7c312fe032287a12a16638ad4f3411b8028 (diff)
downloadzsh-9f60e77f35eae5227e4ec10c8be3e244140bec6a.tar.gz
zsh-9f60e77f35eae5227e4ec10c8be3e244140bec6a.tar.xz
zsh-9f60e77f35eae5227e4ec10c8be3e244140bec6a.zip
Baptiste Daroussin: 19272: small updates
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_chown2
-rw-r--r--Completion/Unix/Command/_links14
-rw-r--r--Completion/X/Command/_mplayer2
4 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 937b47a35..6dd4a5a93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
2003-12-04 Oliver Kiddle <opk@zsh.org>
+ * Baptiste Daroussin: 19272: Completion/Unix/Command/_chown,
+ Completion/Unix/Command/_links, Completion/X/Command/_mplayer:
+ use colon separator on Linux for chown, complete links graphics
+ drivers and more file types for mplayer
+
* unposted: Completion/Unix/Command/_subversion: small addition to
output from `svn help diff' broke substitution for getting options
diff --git a/Completion/Unix/Command/_chown b/Completion/Unix/Command/_chown
index 3b2372319..3db5873d8 100644
--- a/Completion/Unix/Command/_chown
+++ b/Completion/Unix/Command/_chown
@@ -39,7 +39,7 @@ case $state in
else
if compset -S '[.:]*'; then
suf=()
- elif [[ $OSTYPE = (solaris*|hpux*|*bsd*) ]]; then
+ elif [[ $OSTYPE = (solaris*|hpux*|*bsd*|linux*) ]]; then
suf=( -qS ':' )
else
suf=( -qS '.' )
diff --git a/Completion/Unix/Command/_links b/Completion/Unix/Command/_links
index 899c10108..7f2f1dea6 100644
--- a/Completion/Unix/Command/_links
+++ b/Completion/Unix/Command/_links
@@ -8,7 +8,7 @@ _arguments -C \
'(-help)-assume-codepage[use the given codepage when the webpage did not specify its]:codepage:' \
'(-help)-async-dns[asynchronous DNS resolver]:bool:((0\:on 1\:off))' \
'(-help)-download-dir[default download directory]:_files -/' \
- '(-help)-driver[graphics driver to use]:driver:(x svgalib fb pmshell atheos)' \
+ '(-help)-driver[graphics driver to use]:graphics driver:->graphics_drivers' \
'(-help)-dump[dump the page as pure text]' \
'(-help)-format-cache-size[number of formatted document pages cached]:pages:' \
'(-help)-ftp-proxy[host and port number of the FTP proxy, or blank]:hostport:_hosts' \
@@ -27,10 +27,14 @@ _arguments -C \
'(-help)-version[prints the links version number and exit]' \
':url:->html' && ret=0
-case "$state" in
-html)
- _files -g '*.html' || _urls
- return
+case $state in
+ html)
+ _files -g '*.html' || _urls
+ return
+ ;;
+ graphics_drivers)
+ vals=(${=${${${(f)"$(_call_program links-graphics-drivers links -driver help 2>&1)"}[-1]}//','/''}} )
+ _describe -t links-graphics-drivers 'graphics driver' vals && ret=0
;;
esac
diff --git a/Completion/X/Command/_mplayer b/Completion/X/Command/_mplayer
index 9cfa12cd5..c465d283e 100644
--- a/Completion/X/Command/_mplayer
+++ b/Completion/X/Command/_mplayer
@@ -115,7 +115,7 @@ case "$state" in
_tags files urls
while _tags; do
_requested files expl 'video file' _files -g \
- "*.(#i)(avi|mp3|mpg|mpe|mpeg|m1v|mov|asf|vob|mjpg|wma|wmv|asx|qt|rm)" && ret=0
+ "*.(#i)(avi|mp3|mpg|mpe|mpeg|m1v|mov|asf|vob|mjpg|wma|wmv|asx|qt|rm|mkv|mka|ogm|ogg)" && ret=0
if _requested urls; then
while _next_label urls expl url; do
_urls "$expl[@]" && ret=0