* gnu cut completion as wrong as it can be, patch
@ 2008-02-03 6:48 Mikael Magnusson
2008-02-03 7:22 ` Mikael Magnusson
0 siblings, 1 reply; 5+ messages in thread
From: Mikael Magnusson @ 2008-02-03 6:48 UTC (permalink / raw)
To: zsh-workers
Add + qualifiers to short options that take arguments. Add said
arguments too. Remove a = from an option that does not take an
argument. Complete files (hello?).
diff --git a/Completion/Unix/Command/_cut b/Completion/Unix/Command/_cut
index 7d7526d..b17cf7c 100644
--- a/Completion/Unix/Command/_cut
+++ b/Completion/Unix/Command/_cut
@@ -35,16 +35,17 @@ if _pick_variant gnu="Free Soft" unix --version; then
esac
_arguments \
- '(--bytes -b)'{--bytes=,-b}'['$_cut_args[bytes]']' \
- '(--characters -c)'{--characters=,-c}'['$_cut_args[characters]']' \
- '(--delimiter -d)'{--delimiter=,-d}'['$_cut_args[delimiter]']' \
- '(--fields -f)'{--fields=,-f}'['$_cut_args[fields]']' \
+ '(--bytes -b+)'{--bytes=,-b}'['$_cut_args[bytes]']:list' \
+ '(--characters
-c+)'{--characters=,-c}'['$_cut_args[characters]']:list' \
+ '(--delimiter
-d+)'{--delimiter=,-d}'['$_cut_args[delimiter]']:delimeter' \
+ '(--fields -f+)'{--fields=,-f}'['$_cut_args[fields]']:list' \
'-n['$_cut_args[n]']' \
'--complement['$_cut_args[complement]']' \
- '(--only-delimited
-s)'{--only-delimited=,-s}'['$_cut_args[only-delimited]']' \
- '--output-delimiter['$_cut_args[output-delimiter]']' \
+ '(--only-delimited
-s)'{--only-delimited,-s}'['$_cut_args[only-delimited]']' \
+ '--output-delimiter=['$_cut_args[output-delimiter]']:delimeter' \
'--help['$_cut_args[help]']' \
- '--version['$_cut_args[version]']'
+ '--version['$_cut_args[version]']' \
+ '*:file:_files'
else
_arguments \
'-b[list specifies byte positions]:list:' \
--
Mikael Magnusson
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: gnu cut completion as wrong as it can be, patch
2008-02-03 6:48 gnu cut completion as wrong as it can be, patch Mikael Magnusson
@ 2008-02-03 7:22 ` Mikael Magnusson
2008-02-03 18:07 ` Clint Adams
0 siblings, 1 reply; 5+ messages in thread
From: Mikael Magnusson @ 2008-02-03 7:22 UTC (permalink / raw)
To: zsh-workers
On Sun, 3 Feb 2008, Mikael Magnusson wrote:
> Add + qualifiers to short options that take arguments. Add said
> arguments too. Remove a = from an option that does not take an
> argument. Complete files (hello?).
Without linewrapping the patch...
diff --git a/Completion/Unix/Command/_cut b/Completion/Unix/Command/_cut
index 7d7526d..b17cf7c 100644
--- a/Completion/Unix/Command/_cut
+++ b/Completion/Unix/Command/_cut
@@ -35,16 +35,17 @@ if _pick_variant gnu="Free Soft" unix --version; then
esac
_arguments \
- '(--bytes -b)'{--bytes=,-b}'['$_cut_args[bytes]']' \
- '(--characters -c)'{--characters=,-c}'['$_cut_args[characters]']' \
- '(--delimiter -d)'{--delimiter=,-d}'['$_cut_args[delimiter]']' \
- '(--fields -f)'{--fields=,-f}'['$_cut_args[fields]']' \
+ '(--bytes -b+)'{--bytes=,-b}'['$_cut_args[bytes]']:list' \
+ '(--characters -c+)'{--characters=,-c}'['$_cut_args[characters]']:list' \
+ '(--delimiter -d+)'{--delimiter=,-d}'['$_cut_args[delimiter]']:delimeter' \
+ '(--fields -f+)'{--fields=,-f}'['$_cut_args[fields]']:list' \
'-n['$_cut_args[n]']' \
'--complement['$_cut_args[complement]']' \
- '(--only-delimited -s)'{--only-delimited=,-s}'['$_cut_args[only-delimited]']' \
- '--output-delimiter['$_cut_args[output-delimiter]']' \
+ '(--only-delimited -s)'{--only-delimited,-s}'['$_cut_args[only-delimited]']' \
+ '--output-delimiter=['$_cut_args[output-delimiter]']:delimeter' \
'--help['$_cut_args[help]']' \
- '--version['$_cut_args[version]']'
+ '--version['$_cut_args[version]']' \
+ '*:file:_files'
else
_arguments \
'-b[list specifies byte positions]:list:' \
--
Mikael Magnusson
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: gnu cut completion as wrong as it can be, patch
2008-02-03 7:22 ` Mikael Magnusson
@ 2008-02-03 18:07 ` Clint Adams
2008-02-04 0:53 ` Mikael Magnusson
0 siblings, 1 reply; 5+ messages in thread
From: Clint Adams @ 2008-02-03 18:07 UTC (permalink / raw)
To: Mikael Magnusson; +Cc: zsh-workers
On Sun, Feb 03, 2008 at 08:22:35AM +0100, Mikael Magnusson wrote:
> Without linewrapping the patch...
This won't apply, with or without -l.
> --- a/Completion/Unix/Command/_cut
> +++ b/Completion/Unix/Command/_cut
> @@ -35,16 +35,17 @@ if _pick_variant gnu="Free Soft" unix --version; then
> esac
>
> _arguments \
> - '(--bytes -b)'{--bytes=,-b}'['$_cut_args[bytes]']' \
> - '(--characters -c)'{--characters=,-c}'['$_cut_args[characters]']' \
> - '(--delimiter -d)'{--delimiter=,-d}'['$_cut_args[delimiter]']' \
> - '(--fields -f)'{--fields=,-f}'['$_cut_args[fields]']' \
> + '(--bytes -b+)'{--bytes=,-b}'['$_cut_args[bytes]']:list' \
> + '(--characters -c+)'{--characters=,-c}'['$_cut_args[characters]']:list' \
> + '(--delimiter -d+)'{--delimiter=,-d}'['$_cut_args[delimiter]']:delimeter' \
> + '(--fields -f+)'{--fields=,-f}'['$_cut_args[fields]']:list' \
> '-n['$_cut_args[n]']' \
> '--complement['$_cut_args[complement]']' \
> - '(--only-delimited -s)'{--only-delimited=,-s}'['$_cut_args[only-delimited]']' \
> - '--output-delimiter['$_cut_args[output-delimiter]']' \
> + '(--only-delimited -s)'{--only-delimited,-s}'['$_cut_args[only-delimited]']' \
> + '--output-delimiter=['$_cut_args[output-delimiter]']:delimeter' \
> '--help['$_cut_args[help]']' \
> - '--version['$_cut_args[version]']'
> + '--version['$_cut_args[version]']' \
> + '*:file:_files'
> else
> _arguments \
> '-b[list specifies byte positions]:list:' \
I'm committing this; I'm not sure why you're putting + signs within the
parentheses.
Index: Completion/Unix/Command/_cut
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_cut,v
retrieving revision 1.4
diff -u -r1.4 _cut
--- Completion/Unix/Command/_cut 7 Dec 2007 17:03:32 -0000 1.4
+++ Completion/Unix/Command/_cut 3 Feb 2008 18:05:49 -0000
@@ -42,9 +42,10 @@
'-n['$_cut_args[n]']' \
'--complement['$_cut_args[complement]']' \
'(--only-delimited -s)'{--only-delimited=,-s}'['$_cut_args[only-delimited]']' \
- '--output-delimiter['$_cut_args[output-delimiter]']' \
+ '--output-delimiter=['$_cut_args[output-delimiter]']' \
'--help['$_cut_args[help]']' \
- '--version['$_cut_args[version]']'
+ '--version['$_cut_args[version]']' \
+ '*:file:_files'
else
_arguments \
'-b[list specifies byte positions]:list:' \
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: gnu cut completion as wrong as it can be, patch
2008-02-03 18:07 ` Clint Adams
@ 2008-02-04 0:53 ` Mikael Magnusson
2008-02-06 1:23 ` Clint Adams
0 siblings, 1 reply; 5+ messages in thread
From: Mikael Magnusson @ 2008-02-04 0:53 UTC (permalink / raw)
To: zsh-workers
On 03/02/2008, Clint Adams <clint@zsh.org> wrote:
> On Sun, Feb 03, 2008 at 08:22:35AM +0100, Mikael Magnusson wrote:
> > Without linewrapping the patch...
>
> This won't apply, with or without -l.
Okay, let's try this then,
http://git.a.la/?p=zsh-cvs.git;a=commitdiff_plain;h=6460b1
> I'm committing this; I'm not sure why you're putting + signs within the
> parentheses.
You didn't add any of the :delimiter and :list either. The + in the
parenthesis makes zsh accept the sticked form, ie -c5 as well as -c 5.
--
Mikael Magnusson
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: gnu cut completion as wrong as it can be, patch
2008-02-04 0:53 ` Mikael Magnusson
@ 2008-02-06 1:23 ` Clint Adams
0 siblings, 0 replies; 5+ messages in thread
From: Clint Adams @ 2008-02-06 1:23 UTC (permalink / raw)
To: Mikael Magnusson; +Cc: zsh-workers
On Mon, Feb 04, 2008 at 01:53:06AM +0100, Mikael Magnusson wrote:
> Okay, let's try this then,
> http://git.a.la/?p=zsh-cvs.git;a=commitdiff_plain;h=6460b1
Moving the + signs right and fixing a misspelling..
Index: Completion/Unix/Command/_cut
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_cut,v
retrieving revision 1.6
diff -u -r1.6 _cut
--- Completion/Unix/Command/_cut 6 Feb 2008 01:17:53 -0000 1.6
+++ Completion/Unix/Command/_cut 6 Feb 2008 01:22:22 -0000
@@ -23,7 +23,7 @@
bytes "select only these bytes"
characters "select only these characters"
delimiter "use DELIM instead of TAB for field delimiter"
- fields "select only these fields and lines whitout the delimiter character"
+ fields "select only these fields and lines without the delimiter character"
n "(ignored)"
complement "complement the set of selected bytes, characters or fields"
only-delimited "do not print lines not containing delimiters"
@@ -35,10 +35,10 @@
esac
_arguments \
- '(--bytes -b+)'{--bytes=,-b}'['$_cut_args[bytes]']:list' \
- '(--characters -c+)'{--characters=,-c}'['$_cut_args[characters]']:list' \
- '(--delimiter -d+)'{--delimiter=,-d}'['$_cut_args[delimiter]']:delimeter' \
- '(--fields -f+)'{--fields=,-f}'['$_cut_args[fields]']:list' \
+ '(--bytes -b)'{--bytes=,-b+}'['$_cut_args[bytes]']:list' \
+ '(--characters -c)'{--characters=,-c+}'['$_cut_args[characters]']:list' \
+ '(--delimiter -d)'{--delimiter=,-d+}'['$_cut_args[delimiter]']:delimeter' \
+ '(--fields -f)'{--fields=,-f+}'['$_cut_args[fields]']:list' \
'-n['$_cut_args[n]']' \
'--complement['$_cut_args[complement]']' \
'(--only-delimited -s)'{--only-delimited,-s}'['$_cut_args[only-delimited]']' \
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-02-06 1:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-03 6:48 gnu cut completion as wrong as it can be, patch Mikael Magnusson
2008-02-03 7:22 ` Mikael Magnusson
2008-02-03 18:07 ` Clint Adams
2008-02-04 0:53 ` Mikael Magnusson
2008-02-06 1:23 ` Clint Adams
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).