* Re: Remainder of compsys.yo
2003-04-24 16:53 Remainder of compsys.yo Peter Stephenson
@ 2003-04-25 11:02 ` Oliver Kiddle
0 siblings, 0 replies; 2+ messages in thread
From: Oliver Kiddle @ 2003-04-25 11:02 UTC (permalink / raw)
To: zsh-workers
Peter wrote:
>
> I've finished rewriting compsys.yo from _description onwards; as before,
> it's a lot of large scale changes and the diffs aren't very helpful
> (about 1000 lines), so I've simply committed it (old version 1.166, new
> version 1.168 since I spotted a typo).
I've read through the changes and as before I have a few fairly minor
corrections.
I removed the sentence about not using _wanted inside a tags loop
because it could be confusing with respect to nested tag loops.
> The _regex_arguments entry was unfortunately too difficult to fathom
> entirely. I have rewritten it to omit mention of state machines, which
I'm not entirely sure what it is saying either. Fathoming it takes a
bit of time experimenting with it. I did fairly much work it out once
in the past and quickly forgot again. I'll perhaps look over it again
sometime but not anytime before 4.1.1.
I've also gone through with a spell checker to clear up spelling
mistakes across the distribution in general. Only new mistakes (since
4.0.1) will be corrected because I used ispell -l and removed things it
listed for the 4.0.1 sources so as to keep the list of non-words as short
as possible. "zsh tcpletion system" wasn't intentional was it?
Oliver
Index: zshconfig.ac
===================================================================
RCS file: /cvsroot/zsh/zsh/zshconfig.ac,v
retrieving revision 1.36
diff -u -r1.36 zshconfig.ac
--- zshconfig.ac 3 Apr 2003 09:55:42 -0000 1.36
+++ zshconfig.ac 25 Apr 2003 10:47:55 -0000
@@ -1224,7 +1224,7 @@
dnl On some systems the RLIMIT_* don't evaluate to integers at compile time
dnl (they may be enums). In this case we are not able to do preprocessor
-dnl comparisions and need our tests to determine what values exist and
+dnl comparisons and need our tests to determine what values exist and
dnl if there are clashing definitions.
zsh_LIMIT_PRESENT(RLIMIT_AIO_MEM)
Index: Completion/Base/Core/_wanted
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Base/Core/_wanted,v
retrieving revision 1.2
diff -u -r1.2 _wanted
--- Completion/Base/Core/_wanted 12 Feb 2002 13:37:04 -0000 1.2
+++ Completion/Base/Core/_wanted 25 Apr 2003 10:47:55 -0000
@@ -1,9 +1,7 @@
#autoload
-local __targs __gopt
+local -a __targs __gopt
-__gopt=()
-__tagrs=()
zparseopts -D -a __gopt 1 2 V J x C:=__targs
_tags "$__targs[@]" "$1"
Index: Completion/Linux/Command/_uml
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Linux/Command/_uml,v
retrieving revision 1.1
diff -u -r1.1 _uml
--- Completion/Linux/Command/_uml 17 Feb 2003 10:34:37 -0000 1.1
+++ Completion/Linux/Command/_uml 25 Apr 2003 10:47:55 -0000
@@ -113,7 +113,7 @@
'ncpus[specify number of virtual processors to start]:processors' \
'mode[force UML to run in specified mode]:mode:(tt)' \
'mconsole[request mconsole driver to send a message to socket]:socket' \
- 'xterm[specify alternate terminal emulator]:terminam emulator:->xterm' \
+ 'xterm[specify alternate terminal emulator]:terminal emulator:->xterm' \
'dsp[specify host dsp device]:dsp device:_files' \
'mixer[specify host mixer device]:mixer device:_files' \
'umn[specify ip address for host side of slip device]' && ret=0
Index: Completion/Mandrake/Command/_urpmi
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Mandrake/Command/_urpmi,v
retrieving revision 1.7
diff -u -r1.7 _urpmi
--- Completion/Mandrake/Command/_urpmi 12 Nov 2002 11:53:39 -0000 1.7
+++ Completion/Mandrake/Command/_urpmi 25 Apr 2003 10:47:55 -0000
@@ -153,7 +153,7 @@
"(--help -h --src -s)"{--src,-s}"[next package is source package]" \
"(--help -h)--update[use only update media]" \
"(--help -h -c -p -P)-c[choose complete method for resolving requires closure]" \
- "(--help -h)-d[show package depndencies]" \
+ "(--help -h)-d[show package dependencies]" \
"(--help -h)-f[print version, release and arch with name]" \
"(--help -h)-g[print groups too with name]" \
"(--help -h -c -p -P)-p[allow search in provides to find package]" \
Index: Completion/Unix/Command/_figlet
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_figlet,v
retrieving revision 1.1
diff -u -r1.1 _figlet
--- Completion/Unix/Command/_figlet 27 Mar 2002 14:47:14 -0000 1.1
+++ Completion/Unix/Command/_figlet 25 Apr 2003 10:47:55 -0000
@@ -29,7 +29,7 @@
"-d+[specify font directory]:font directory:_path_files -/" \
'-f+[specify font]:font:_files -W ${~opt_args[-d]\:-$fontdir} -g \*flf\*\(\:r\)' \
'(-k -S -s -o -W)-m+[specify layout mode]:layout mode' \
- '(-N)-C+[specifiy control file]:control file:_files -W ${~opt_args[-d]\:-$fontdir} -g \*flc\*\(\:r\)' \
+ '(-N)-C+[specify control file]:control file:_files -W ${~opt_args[-d]\:-$fontdir} -g \*flc\*\(\:r\)' \
"(-v)-I+[display info]:info code:((
-1\:normal\ operation\ \(default\)
0\:version,\ copyright\ and\ usage\ information
Index: Completion/Unix/Command/_grep
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_grep,v
retrieving revision 1.8
diff -u -r1.8 _grep
--- Completion/Unix/Command/_grep 19 Mar 2002 14:49:18 -0000 1.8
+++ Completion/Unix/Command/_grep 25 Apr 2003 10:47:55 -0000
@@ -55,7 +55,7 @@
'*--include=[examine files matching specified pattern]:file pattern'
'*--exclude=[skip files matching specified pattern]:file pattern'
'*--exclude-from=[skip files matching pattern in specified file]:file:_files'
- '(--no-mesages -s)'{--no-messages,-s}'[suppress messages about unreadable]'
+ '(--no-messages -s)'{--no-messages,-s}'[suppress messages about unreadable]'
'(--version -V)'{--version,-V}'[display version info]'
'(--invert-match -v)'{--invert-match,-v}'[select non-matching lines]'
'(--word-regexp -w --line-regexp -x)'{--word-regexp,-w}'[force pattern to match only whole words]'
Index: Completion/Unix/Command/_larch
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_larch,v
retrieving revision 1.1
diff -u -r1.1 _larch
--- Completion/Unix/Command/_larch 20 May 2002 14:29:47 -0000 1.1
+++ Completion/Unix/Command/_larch 25 Apr 2003 10:47:55 -0000
@@ -92,7 +92,7 @@
"show-config:show the revision frontier of a configuration" \
"config-history:report the history of a configuration" \
"update:merge local changes with the latest revision" \
-"replay:merge the latest revsion with local changes" \
+"replay:merge the latest revision with local changes" \
"delta-patch:compute and apply an arbitrary patch" \
"star-merge:merge of mutually merged branches" \
"make-sync-tree:prepare a tree that will synchronize branches" \
@@ -1603,7 +1603,7 @@
'--report[default output]' \
'--verbose[maximal output]' \
'--debug[debugging output]' \
- '--ignore-extra-args[ignore extra argyments]' \
+ '--ignore-extra-args[ignore extra arguments]' \
"--skip-readmes[don't update readme files]" \
'*: :_files' \
&& return 0
Index: Completion/Unix/Command/_ls
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_ls,v
retrieving revision 1.4
diff -u -r1.4 _ls
--- Completion/Unix/Command/_ls 15 Mar 2002 16:26:09 -0000 1.4
+++ Completion/Unix/Command/_ls 25 Apr 2003 10:47:55 -0000
@@ -8,7 +8,7 @@
'(--almost-all -A -a --all)'{--almost-all,-A}'[list all except . and ..]'
'(--ignore-backups -B)'{--ignore-backups,-B}"[don't list entries ending with ~]"
'(--directory -d)'{--directory,-d}'[list directory entries instead of contents]'
- '(--ignore,-I)'{--ignore,-I}"[don't list entires matching pattern]:pattern:"
+ '(--ignore,-I)'{--ignore,-I}"[don't list entire matching pattern]:pattern:"
'(--dereference -L)'{--dereference,-L}'[list referenced file for sym link]'
'(--recursive -R)'{--recursive,-R}'[list subdirectories recursively]'
Index: Completion/Unix/Command/_perforce
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_perforce,v
retrieving revision 1.5
diff -u -r1.5 _perforce
--- Completion/Unix/Command/_perforce 3 Apr 2003 10:24:55 -0000 1.5
+++ Completion/Unix/Command/_perforce 25 Apr 2003 10:47:55 -0000
@@ -13,7 +13,7 @@
# subcommand e.g.
# zstyle ':completion:*:p4-labelsync:*' verbose false
# or for a particular tag, e.g. changes,
-# zstyle ':completeion:*:changes' verbose false
+# zstyle ':completion:*:changes' verbose false
# or just for top-level completion (i.e. up to and including completion
# of the subcommand):
# zstyle ':completion:*:p4:*' verbose false
@@ -233,7 +233,7 @@
fi
if [[ $p4cmd = '=p4' ]]; then
- _message "p4 excutable not found: completion not available"
+ _message "p4 executable not found: completion not available"
return
fi
@@ -497,7 +497,7 @@
}
-(( $+functions[_perforce_file_suffx] )) ||
+(( $+functions[_perforce_file_suffix] )) ||
_perforce_file_suffix() {
# Used with compadd -R to handle @ or # after a file name.
# Differs from compadd -r '...' in that it quotes `#' if typed.
@@ -734,7 +734,7 @@
labels:label:_perforce_labels \
'dates:date (+ time):_perforce_dates'
elif [[ -prefix *\# ]]; then
- # Modify context to indicate we are in a suffx.
+ # Modify context to indicate we are in a suffix.
curcontext="${curcontext%:*}:hash-suffix"
# Check for existing range syntax
[[ $PREFIX = *[@\#]*,* ]] && range=
@@ -919,7 +919,7 @@
# Ignore up to the last one. We don't try to complete these.
compset -P '*[[:blank:]\^\&\|\(\)]'
- # According to the manual, `p4 jobspec' requires admin priveleges.
+ # According to the manual, `p4 jobspec' requires admin privileges.
# If this is true even of `p4 jobspec -o', we are a bit screwed.
_call_program jobspec p4 jobspec -o 2>/dev/null | while read line; do
case $line in
@@ -1114,7 +1114,7 @@
'(-o)-f[force operation by superuser]' \
'(-o -i)-d[delete branch]' \
'(-d -i -f)-o[write specification to standard output]' \
- '(-d -o)-i[read specificationf from standard input]' \
+ '(-d -o)-i[read specification from standard input]' \
'(-i)*::branch name:_perforce_branches'
}
@@ -1464,7 +1464,7 @@
'-a[add files to label]' \
'-d[delete files from label]' \
'-n[no effect, dummy run]' \
- '-l[specify lable]:label:_perforce_labels' \
+ '-l[specify label]:label:_perforce_labels' \
'*::file:_perforce_files -tR'
}
Index: Completion/Unix/Command/_sccs
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_sccs,v
retrieving revision 1.3
diff -u -r1.3 _sccs
--- Completion/Unix/Command/_sccs 12 Mar 2003 18:55:38 -0000 1.3
+++ Completion/Unix/Command/_sccs 25 Apr 2003 10:47:55 -0000
@@ -33,13 +33,13 @@
'edit:retrieve file for editing (check out)'
"enter:like create, but omits the final 'sccs get'"
'fix:revise a (leaf) delta'
- 'get:retieve a version from the sccs history'
+ 'get:retrieve a version from the sccs history'
'help:get information on sccs commands and error messages'
{info,tell}':list files being edited'
'print:print history of specified files'
'prs:display delta table for an sccs file'
'prt:display the delta table, but omit the MR field'
- 'rmdel:remove specfied delta from history file'
+ 'rmdel:remove specified delta from history file'
'sact:show editing activity status of an sccs file'
'sccsdiff:compare two versions from sccs history'
{unedit,unget}':undo check out'
Index: Completion/Unix/Command/_texinfo
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_texinfo,v
retrieving revision 1.3
diff -u -r1.3 _texinfo
--- Completion/Unix/Command/_texinfo 9 Aug 2002 16:04:46 -0000 1.3
+++ Completion/Unix/Command/_texinfo 25 Apr 2003 10:47:55 -0000
@@ -36,7 +36,7 @@
'--infodir=[specify directory containing dir file]:info directory:_files -/' \
'--align=[specify minimum indentation for description]:indentation' \
'--calign=[specify minimum indentation for continuation lines of description]:indentation' \
- '--maxwidth=[specify maximim width of dir file]:width' \
+ '--maxwidth=[specify maximum width of dir file]:width' \
'--quiet[suppress informational output]' \
'--description=[specify description for menu entry]:description' \
'--menuentry=[specify the menu entry for dir file]:menu entry' \
Index: Completion/Unix/Type/_java_class
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_java_class,v
retrieving revision 1.3
diff -u -r1.3 _java_class
--- Completion/Unix/Type/_java_class 24 Aug 2002 19:19:14 -0000 1.3
+++ Completion/Unix/Type/_java_class 25 Apr 2003 10:47:55 -0000
@@ -1,7 +1,7 @@
#autoload
# Should probably add some sort of cache.
-# Should we call _multi_parts insteads of compadd?
+# Should we call _multi_parts instead of compadd?
local classpath i expl
local -a c
Index: Completion/Zsh/Command/_zmv
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Command/_zmv,v
retrieving revision 1.1
diff -u -r1.1 _zmv
--- Completion/Zsh/Command/_zmv 7 Jan 2003 15:56:03 -0000 1.1
+++ Completion/Zsh/Command/_zmv 25 Apr 2003 10:47:55 -0000
@@ -15,4 +15,4 @@
'(-W)-w[implicitly add parenthesis to wildcards in the pattern]' \
'(-w)-W[like -w, but turn wildcards in replacement patterns into references]' \
'1:source pattern:_files' \
- '2:desination pattern:_files'
+ '2:destination pattern:_files'
Index: Doc/zshtcpsys.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/zshtcpsys.yo,v
retrieving revision 1.1
diff -u -r1.1 zshtcpsys.yo
--- Doc/zshtcpsys.yo 6 Feb 2003 12:21:51 -0000 1.1
+++ Doc/zshtcpsys.yo 25 Apr 2003 10:47:55 -0000
@@ -1,3 +1,3 @@
manpage(ZSHTCPSYS)(1)(date())(zsh version())
-manpagename(zshtcpsys)(zsh tcpletion system)
+manpagename(zshtcpsys)(zsh tcp system)
includefile(Zsh/tcpsys.yo)\x01
Index: Doc/Zsh/compsys.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/compsys.yo,v
retrieving revision 1.168
diff -u -r1.168 compsys.yo
--- Doc/Zsh/compsys.yo 24 Apr 2003 17:45:18 -0000 1.168
+++ Doc/Zsh/compsys.yo 25 Apr 2003 10:47:55 -0000
@@ -1662,7 +1662,7 @@
In addition to setting styles for specific tags, it is also possible to
use group names specified explicitly by the tt(group-name) tag together
-withe the `tt((group))' syntax allowed by the tt(ZLS_COLORS) and
+with the `tt((group))' syntax allowed by the tt(ZLS_COLORS) and
tt(ZLS_COLOURS) parameters and simply using the tt(default) tag.
It is possible to use any color specifications already set up for the GNU
@@ -3865,7 +3865,7 @@
from the given array of complete file paths.
The tt(-i) option causes tt(_multi_parts) to insert a unique match even
-that requires multiple separators to be inserted. This is not usually
+if that requires multiple separators to be inserted. This is not usually
the expected behaviour with filenames, but certain other types of
completion, for example those with a fixed set of possibilities, may be
more suited to this form.
@@ -3878,7 +3878,7 @@
findex(_next_label)
item(tt(_next_label) [ tt(-x) ] [ tt(-12VJ) ] var(tag) var(name) var(descr) [ var(options) ... ])(
This function is used to implement the loop over different tag
-labels for a particular tag as describe above for the tt(tag-order)
+labels for a particular tag as described above for the tt(tag-order)
style. On each call it checks to see if there are any more tag labels; if
there is it returns status zero, otherwise non-zero.
As this function requires a current tag to be set, it must always follow
@@ -3912,13 +3912,13 @@
)
findex(_normal)
item(tt(_normal))(
-This is the standard function called to handled completion outside
-nay special var(-context-). It is called both to complete the command
+This is the standard function called to handle completion outside
+any special var(-context-). It is called both to complete the command
word and also the arguments for a command. In the second case,
tt(_normal) looks for a special completion for that command, and if
there is none it uses the completion for the tt(-default-) context.
-A second use is to rexamine the command line specified by the tt($words)
+A second use is to reexamine the command line specified by the tt($words)
array and the tt($CURRENT) parameter after those have been modified.
For example, the function tt(_precommand), which
completes after pre-command specifiers such as tt(nohup), removes the
@@ -4012,7 +4012,7 @@
item(tt(_pick_variant [ tt(-c) var(command) ] [ tt(-r) var(name) ] var(label)tt(=)var(pattern) ... var(label) [ var(args) ... ]))(
This function is used to resolve situations where a single command name
requires more than one type of handling, either because it
-has more than one variant because there is a name clash between two
+has more than one variant or because there is a name clash between two
different commands.
The command to run is taken from the first element of the array
@@ -4123,7 +4123,7 @@
Note that the test for whether matches were generated is not performed
until the end of the tt(_tags) loop. This is so that the user can set
-the tt(tag-order) style to specify a set of tags to be tested at the
+the tt(tag-order) style to specify a set of tags to be completed at the
same time.
If var(name) and var(descr) are given, tt(_requested) calls the
@@ -4179,7 +4179,7 @@
This function sets up the special
parameters used by the completion system appropriately for the var(tag)
given as the first argument. It uses the styles tt(list-colors),
-tt(list-packed), tt(list-rows-first), tt(last-promp), tt(accept-exact),
+tt(list-packed), tt(list-rows-first), tt(last-prompt), tt(accept-exact),
tt(menu) and tt(force-list).
The optional var(group) supplies the name of the group in which the
@@ -4193,7 +4193,7 @@
item(tt(_store_cache) var(cache_identifier) var(params) ...)(
This function, together with tt(_retrieve_cache) and
tt(_cache_invalid), implements a caching layer which can be used
-in any completion functions. Data obtained by
+in any completion function. Data obtained by
costly operations are stored in parameters;
this function then dumps the values of those parameters to a file. The
data can then be retrieved quickly from that file via tt(_retrieve_cache),
@@ -4225,7 +4225,7 @@
internally and sorted by using the tt(tag-order) style.
Next, tt(_tags) is called repeatedly without arguments from the same
-comletion function. This successively selects the first, second,
+completion function. This successively selects the first, second,
etc. set of tags requested by the user. The return value is zero if at
least one of the tags is requested and non-zero otherwise. To test if a
particular tag is to be tried, the tt(_requested) function should be
@@ -4239,7 +4239,7 @@
tt(curcontext) parameter (which has the same effect).
)
findex(_values)
-item(tt(_values) [ -O var(name) ] [ -s var(sep) ] [ -S var(sep) ] [ -C ] var(desc) var(spec) ...)(
+item(tt(_values) [ tt(-O) var(name) ] [ tt(-s) var(sep) ] [ tt(-S) var(sep) ] [ tt(-wC) ] var(desc) var(spec) ...)(
This is used to complete arbitrary keywords (values) and their arguments,
or lists of such combinations.
@@ -4273,8 +4273,8 @@
The character separating a value from its argument can be set using the
option tt(-S) (like tt(-s), followed by the character to use as the
-separator in the next argument). By default the equal
-sign will be used to separator values and arguments.
+separator in the next argument). By default the equals
+sign will be used as the separator between values and arguments.
Example:
@@ -4341,9 +4341,8 @@
The arguments to tt(_wanted) are the same as those to tt(_requested),
i.e. arguments to be passed to tt(_description). However, in this case
the var(command) is not optional; all the processing of tags, including
-the loop over both tags and tags labels and the generation of matches,
-is carried out automatically by tt(_wanted). This also means that
-tt(_wanted) should not be called inside a tt(_tags) loop.
+the loop over both tags and tag labels and the generation of matches,
+is carried out automatically by tt(_wanted).
Hence to offer only one tag and immediately add the corresponding
matches with the given description:
Index: Doc/Zsh/mod_tcp.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/mod_tcp.yo,v
retrieving revision 1.3
diff -u -r1.3 mod_tcp.yo
--- Doc/Zsh/mod_tcp.yo 30 May 2002 15:16:18 -0000 1.3
+++ Doc/Zsh/mod_tcp.yo 25 Apr 2003 10:47:55 -0000
@@ -54,7 +54,7 @@
)
item(The remote host)(
This is the fully qualified domain name of the peer, if available, else an
-IP address. It is an all-zero IP adress for a session opened for
+IP address. It is an all-zero IP address for a session opened for
listening.
)
item(The remote port)(
Index: Doc/Zsh/mod_zselect.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/mod_zselect.yo,v
retrieving revision 1.1
diff -u -r1.1 mod_zselect.yo
--- Doc/Zsh/mod_zselect.yo 8 May 2002 13:13:53 -0000 1.1
+++ Doc/Zsh/mod_zselect.yo 25 Apr 2003 10:47:55 -0000
@@ -19,7 +19,7 @@
Arguments and options may be intermingled in any order. Non-option
arguments are file descriptors, which must be decimal integers. By
default, file descriptors are to be tested for reading, i.e. tt(zselect)
-will return when data is availble to be read from the file descriptor, or
+will return when data is available to be read from the file descriptor, or
more precisely, when a read operation from the file descriptor will not
block. After a tt(-r), tt(-w) and tt(-e), the given file descriptors are
to be tested for reading, writing, or error conditions. These options and
Index: Doc/Zsh/tcpsys.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/tcpsys.yo,v
retrieving revision 1.2
diff -u -r1.2 tcpsys.yo
--- Doc/Zsh/tcpsys.yo 23 Feb 2003 23:24:32 -0000 1.2
+++ Doc/Zsh/tcpsys.yo 25 Apr 2003 10:47:55 -0000
@@ -285,8 +285,8 @@
always returned.
This is generally only useful for interactive use, to prevent the display
-becomming fragmented by output returned from the connection. Within a
-programe or function it is generally better to handle reading data by a
+becoming fragmented by output returned from the connection. Within a
+programme or function it is generally better to handle reading data by a
more explicit method.
)
findex(tcp_expect)
@@ -322,7 +322,7 @@
the caller needs to know which of the patterns matched, the option tt(-p)
var(var) can be used; on return, tt($var) is set to the number of the
pattern using ordinary zsh indexing, i.e. the first is 1, and so on. Note
-tha absence of a `tt($)' in front of var(var). To avoid clashes, the
+the absence of a `tt($)' in front of var(var). To avoid clashes, the
parameter cannot begin with `tt(_expect)'.
The option tt(-q) is passed directly down to tt(tcp_read).
@@ -371,7 +371,7 @@
given. The tt(-r) flag reverses the order however it was arrived it.
The tt(-v) flag specifies that a tt($TCP_PROMPT) will be output before each
-session. This is output after any modfication to TCP_SESS by the
+session. This is output after any modification to TCP_SESS by the
user-defined tt(tcp_on_spam) function described below. (Obviously that
function is able to generate its own output.)
)
Index: Doc/Zsh/zle.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/zle.yo,v
retrieving revision 1.28
diff -u -r1.28 zle.yo
--- Doc/Zsh/zle.yo 27 Jan 2003 14:54:31 -0000 1.28
+++ Doc/Zsh/zle.yo 25 Apr 2003 10:47:55 -0000
@@ -425,7 +425,7 @@
so (see below). The handler should not attempt to read from the terminal.
Note that zle makes no attempt to check whether this fd is actually
readable when installing the handler. The user must make their own
-arrangments for handling the file descriptor when zle is not active.
+arrangements for handling the file descriptor when zle is not active.
Any number of handlers for any number of readable file descriptors may be
installed. Installing a handler for an var(fd) which is already handled
Index: Functions/Misc/relative
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/Misc/relative,v
retrieving revision 1.1
diff -u -r1.1 relative
--- Functions/Misc/relative 23 Apr 2002 15:39:49 -0000 1.1
+++ Functions/Misc/relative 25 Apr 2003 10:47:55 -0000
@@ -15,7 +15,7 @@
cur=(${(s:/:)2}) # Split 'current' directory into cur
abs=(${(s:/:)1} $3) # Split target directory into abs
-# Compute the length of the common prefix, or discover a subdiretory:
+# Compute the length of the common prefix, or discover a subdirectory:
integer i=1
while [[ i -le $#abs && $abs[i] == $cur[i] ]]
do
Index: Functions/TCP/tcp_alias
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/TCP/tcp_alias,v
retrieving revision 1.1
diff -u -r1.1 tcp_alias
--- Functions/TCP/tcp_alias 6 Feb 2003 12:21:51 -0000 1.1
+++ Functions/TCP/tcp_alias 25 Apr 2003 10:47:55 -0000
@@ -85,7 +85,7 @@
index=${array[(i)$alias]}
array=(${array[1,index-1]} ${array[index+1,-1]})
if [[ -z "$array" ]]; then
- unset "tcp_aliase[$fd]"
+ unset "tcp_aliases[$fd]"
else
tcp_aliases[$fd]="$array"
fi
Index: Functions/TCP/tcp_close
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/TCP/tcp_close,v
retrieving revision 1.1
diff -u -r1.1 tcp_close
--- Functions/TCP/tcp_close 6 Feb 2003 12:21:51 -0000 1.1
+++ Functions/TCP/tcp_close 25 Apr 2003 10:47:55 -0000
@@ -4,7 +4,7 @@
# -n means don't close a fake session's fd.
# -q means quiet.
#
-# Accepts the -s and -l arguments for consistenty with other functions,
+# Accepts the -s and -l arguments for consistency with other functions,
# but there is no particular gain in using them
emulate -L zsh
setopt extendedglob cbases
Index: Functions/TCP/tcp_read
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/TCP/tcp_read,v
retrieving revision 1.1
diff -u -r1.1 tcp_read
--- Functions/TCP/tcp_read 6 Feb 2003 12:21:51 -0000 1.1
+++ Functions/TCP/tcp_read 25 Apr 2003 10:47:55 -0000
@@ -87,7 +87,7 @@
done
;;
- # Don't print an error mesage if there is no TCP connection,
+ # Don't print an error message if there is no TCP connection,
# just return 1.
(q) quiet=1
;;
Index: Functions/Zle/forward-word-match
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/Zle/forward-word-match,v
retrieving revision 1.1
diff -u -r1.1 forward-word-match
--- Functions/Zle/forward-word-match 28 Mar 2003 11:34:30 -0000 1.1
+++ Functions/Zle/forward-word-match 25 Apr 2003 10:47:55 -0000
@@ -18,7 +18,7 @@
match-words-by-style
# For some reason forward-word doesn't work like the other word
- # word commnds; it skips whitespace only after any matched word
+ # commands; it skips whitespace only after any matched word
# characters.
if [[ -n $matched_words[4] ]]; then
Index: Functions/Zle/match-words-by-style
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/Zle/match-words-by-style,v
retrieving revision 1.1
diff -u -r1.1 match-words-by-style
--- Functions/Zle/match-words-by-style 28 Mar 2003 11:34:30 -0000 1.1
+++ Functions/Zle/match-words-by-style 25 Apr 2003 10:47:55 -0000
@@ -10,7 +10,7 @@
# For example
# foo bar rod stick
# ^
-# with the cursor where indicated whill with typical settings produce the
+# with the cursor where indicated will with typical settings produce the
# elements `foo ', `bar', ` ', ` ', `rod', ` ' and `stick'.
#
# The style word-style can be set to indicate what a word is.
@@ -26,7 +26,7 @@
# treated as `normal', but this should not be relied upon.)
# specified Similar to normal, except that only the words given
# in the string (and not also alphanumeric characters)
-# are to be considerd parts of words.
+# are to be considered parts of words.
# unspecified The negation of `specified': the characters given
# are those that aren't to be considered parts of a word.
# They should probably include white space.
@@ -38,7 +38,7 @@
# zstyle ':zle:transpose-words*' word-style normal
# zstyle ':zle:transpose-words*' word-chars ''
# will force bash-style word recognition, i.e only alphanumeric characters
-# are considerd parts of a word. It is up to the function which calls
+# are considered parts of a word. It is up to the function which calls
# match-words-by-style to set the context in the variable curcontext,
# else a default context will be used (not recommended).
#
Index: Functions/Zle/transpose-words-match
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/Zle/transpose-words-match,v
retrieving revision 1.2
diff -u -r1.2 transpose-words-match
--- Functions/Zle/transpose-words-match 3 Apr 2003 10:24:55 -0000 1.2
+++ Functions/Zle/transpose-words-match 25 Apr 2003 10:47:55 -0000
@@ -1,5 +1,5 @@
# Transpose words, matching the words using match-words-by-style, q.v.
-# The group of word characters preceeding the cursor (not necessarily
+# The group of word characters preceding the cursor (not necessarily
# immediately) are transposed with the group of word characters following
# the cursor (again, not necessarily immediately).
#
Index: Src/zsh.h
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/zsh.h,v
retrieving revision 1.44
diff -u -r1.44 zsh.h
--- Src/zsh.h 17 Feb 2003 14:07:11 -0000 1.44
+++ Src/zsh.h 25 Apr 2003 10:47:55 -0000
@@ -939,7 +939,7 @@
* Handling of options.
*
* Option strings are standard in that a trailing `:' indicates
- * a mandatory argument. In addtion, `::' indicates an optional
+ * a mandatory argument. In addition, `::' indicates an optional
* argument which must immediately follow the option letter if it is present.
* `:%' indicates an optional numeric argument which may follow
* the option letter or be in the next word; the only test is
@@ -1014,7 +1014,7 @@
#define BINF_SKIPINVALID (1<<12) /* Treat invalid option as argument */
#define BINF_KEEPNUM (1<<13) /* `[-+]NUM' can be an option */
#define BINF_SKIPDASH (1<<14) /* Treat `-' as argument (maybe `+') */
-#define BINF_DASHDASHVALID (1<<15) /* Handle `--' evenf if SKIPINVALD */
+#define BINF_DASHDASHVALID (1<<15) /* Handle `--' even if SKIPINVALD */
struct module {
char *nam;
Index: Src/Modules/zselect.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/zselect.c,v
retrieving revision 1.3
diff -u -r1.3 zselect.c
--- Src/Modules/zselect.c 27 Aug 2002 21:10:34 -0000 1.3
+++ Src/Modules/zselect.c 25 Apr 2003 10:47:55 -0000
@@ -233,7 +233,7 @@
zaddlinknode(fdlist, ztrdup(buf));
}
} else {
- /* List of fd's preceeded by -r, -w, -e. */
+ /* List of fd's preceded by -r, -w, -e. */
if (!doneit) {
buf[0] = '-';
buf[1] = fdchar[i];
Index: Test/B03print.ztst
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/B03print.ztst,v
retrieving revision 1.6
diff -u -r1.6 B03print.ztst
--- Test/B03print.ztst 26 Mar 2003 17:33:40 -0000 1.6
+++ Test/B03print.ztst 25 Apr 2003 10:47:55 -0000
@@ -171,7 +171,7 @@
>0003
printf '%2$d%1$d\n' 1 2 3 4
-0:reuse format where arguments are explictly specified
+0:reuse format where arguments are explicitly specified
>21
>43
^ permalink raw reply [flat|nested] 2+ messages in thread