summaryrefslogtreecommitdiff
path: root/Completion/X/Command
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2012-02-21 21:52:09 +0100
committerAxel Beckert <abe@deuxchevaux.org>2012-02-21 21:52:55 +0100
commitb561eedd8b1d70a2b3339d167348771f1a8fc5c7 (patch)
treea7d7d32a90f391767a921a5fcdb59551cdffa04e /Completion/X/Command
parent340a3b41e51e3f39249a9e28f0615b063f073a3c (diff)
parent5f25bb8223d090d13af5869893fa35e5b8c44182 (diff)
downloadzsh-b561eedd8b1d70a2b3339d167348771f1a8fc5c7.tar.gz
zsh-b561eedd8b1d70a2b3339d167348771f1a8fc5c7.zip
New upstream release
Merge branch 'upstream' into debian
Diffstat (limited to 'Completion/X/Command')
-rw-r--r--Completion/X/Command/.distfiles1
-rw-r--r--Completion/X/Command/_mplayer6
-rw-r--r--Completion/X/Command/_xclip14
-rw-r--r--Completion/X/Command/_xterm1
4 files changed, 19 insertions, 3 deletions
diff --git a/Completion/X/Command/.distfiles b/Completion/X/Command/.distfiles
index 3b6dc49fa..c6835ea54 100644
--- a/Completion/X/Command/.distfiles
+++ b/Completion/X/Command/.distfiles
@@ -20,6 +20,7 @@ _urxvt
_vnc
_x_utils
_xauth
+_xclip
_xdvi
_xfig
_xloadimage
diff --git a/Completion/X/Command/_mplayer b/Completion/X/Command/_mplayer
index 85c4f6d12..81669fc1c 100644
--- a/Completion/X/Command/_mplayer
+++ b/Completion/X/Command/_mplayer
@@ -115,12 +115,12 @@ case "$state" in
_tags files urls
while _tags; do
_requested files expl 'video file' _files -g \
- "*.(#i)(asf|asx|avi|flac|flv|m1v|m2p|m2v|m4v|mjpg|mka|mkv|mov|mp3|mp4|mpe|mpeg|mpg|ogg|ogm|qt|rm|vob|wav|webm|wma|wmv)(-.)" && ret=0
+ "*.(#i)(asf|asx|avi|flac|flv|m1v|m2p|m2v|m4v|mjpg|mka|mkv|mov|mp3|mp4|mpe|mpeg|mpg|ogg|ogm|qt|rm|vob|wav|webm|wma|wmv)(-.)" && ret=0
if _requested urls; then
while _next_label urls expl URL; do
_urls "$expl[@]" && ret=0
- compadd -S '' "$expl[@]" {dvd,vcd,cdda,cddb,tv}:// && ret=0
- done
+ compadd -S '' "$expl[@]" {dvd,vcd,cdda,cddb,tv}:// && ret=0
+ done
fi
(( ret )) || return 0
done
diff --git a/Completion/X/Command/_xclip b/Completion/X/Command/_xclip
new file mode 100644
index 000000000..759251c28
--- /dev/null
+++ b/Completion/X/Command/_xclip
@@ -0,0 +1,14 @@
+#compdef xclip
+
+_arguments \
+ '(-i -in -o -out)'{-i,-in}'[Read text into X selection]' \
+ '(-i -in -o -out)'{-o,-out}'[Print selection to standard out]' \
+ {-l,-loops}'[Number of selection requests to wait before exiting]:number:' \
+ {-d,-display}'[X display to connect to]:X11 display:' \
+ '(-)'{-h,-help}'[Usage information]' \
+ '(-selection)-selection[Selection to access]:selection:(primary secondary clipboard buffer-cut)' \
+ $'-noutf8[Use old Unicode, don\'t treat text as UTF-8]' \
+ '(-)-version[version information]' \
+ '(-quiet -verbose)-silent[Errors only, run in background]' \
+ $'(-silent -verbose)-quiet[Run in foreground, show what\'s happening]' \
+ '(-silent -quiet)-verbose[Running commentary]'
diff --git a/Completion/X/Command/_xterm b/Completion/X/Command/_xterm
index a246ab48e..7619b280a 100644
--- a/Completion/X/Command/_xterm
+++ b/Completion/X/Command/_xterm
@@ -9,6 +9,7 @@ _xt_arguments \
'-cc:character class:' \
'-cr:text cursor color:_x_color' \
'-e:program: _command_names -e:*::program arguments: _normal' \
+ '-fa:font pattern:_xft_fonts' \
'-fb:bold font:_x_font' \
'-fi:icon font:_x_font' \
'-hc:background color for highlighted text:_x_color' \