From 493c7e087981036ae2db67eb5b8e86db80b77917 Mon Sep 17 00:00:00 2001 From: Frank Terbeck Date: Sun, 1 May 2016 15:27:32 +0200 Subject: 38388: Refactor baud rate completion This adds a new helper function _baudrate and uses it in place of private solutions in various existing completions. --- Completion/Unix/Command/_gdb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Completion/Unix/Command/_gdb') diff --git a/Completion/Unix/Command/_gdb b/Completion/Unix/Command/_gdb index e9c333925..d5eed5ae4 100644 --- a/Completion/Unix/Command/_gdb +++ b/Completion/Unix/Command/_gdb @@ -37,9 +37,7 @@ else (-[csx]) _files && return 0 ;; (-e) _description files expl executable _files "$expl[@]" -g '*(-*)' && return 0 ;; - (-b) _wanted -V values expl 'baud rate' \ - compadd 0 50 75 110 134 150 200 300 600 1200 1800 2400 4800 \ - 9600 19200 38400 57600 115200 230400 && return 0 ;; + (-b) _baudrate && return 0 ;; esac w=( "${(@)words[2,-1]}" ) -- cgit v1.2.3 From 795b285ce8b8e8baf26272f2c7c459334bca5f9d Mon Sep 17 00:00:00 2001 From: Frank Terbeck Date: Sun, 8 May 2016 00:09:13 +0200 Subject: 38424: Use _baudrates helper instead of _baudrate --- ChangeLog | 5 +++++ Completion/BSD/Command/_cu | 2 +- Completion/Unix/Command/_gdb | 2 +- Completion/Unix/Command/_joe | 2 +- Completion/Unix/Command/_picocom | 2 +- Completion/Unix/Command/_screen | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) (limited to 'Completion/Unix/Command/_gdb') diff --git a/ChangeLog b/ChangeLog index 953c9aa71..e858623e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,11 @@ * 38426: Completion/Unix/Type/_baudrates: _baudrates: Use 2 space indentation + * 38424: Completion/BSD/Command/_cu, Completion/Unix/Command/_gdb, + Completion/Unix/Command/_joe, Completion/Unix/Command/_picocom, + Completion/Unix/Command/_screen: Use _baudrates helper instead of + _baudrate + 2016-05-06 Daniel Shahaf * 38401: Completion/Debian/Type/_deb_packages: New completion diff --git a/Completion/BSD/Command/_cu b/Completion/BSD/Command/_cu index 4b9f25d1f..ec7950125 100644 --- a/Completion/BSD/Command/_cu +++ b/Completion/BSD/Command/_cu @@ -3,5 +3,5 @@ _arguments -s -A '-*' \ '-d[do not block waiting for a carrier to be detected]' \ '-l[line to use]:line:(/dev/(cuaU#<->|ttyS<->)(N%c))' \ - '-s[line speed]:line speed:_baudrate -d "line speed"' \ + '-s[line speed]:line speed:_baudrates -d "line speed"' \ '(-*)1:host:' diff --git a/Completion/Unix/Command/_gdb b/Completion/Unix/Command/_gdb index d5eed5ae4..510e6f1fa 100644 --- a/Completion/Unix/Command/_gdb +++ b/Completion/Unix/Command/_gdb @@ -37,7 +37,7 @@ else (-[csx]) _files && return 0 ;; (-e) _description files expl executable _files "$expl[@]" -g '*(-*)' && return 0 ;; - (-b) _baudrate && return 0 ;; + (-b) _baudrates && return 0 ;; esac w=( "${(@)words[2,-1]}" ) diff --git a/Completion/Unix/Command/_joe b/Completion/Unix/Command/_joe index 91c437ead..592c34a10 100644 --- a/Completion/Unix/Command/_joe +++ b/Completion/Unix/Command/_joe @@ -3,7 +3,7 @@ _arguments \ '-asis[characters with codes >127 will be displayed non-inverted]' \ '-backpath[backup file directory]:backup file directory:_files -/' \ - '-baud[inserts delays for baud rates below 19200]:baud rate:_baudrate' \ + '-baud[inserts delays for baud rates below 19200]:baud rate:_baudrates' \ '-beep[beep on command errors or when cursor goes past extremes]' \ '-columns[sets the number of screen columns]:num of columns' \ '-csmode[continued search mode]' \ diff --git a/Completion/Unix/Command/_picocom b/Completion/Unix/Command/_picocom index c9d3be0e0..4b8b3ea2e 100644 --- a/Completion/Unix/Command/_picocom +++ b/Completion/Unix/Command/_picocom @@ -32,7 +32,7 @@ function _picocom_escape () { function _picocom () { local -a args - args=( '(--baud -b)'{--baud,-b}'[define baud-rate to set the terminal to]:baud rate:_baudrate' + args=( '(--baud -b)'{--baud,-b}'[define baud-rate to set the terminal to]:baud rate:_baudrates' '(--flow -f)'{--flow,-f}'[define type of flow control to use]:flow control:_picocom_flowcontrol' '(--parity -p)'{--parity,-p}'[define type of parity to use]:parity mode:_picocom_paritymode' '(--databits -d)'{--databits,-d}'[define the number of databits per word]:data bits:_picocom_databits' diff --git a/Completion/Unix/Command/_screen b/Completion/Unix/Command/_screen index f4d2ef943..ebc8ba155 100644 --- a/Completion/Unix/Command/_screen +++ b/Completion/Unix/Command/_screen @@ -99,7 +99,7 @@ if [[ -n $state ]]; then if (( CURRENT == 1 )) && [[ $PREFIX == /dev/* ]]; then _path_files -g '*(%)' elif (( CURRENT == 2 )) && [[ ${words[1]} == /dev/* ]]; then - _baudrate + _baudrates elif (( CURRENT > 2 )) && [[ ${words[1]} == /dev/* ]]; then _message "no more parameters" else -- cgit v1.2.3