diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Type/_baudrates | 16 |
2 files changed, 8 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index e858623e7..753a04267 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,9 @@ Completion/Unix/Command/_screen: Use _baudrates helper instead of _baudrate + * 38421: Completion/Unix/Type/_baudrates: _baudrates: Fit better + into the general completion framework + 2016-05-06 Daniel Shahaf <d.s@daniel.shahaf.name> * 38401: Completion/Debian/Type/_deb_packages: New completion diff --git a/Completion/Unix/Type/_baudrates b/Completion/Unix/Type/_baudrates index 35e55ad09..d0ba1650a 100644 --- a/Completion/Unix/Type/_baudrates +++ b/Completion/Unix/Type/_baudrates @@ -15,10 +15,6 @@ # value in the complete list to generate an arbitrary # sub-set. # -# -t TAG Use TAG as the tag value in _wanted call. -# -# -d DESC Use DESC as the description value in _wanted call. -# # The default complete list of available baud rates is also configurable via # the 'baud-rates' style: # @@ -31,11 +27,11 @@ # zstyle ':completion:*:*:screen:*' min-baud-rate 1200 # zstyle ':completion:*:*:screen:*' baud-rate-filter some_function_name +local tmp +local -a expl rates local -A opts -local expl tag desc tmp -local -a rates -zparseopts -E -A opts u: l: f: d: t: +zparseopts -E -A opts u: l: f: # The following uses a generated list; first find out where the B* macros are # defined: @@ -76,9 +72,7 @@ if (( ${+opts[-f]} )); then done fi -tag=${opts[-t]:-baud-rate} -desc=${opts[-d]:-baud rate} - # -1V removes dupes (which there shouldn't be) and otherwise leaves the # order in the $rates array intact. -_wanted -1V $tag expl $desc compadd -a $expl -- rates +_description -1V baud-rates expl 'baud rate' +compadd "${(@)argv/#-J/-V}" "$expl[@]" -- "${rates[@]}" |