diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | Doc/Zsh/builtins.yo | 2 | ||||
| -rw-r--r-- | Doc/Zsh/calsys.yo | 2 | ||||
| -rw-r--r-- | Doc/Zsh/compsys.yo | 2 | ||||
| -rw-r--r-- | Doc/Zsh/func.yo | 2 | ||||
| -rw-r--r-- | Doc/Zsh/grammar.yo | 2 | ||||
| -rw-r--r-- | Doc/Zsh/mod_zprof.yo | 10 | ||||
| -rw-r--r-- | Doc/Zsh/options.yo | 4 | ||||
| -rw-r--r-- | Doc/Zsh/zle.yo | 2 | ||||
| -rw-r--r-- | Src/builtin.c | 3 | ||||
| -rw-r--r-- | Src/math.c | 3 | ||||
| -rw-r--r-- | Src/utils.c | 2 |
12 files changed, 30 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index 26faf4bb8..b7cc657c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-06-10 Peter Stephenson <pws@csr.com> + + * 25144: Src/builtin.c, Src/math.c, Src/utils.c: report the + supported bases on a base error. + + * 25143: Mikael: Doc/Zsh/builtins.yo, Doc/Zsh/calsys.yo, + Doc/Zsh/compsys.yo, Doc/Zsh/func.yo, Doc/Zsh/grammar.yo, + Doc/Zsh/mod_pref.yo, Doc/Zsh/options.yo, Doc/Zsh/zle.yo: + spelling corrections. + 2008-06-09 Peter Stephenson <pws@csr.com> * unposted: Src/Zle/compmatch.c: silence compiler (has no @@ -5,14 +15,13 @@ 2008-06-08 Peter Stephenson <p.w.stephenson@ntlworld.com> - * 25138(?): Completion/compinstall, Doc/Zsh/compwid.yo, + * 25139: Completion/compinstall, Doc/Zsh/compwid.yo, Src/pattern.c, Src/zsh.h, Src/Zle/comp.h, Src/Zle/complete.c, Src/Zle/compmatch.c, Src/Zle/computil.c: enhance completion matching to make it possible to use wide characters (not yet done); also allows named character ranges, so that {[:lower:]}={[:upper:]} works (for now, just for single-byte - character sets). Committing this while the mailing list - appears to be stuck. + character sets). 2008-06-05 Doug Kearns <dougkearns@gmail.com> diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo index 68f614508..d7e3526cb 100644 --- a/Doc/Zsh/builtins.yo +++ b/Doc/Zsh/builtins.yo @@ -1613,7 +1613,7 @@ unit is printed before each value. When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit -for some other reson it will continue trying to set the remaining limits. +for some other reason it will continue trying to set the remaining limits. startsitem() sitem(tt(-a))(Lists all of the current resource limits.) diff --git a/Doc/Zsh/calsys.yo b/Doc/Zsh/calsys.yo index 8758b1189..934746f08 100644 --- a/Doc/Zsh/calsys.yo +++ b/Doc/Zsh/calsys.yo @@ -382,7 +382,7 @@ as a tt(start) time. item(tt(-s))( Use the shell's tt(sched) command to schedule a timed event that will warn the user when an event is due. Note that the tt(sched) command -only runs if the shell is at an interactive prompt; a foreground taks +only runs if the shell is at an interactive prompt; a foreground task blocks the scheduled task from running until it is finished. The timed event usually runs the programme tt(calendar_show) to show diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo index 59be912f6..78a3135f6 100644 --- a/Doc/Zsh/compsys.yo +++ b/Doc/Zsh/compsys.yo @@ -1242,7 +1242,7 @@ For these commands a tt(-) is used to introduce a directory stack entry and completion of these is far more common than completing options. Hence unless the value of this style is true options will not be completed, even after an initial tt(-). If it is true, options will -be completed after an initial tt(-) unless there is a preceeding +be completed after an initial tt(-) unless there is a preceding tt(-)tt(-) on the command line. ) kindex(completer, completion style) diff --git a/Doc/Zsh/func.yo b/Doc/Zsh/func.yo index 1bdf169c1..6b6202831 100644 --- a/Doc/Zsh/func.yo +++ b/Doc/Zsh/func.yo @@ -189,7 +189,7 @@ findex(precmd) vindex(precmd_functions) item(tt(precmd))( Executed before each prompt. Note that precommand functions are not -reexecuted simply because the command line is redrawn, as happens, for +re-executed simply because the command line is redrawn, as happens, for example, when a notification about an exiting job is displayed. ) findex(preexec) diff --git a/Doc/Zsh/grammar.yo b/Doc/Zsh/grammar.yo index fb07a63e2..ff8e6658e 100644 --- a/Doc/Zsh/grammar.yo +++ b/Doc/Zsh/grammar.yo @@ -452,7 +452,7 @@ sect(Comments) cindex(comments) pindex(INTERACTIVE_COMMENTS, use of) vindex(histchars, use of) -In noninteractive shells, or in interactive shells with the +In non-interactive shells, or in interactive shells with the tt(INTERACTIVE_COMMENTS) option set, a word beginning with the third character of the tt(histchars) parameter (`tt(#)' by default) causes that word and all the following diff --git a/Doc/Zsh/mod_zprof.yo b/Doc/Zsh/mod_zprof.yo index 7d8b7bc2d..cd06dd310 100644 --- a/Doc/Zsh/mod_zprof.yo +++ b/Doc/Zsh/mod_zprof.yo @@ -21,16 +21,16 @@ the number of the function in order, which is used in other parts of the list in suffixes of the form `tt([)var(num)tt(])'), then the number of calls made to the function. The next three columns list the time in -milliseconds spent in the function and its descendents, the average +milliseconds spent in the function and its descendants, the average time in milliseconds spent in the function and its descendents per call and the percentage of time spent in all shell functions used in -this function and its descendents. The following three columns give +this function and its descendants. The following three columns give the same information, but counting only the time spent in the function itself. The final column shows the name of the function. After the summary, detailed information about every function that was invoked is listed, sorted in decreasing order of the amount of time spent -in each function and its descendents. Each of these entries consists of +in each function and its descendants. Each of these entries consists of descriptions for the functions that called the function described, the function itself, and the functions that were called from it. The description for the function itself has the same format as in the summary @@ -42,10 +42,10 @@ the section from the surrounding lines. The information shown in this case is almost the same as in the summary, but only refers to the call hierarchy being displayed. For example, for a calling function the column showing the total running time lists the time -spent in the described function and its descendents only for the times when +spent in the described function and its descendants only for the times when it was called from that particular calling function. Likewise, for a called function, this columns lists the total time spent in the called -function and its descendents only for the times when it was called from the +function and its descendants only for the times when it was called from the function described. Also in this case, the column showing the number of calls to a function diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index c0a3f65b8..e2e36dc5f 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -440,7 +440,7 @@ pattern matching, parameter values and various delimiters. The option is on by default if the shell was compiled with tt(MULTIBYTE_SUPPORT) except in tt(sh) emulation; otherwise it is off by default and has no effect if turned on. The mode is off in tt(sh) -emulation for compatibility but for interative use may need to be +emulation for compatibility but for interactive use may need to be turned on if the terminal interprets multibyte characters. If the option is off a single byte is always treated as a single @@ -1460,7 +1460,7 @@ cindex(Unicode combining characters) item(tt(COMBINING_CHARS))( Assume that the terminal displays combining characters correctly. Specifically, if a base alphanumeric character is followed by one or more -zero-width punctuation characters, assume that the zero-width charaters +zero-width punctuation characters, assume that the zero-width characters will be displayed as modifications to the base character within the same width. Not all terminals handle this. If this option is not set, zero-width characters are displayed separately with special diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo index 9f2eec388..57dd020eb 100644 --- a/Doc/Zsh/zle.yo +++ b/Doc/Zsh/zle.yo @@ -34,7 +34,7 @@ ifzman(see em(Character Highlighting) below)\ ifnzman(noderef(Character Highlighting)). Highlighting of special characters and the region between the cursor and the mark (as set with tt(set-mark-command) in Emacs mode) is enabled -by default; consult this reference for more information. Irrascible +by default; consult this reference for more information. Irascible conservatives will wish to know that all highlighting may be disabled by the following setting: diff --git a/Src/builtin.c b/Src/builtin.c index 42eca3e21..af2c24fd6 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -1745,7 +1745,8 @@ typeset_setbase(const char *name, Param pm, Options ops, int on, int always) return 1; } if (pm->base < 2 || pm->base > 36) { - zwarnnam(name, "invalid base: %d", pm->base); + zwarnnam(name, "invalid base (must be 2 to 36 inclusive): %d", + pm->base); return 1; } } else if (always) diff --git a/Src/math.c b/Src/math.c index 3374efddd..5b6941953 100644 --- a/Src/math.c +++ b/Src/math.c @@ -461,7 +461,8 @@ zzlex(void) if(*ptr != ']') goto bofs; if (outputradix < 2 || outputradix > 36) { - zerr("invalid base: %d", outputradix); + zerr("invalid base (must be 2 to 36 inclusive): %d", + outputradix); return EOI; } ptr++; diff --git a/Src/utils.c b/Src/utils.c index 6815f3cc4..19b5ab011 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -1844,7 +1844,7 @@ zstrtol(const char *s, char **t, int base) } inp = s; if (base < 2 || base > 36) { - zerr("invalid base: %d", base); + zerr("invalid base (must be 2 to 36 inclusive): %d", base); return (zlong)0; } else if (base <= 10) for (; *s >= '0' && *s < ('0' + base); s++) { |