PATCH: some more cleanup

PATCH: some more cleanup

[Sven Wischnowsky]

Dunno how this `_requested -t' survived...

This also avoids some more tag names. But there are still 64 of them
used and for some I don't know enough about the functions where they
are used to be able to decide with which more generic name they could
be replaced.

Bye
 Sven

diff -u -r oldcompletion/Base/_brace_parameter Completion/Base/_brace_parameter
--- oldcompletion/Base/_brace_parameter	Tue Nov 16 10:08:14 1999
+++ Completion/Base/_brace_parameter	Tue Nov 16 13:09:48 1999
@@ -1,6 +1,6 @@
 #compdef -brace-parameter-
 
-_requested -t parameters && _parameters -e
+_tags parameters && _parameters -e
 
 
 # Without the `-e' option, we would use the following (see the file
diff -u -r oldcompletion/Base/_subscript Completion/Base/_subscript
--- oldcompletion/Base/_subscript	Tue Nov 16 10:08:15 1999
+++ Completion/Base/_subscript	Tue Nov 16 13:26:09 1999
@@ -3,7 +3,7 @@
 local expl
 
 if [[ "$PREFIX" = :* ]]; then
-  _wanted char-classes expl 'character class' &&
+  _wanted characters expl 'character class' &&
       compadd "$expl[@]" -p: -S ':]' alnum alpha blank cntrl digit graph \
                                      lower print punct space upper xdigit
 elif [[ ${(Pt)${compstate[parameter]}} = assoc* ]]; then
diff -u -r oldcompletion/Builtins/_sched Completion/Builtins/_sched
--- oldcompletion/Builtins/_sched	Tue Nov 16 10:08:17 1999
+++ Completion/Builtins/_sched	Tue Nov 16 13:33:30 1999
@@ -7,7 +7,7 @@
     _wanted -C - jobs expl 'scheduled jobs' || return 1
 
     lines=(${(f)"$(sched)"})
-    if _style entries description; then
+    if _style jobs description; then
       disp=( -ld lines )
     else
       disp=()
diff -u -r oldcompletion/Builtins/_stat Completion/Builtins/_stat
--- oldcompletion/Builtins/_stat	Tue Nov 16 10:08:17 1999
+++ Completion/Builtins/_stat	Tue Nov 16 13:32:47 1999
@@ -9,7 +9,7 @@
 
   while _tags; do
     _requested options expl 'inode element' &&
-        { ! _style elements prefix-needed || [[ "$PREFIX[1]" = + ]] } &&
+        { ! _style options prefix-needed || [[ "$PREFIX[1]" = + ]] } &&
         compadd "$expl[@]" - +device +inode +mode +nlink +uid +gid +rdev \
                              +size +atime +mtime +ctime +blksize +block +link
     fi
diff -u -r oldcompletion/User/_tar Completion/User/_tar
--- oldcompletion/User/_tar	Tue Nov 16 10:08:29 1999
+++ Completion/User/_tar	Tue Nov 16 13:45:33 1999
@@ -107,7 +107,7 @@
     _tar_cache_name=$tf
   fi
 
-  _wanted archived-files expl 'file from archive' &&
+  _wanted files expl 'file from archive' &&
       _multi_parts "$expl[@]" / _tar_cache_list
 else
   

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Re: PATCH: some more cleanup

[Bart Schaefer]

On Nov 16,  1:56pm, Sven Wischnowsky wrote:
} Subject: PATCH: some more cleanup
}
} diff -u -r oldcompletion/Builtins/_stat Completion/Builtins/_stat
} --- oldcompletion/Builtins/_stat	Tue Nov 16 10:08:17 1999
} +++ Completion/Builtins/_stat	Tue Nov 16 13:32:47 1999
} @@ -9,7 +9,7 @@
}  
}    while _tags; do
}      _requested options expl 'inode element' &&
} -        { ! _style elements prefix-needed || [[ "$PREFIX[1]" = + ]] } &&
} +        { ! _style options prefix-needed || [[ "$PREFIX[1]" = + ]] } &&
}          compadd "$expl[@]" - +device +inode +mode +nlink +uid +gid +rdev \
}                               +size +atime +mtime +ctime +blksize +block +link
}      fi

This hunk failed for me.  Here's a fragment of what I have; I see two
different lines, not one:

    _requested elements expl 'inode element' &&
               ^^^^^^^^
        { ! _style elements prefix-needed || [[ "$PREFIX[1]" = + ]] } &&
                   ^^^^^^^^

To apply by hand, just change both "elements" to "options".

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Re: PATCH: some more cleanup

[Sven Wischnowsky]

Bart Schaefer wrote:

> On Nov 16,  1:56pm, Sven Wischnowsky wrote:
> } Subject: PATCH: some more cleanup
> }
> } diff -u -r oldcompletion/Builtins/_stat Completion/Builtins/_stat
> } --- oldcompletion/Builtins/_stat	Tue Nov 16 10:08:17 1999
> } +++ Completion/Builtins/_stat	Tue Nov 16 13:32:47 1999
> } @@ -9,7 +9,7 @@
> }  
> }    while _tags; do
> }      _requested options expl 'inode element' &&
> } -        { ! _style elements prefix-needed || [[ "$PREFIX[1]" = + ]] } &&
> } +        { ! _style options prefix-needed || [[ "$PREFIX[1]" = + ]] } &&
> }          compadd "$expl[@]" - +device +inode +mode +nlink +uid +gid +rdev \
> }                               +size +atime +mtime +ctime +blksize +block +link
> }      fi
> 
> This hunk failed for me.  Here's a fragment of what I have; I see two
> different lines, not one:
> 
>     _requested elements expl 'inode element' &&
>                ^^^^^^^^
>         { ! _style elements prefix-needed || [[ "$PREFIX[1]" = + ]] } &&
>                    ^^^^^^^^
> 
> To apply by hand, just change both "elements" to "options".

And in another message:

> Hmm, I just spotted a *third* place where "elements" should be changed to
> "options" in Completion/Builtins/_stat:
> 
>   _tags elements files || return 1
>         ^^^^^^^^

Both of these `elements' were changed by 8647.

Bye
 Sven


--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de