summaryrefslogtreecommitdiff
path: root/Completion/X/Command
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2017-08-10 17:16:37 +0200
committerAxel Beckert <abe@deuxchevaux.org>2017-08-10 17:16:37 +0200
commite3b67a8198c852bf6c9db3a0a1a20e87a4e1da74 (patch)
tree8486633f6232f49ea330ab8e036decb5dc3bbf74 /Completion/X/Command
parentf8edeff2494bf23e2ee29d4c761361b1c878e09d (diff)
parentdc475bfa0ec6cd03789dde3bf28f71e0ea9d5003 (diff)
downloadzsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.tar.gz
zsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.zip
Merge tag '5.4.1' into debian
Release 5.4.1.
Diffstat (limited to 'Completion/X/Command')
-rw-r--r--Completion/X/Command/_setxkbmap4
-rw-r--r--Completion/X/Command/_xclip1
2 files changed, 3 insertions, 2 deletions
diff --git a/Completion/X/Command/_setxkbmap b/Completion/X/Command/_setxkbmap
index d192cc17a..f7310ecdd 100644
--- a/Completion/X/Command/_setxkbmap
+++ b/Completion/X/Command/_setxkbmap
@@ -55,7 +55,7 @@ _setxkbmap_files () {
local dir="$1"
local label="$2"
- local -a fullpath shortpath
+ local -a fullpath shortpath expl
fullpath=($sourcedir/$dir/**/*~*README(.))
shortpath=(${fullpath#$sourcedir\/$dir\/})
@@ -82,7 +82,7 @@ _setxkbmap_geometry () {
(( $+functions[_setxkbmap_variant] )) ||
_setxkbmap_variant () {
local file=$sourcedir/symbols/${1}
- local -a variants lines
+ local -a variants lines expl
if [ ! -f $file ]; then
_message "no such layout: ${1}"
diff --git a/Completion/X/Command/_xclip b/Completion/X/Command/_xclip
index ff131f3b1..509a15b79 100644
--- a/Completion/X/Command/_xclip
+++ b/Completion/X/Command/_xclip
@@ -10,6 +10,7 @@ _arguments \
'(-)'{-h,-help}'[display usage information]' \
'(-selection)-selection[selection to access]:selection:(primary secondary clipboard buffer-cut)' \
"-noutf8[operate in legacy, non-Unicode, mode]" \
+ '(-r -rmlastnl)'{-r,-rmlastnl}'[remove the last newline character if present]' \
'(-)-version[display version information]' \
'(-quiet -verbose)-silent[errors only, run in background]' \
"(-silent -verbose)-quiet[run in foreground, show what's happening]" \