diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2006-03-13 19:03:30 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2006-03-13 19:03:30 +0000 |
| commit | 85f7080b89c49213deb4138a14ae397ad5b2fc8f (patch) | |
| tree | 1c8f196f55d4b58f698146d811141afa492a5f74 | |
| parent | a8d89a3d33e69193df328944987f33b9ec08813b (diff) | |
| download | zsh-85f7080b89c49213deb4138a14ae397ad5b2fc8f.tar.gz zsh-85f7080b89c49213deb4138a14ae397ad5b2fc8f.tar.xz zsh-85f7080b89c49213deb4138a14ae397ad5b2fc8f.zip | |
users/10013: fix use of zshall in helpfiles
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | Util/helpfiles | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 49f394d1f..9f54a02de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-13 Peter Stephenson <pws@csr.com> + + * users/10013: Util/helpfiles: fix use of zshall for + generating. + 2006-03-09 Wayne Davison <wayned@users.sourceforge.net> * users/10007: Francisco Borges: Doc/Zsh/options.yo: Added diff --git a/Util/helpfiles b/Util/helpfiles index 8c7f2bd70..c1c16ff74 100755 --- a/Util/helpfiles +++ b/Util/helpfiles @@ -107,7 +107,12 @@ BUILTINS: while (<>) { undef($undented); if (/^\s*$/ || ($undented = (/^(\s*)/ && length($1) < $indent))) { $undented && &doprint($_); - while (defined($_ = <>) && /(^\w)|(^\s*$)/) { + while (defined($_ = <>) && /(^\w)|(^\s*$)/) { + # NAME is the start of the next section when in zshall. + # (Historical note: we used to exit on the page header, + # but text from the old section can continue to the + # new page). + last BUILTINS if /^\s*NAME\s*$/; last BUILTINS if /^STARTUP\/SHUTDOWN FILES/; last if /^zsh.*\s\d$/; # GNU nroff -man end-of-page marker } @@ -121,11 +126,6 @@ BUILTINS: while (<>) { } while (defined($_) && /^\s*$/); } } - # In zshall, the zshcompctl manual page comes after the - # builtins for 3.0, and zshzle comes after it for 3.1. - if (/ZSH(COMPCTL|ZLE)\(1\).*ZSH(COMPCTL|ZLE)\(1\)/) { - last BUILTINS; - } if (/^(\s*)/ && length($1) < $indent) { # This may be just a bug on the SGI, or maybe something # more sinister (don\'t laugh, this is nroff). |