diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | Util/helpfiles | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index a1f7c62ee..55eb47b96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-09-02 Bart Schaefer <schaefer@zsh.org> + * 12725: Util/helpfiles: Recognize more end-of-page patterns, and + find the end of the builtins section correctly. + * 12723: Util/reporter: Modernize variables and options handling; add zstyle to output. diff --git a/Util/helpfiles b/Util/helpfiles index 472132b29..56e77759e 100755 --- a/Util/helpfiles +++ b/Util/helpfiles @@ -109,8 +109,9 @@ BUILTINS: while (<>) { $undented && &doprint($_); while (defined($_ = <>) && /(^\w)|(^\s*$)/) { last BUILTINS if /^STARTUP\/SHUTDOWN FILES/; + last if /^zsh.*\s\d$/; # GNU nroff -man end-of-page marker } - if (/^\s*Page/) { + if (/^\s*Page/ || /^zsh.*\s\d$/) { do { $_ = <>; } while (defined($_) && /^\s*$/); @@ -121,8 +122,8 @@ BUILTINS: while (<>) { } } # In zshall, the zshcompctl manual page comes after the - # builtins. - if (/ZSHCOMPCTL\(1\).*ZSHCOMPCTL\(1\)/) { + # 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) { |