From e720f459759ce8e7812cca9dad140ef188432b40 Mon Sep 17 00:00:00 2001 From: Fabian Klotzl Date: Mon, 13 Feb 2017 16:43:05 -0800 Subject: 40539: typo in MIPS branch of argument selection --- Completion/Unix/Command/_gcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Completion/Unix/Command/_gcc') diff --git a/Completion/Unix/Command/_gcc b/Completion/Unix/Command/_gcc index 1276054db..095dede80 100644 --- a/Completion/Unix/Command/_gcc +++ b/Completion/Unix/Command/_gcc @@ -94,7 +94,7 @@ romp) ;; mips*) args=( - '-mcpu=:CPU type:(r2000 r3000 r4000 r4400 r4600 r6000_' + '-mcpu=:CPU type:(r2000 r3000 r4000 r4400 r4600 r6000)' -mabicalls -membedded-data -membedded-pic -mfp32 -mfp64 -mgas -mgp32 -mgp64 -mgpopt -mhalf-pic -mhard-float -mint64 -mips1 -- cgit v1.2.3 From 76f2539e207b97fba86a2c9407e874c0d45862dc Mon Sep 17 00:00:00 2001 From: Ferenc- Date: Tue, 21 Feb 2017 14:58:33 +0100 Subject: unposted (via github): Add newer C++ standard options to _gcc --- ChangeLog | 3 +++ Completion/Unix/Command/_gcc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'Completion/Unix/Command/_gcc') diff --git a/ChangeLog b/ChangeLog index 03201ef96..e42e27782 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2017-03-04 Oliver Kiddle + * unposted (from Ferenc- via github): Completion/Unix/Command/_gcc: + Add newer C++ standard options to gcc completion + * unposted: Completion/Unix/Command/_tmux: complete 'tiled' layout * unposted: Completion/Unix/Command/_xz: fix argument to --format diff --git a/Completion/Unix/Command/_gcc b/Completion/Unix/Command/_gcc index 095dede80..e188c7e9f 100644 --- a/Completion/Unix/Command/_gcc +++ b/Completion/Unix/Command/_gcc @@ -353,7 +353,7 @@ args+=( '-print-file-name=-[Display the full path to library ]:library:->library' '-print-prog-name=-[Display the full path to compiler component ]:program:' '*-specs=-[Override built-in specs with the contents of ]:file:_files' - '-std=-[Assume that the input sources are for ]:standard:(c90 c89 c99 c11 gnu90 gnu89 gnu99 gnu11 c++98 c++03 gnu++98 gnu++03 c++11 gnu++11 c++1y gnu++1y)' + '-std=-[assume that the input sources are for specified standard]:standard:(c90 c89 c99 c11 gnu90 gnu89 gnu99 gnu11 c++98 c++03 gnu++98 gnu++03 c++11 gnu++11 c++1y gnu++1y c++14 gnu++14 c++1z gnu++1z)' '*-include:include file:_files -g \*.h\(-.\)' '*-imacros:macro input file:_files -g \*.h\(-.\)' '*-idirafter:second include path directory:_files -/' -- cgit v1.2.3 From 4a63a1793af5f3046af6a77db8aeeece523ebc61 Mon Sep 17 00:00:00 2001 From: Fabian Klötzl Date: Thu, 13 Jul 2017 11:19:14 +0200 Subject: 41414: fix for commas used in exclusion lists also missing escape for _gcc and --no-index option for git diff --- ChangeLog | 5 +++++ Completion/Linux/Command/_iptables | 4 ++-- Completion/Unix/Command/_gcc | 2 +- Completion/Unix/Command/_git | 9 ++++++++- Etc/completion-style-guide | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) (limited to 'Completion/Unix/Command/_gcc') diff --git a/ChangeLog b/ChangeLog index ad0589fe5..a8e3dede8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-07-14 Oliver Kiddle + * Fabian Klötzl: 41414: Completion/Linux/Command/_iptables, + Completion/Unix/Command/_gcc, Completion/Unix/Command/_git, + Etc/completion-style-guide: fix for commas used in exclusion + lists, missing escape for _gcc and --no-index option for git diff + * 41419: Completion/Unix/Command/_git: update for git 2.13.2 2017-07-13 Peter Stephenson diff --git a/Completion/Linux/Command/_iptables b/Completion/Linux/Command/_iptables index 8f990030c..4178a1a2e 100644 --- a/Completion/Linux/Command/_iptables +++ b/Completion/Linux/Command/_iptables @@ -47,7 +47,7 @@ case ${prev[${prev[(I)-p|--protocol]}+1]}; in esac case ${prev[${prev[(I)-j|--jump]}+1]}; in - DNAT) args+=( '(--to,--to-destination)'{--to,--to-destination}':address:_users-ports' ) ;; + DNAT) args+=( '(--to --to-destination)'{--to,--to-destination}':address:_users-ports' ) ;; DSCP) args+=( '--set-dscp[set the DSCP field]:value' @@ -67,7 +67,7 @@ case ${prev[${prev[(I)-j|--jump]}+1]}; in MARK) args+=( '--set-mark[set fwmark in packet]:number' ) ;; REDIRECT|MASQUERADE) args+=( '--to-ports[port (range) to map to]:port range:_ports' ) ;; REJECT) args+=( '--reject-with[drop packet and send reply]:reject type:->reject-types' ) ;; - SNAT) args+=( '(--to,--to-source)*'{--to,--to-source}'[specify address to map source to]:address:_users-ports' ) ;; + SNAT) args+=( '(--to --to-source)*'{--to,--to-source}'[specify address to map source to]:address:_users-ports' ) ;; TCPMSS) args+=( '--set-mss[explicitly set MSS option]:value' diff --git a/Completion/Unix/Command/_gcc b/Completion/Unix/Command/_gcc index e188c7e9f..28a2ccbda 100644 --- a/Completion/Unix/Command/_gcc +++ b/Completion/Unix/Command/_gcc @@ -428,7 +428,7 @@ args+=( '-Wdisabled-optimization[Warn when an optimization pass is disabled]' '-Wdiv-by-zero[Warn about compile-time integer division by zero]' '-Wdouble-promotion[Warn about implicit conversions from "float" to "double"]' - '-Weffc++[Warn about violations of Effective C++ style rules]' + '-Weffc\+\+[Warn about violations of Effective C++ style rules]' '-Wempty-body[Warn about an empty body in an if or else statement]' '-Wendif-labels[Warn about stray tokens after #elif and #endif]' '-Wenum-compare[Warn about comparison of different enum types]' diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index dcf1f639c..aacd3bfd7 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -756,7 +756,8 @@ _git-diff () { $diff_options \ '(--exit-code)--quiet[disable all output]' \ $diff_stage_options \ - '(--cached --staged)'{--cached,--staged}'[show diff between index and named commit]' \ + '(--cached --staged)--no-index[show diff between two paths on the filesystem]' \ + '(--cached --staged --no-index)'{--cached,--staged}'[show diff between index and named commit]' \ '(-)--[start file arguments]' \ '*:: :->from-to-file' && ret=0 @@ -774,6 +775,12 @@ _git-diff () { return ret fi + # If "--no-index" was given, only file paths need to be completed. + if [[ -n ${opt_args[(I)--no-index]} ]]; then + _alternative 'files::_files' && ret=0 + return ret + fi + # Otherwise, more complex conditions need to be checked. case $CURRENT in (1) diff --git a/Etc/completion-style-guide b/Etc/completion-style-guide index e91e92307..a6fc737a7 100644 --- a/Etc/completion-style-guide +++ b/Etc/completion-style-guide @@ -64,7 +64,7 @@ tells _wanted where to put options specifying the `directory' description. Where two matches have identical meaning, give them the same description so that the completion system can group them together. Conventionally a brace expansion of this form is used: - '(--context,-C)'{--context=,-C-}'[specify lines of context]:lines' + '(--context -C)'{--context=,-C-}'[specify lines of context]:lines' You won't need the exclusion list if the option can be specified multiple times. It can also be useful to use the same description for matches which are completely opposite in their meaning if it shortens -- cgit v1.2.3