diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2016-08-28 18:17:25 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2016-08-29 15:57:36 +0200 |
| commit | 44a820f1c5dce90d07f6cf2e2af3348bee52fa13 (patch) | |
| tree | d36077bc0380d21064d4fc347357a9ef06d18f4d | |
| parent | 1f00f683670027579b01f8bc1d7b7e2f4496e7b2 (diff) | |
| download | zsh-44a820f1c5dce90d07f6cf2e2af3348bee52fa13.tar.gz zsh-44a820f1c5dce90d07f6cf2e2af3348bee52fa13.tar.xz zsh-44a820f1c5dce90d07f6cf2e2af3348bee52fa13.zip | |
39112: _x_utils: Use state_descr
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Completion/X/Command/_x_utils | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 16d29cb46..2d9ac8133 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-08-29 Mikael Magnusson <mikachu@gmail.com> + + * 39112: Completion/X/Command/_x_utils: Use state_descr + 2016-08-27 Daniel Shahaf <d.s@daniel.shahaf.name> * 39105: Completion/Unix/Type/_absolute_command_paths: diff --git a/Completion/X/Command/_x_utils b/Completion/X/Command/_x_utils index 9364235a9..ebc6aacbf 100644 --- a/Completion/X/Command/_x_utils +++ b/Completion/X/Command/_x_utils @@ -1,6 +1,6 @@ #compdef xdpyinfo xwininfo xkill xfontsel xfd xev xhost xon xsetroot xwd xwud xrdb xprop xlsatoms xlsclients -local curcontext="$curcontext" state line expl ret=1 +local curcontext="$curcontext" state state_descr line expl ret=1 case "$service" in xdpyinfo) @@ -26,10 +26,10 @@ xprop) '-font[display the properties of a font]:font: _x_font' \ '-len[show at most n bytes of any property]:n' \ '*-fs[read more property formats from file]:file: _files' \ - '*-remove[specify an atom to remove from the target window]:atoms:->atoms' \ - '*-set[specify an atom and a value to set on the target window]:atoms:->atoms:value' \ - '*-f:atoms:->atoms:format: ::dformat' \ - '*:atoms:->atoms' + '*-remove[specify an atom to remove from the target window]:property atom:->atoms' \ + '*-set[specify an atom and a value to set on the target window]:property atom:->atoms:value' \ + '*-f:property atom:->atoms:format: ::dformat' \ + '*:property atoms:->atoms' ;; xlsatoms) _x_arguments -C \ @@ -199,7 +199,7 @@ xrdb) esac && ret=0 if [[ $state == atoms ]]; then - _wanted atoms expl atoms compadd ${${(f)"$(_call_program atoms xlsatoms 2> /dev/null)"}#*$'\t'} && ret=0 + _wanted atoms expl "$state_descr" compadd ${${(f)"$(_call_program atoms xlsatoms 2> /dev/null)"}#*$'\t'} && ret=0 fi return ret |