From 7ad0001183688c56bd1edfc8fc08467e380910a4 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 28 Sep 2016 17:46:37 +0000 Subject: 39479 + 39481 minus _path_files hunk (see 39489): Completion: audit 'compset -P' calls to use shortest match where applicable, plus random drive-by tweaks. Found by grepping for patterns that can match needles of various lengths: :grep 'compset -[PS].*[\#^*()\|<>?~\]' Completion/ --- Completion/Unix/Command/_tail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Completion/Unix/Command/_tail') diff --git a/Completion/Unix/Command/_tail b/Completion/Unix/Command/_tail index fbe30f13a..89e9cfbae 100644 --- a/Completion/Unix/Command/_tail +++ b/Completion/Unix/Command/_tail @@ -56,7 +56,7 @@ case $state in sign='signs:sign:((+\:"start at the specified byte/line"' sign+=' -\:"output the last specified bytes/lines (default)"))' digit='digits:digit:(0 1 2 3 4 5 6 7 8 9)' - if compset -P '*[0-9]'; then + if compset -P '[0-9]##'; then _alternative $mlt $digit && ret=0 elif [[ -z $PREFIX ]]; then _alternative $sign $digit && ret=0 -- cgit v1.2.3 From 85ffb55e99e9dd474b9cf15c28b649161be10d4c Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Thu, 27 Oct 2016 15:59:34 +0000 Subject: 39739: Complete negative integers for -n/-c in the GNU variant. (after 39479) --- ChangeLog | 6 ++++++ Completion/Unix/Command/_head | 2 +- Completion/Unix/Command/_tail | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'Completion/Unix/Command/_tail') diff --git a/ChangeLog b/ChangeLog index 4bdb8ff80..0592589fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-10-27 Daniel Shahaf + + * 39739: Completion/Unix/Command/_head, + Completion/Unix/Command/_tail: Complete negative integers for + -n/-c in the GNU variant. (after 39479) + 2016-10-25 Barton E. Schaefer * 39725: Src/Zle/complist.c: more metafication of patterns. diff --git a/Completion/Unix/Command/_head b/Completion/Unix/Command/_head index c76cce30e..75fc1f0a1 100644 --- a/Completion/Unix/Command/_head +++ b/Completion/Unix/Command/_head @@ -32,7 +32,7 @@ case $state in sign='sign:sign:((-\:"print all but the last specified bytes/lines"' sign+=' +\:"print the first specified bytes/lines (default)"))' digit='digits:digit:(0 1 2 3 4 5 6 7 8 9)' - if compset -P '[0-9]##'; then + if compset -P '(-|+|)[0-9]##'; then _alternative $mlt $digit && ret=0 elif [[ -z $PREFIX ]]; then _alternative $sign $digit && ret=0 diff --git a/Completion/Unix/Command/_tail b/Completion/Unix/Command/_tail index 89e9cfbae..4e6422621 100644 --- a/Completion/Unix/Command/_tail +++ b/Completion/Unix/Command/_tail @@ -56,7 +56,7 @@ case $state in sign='signs:sign:((+\:"start at the specified byte/line"' sign+=' -\:"output the last specified bytes/lines (default)"))' digit='digits:digit:(0 1 2 3 4 5 6 7 8 9)' - if compset -P '[0-9]##'; then + if compset -P '(-|+|)[0-9]##'; then _alternative $mlt $digit && ret=0 elif [[ -z $PREFIX ]]; then _alternative $sign $digit && ret=0 -- cgit v1.2.3