diff options
| author | Miles Bader <miles@gnu.org> | 1997-06-05 02:01:31 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 1997-06-05 02:01:31 +0000 |
| commit | cf4cbf64ae20a0272926597f196bab408a001ccd (patch) | |
| tree | 66007c9f5888de81815f90e3747e7ecfe752cc07 | |
| parent | 9fc2aa73ab8109d4584713d2955875217b72e9f9 (diff) | |
(_help):
Use uparams.usage_indent instead of the USAGE_INDENT macro.
| -rw-r--r-- | libshouldbeinlibc/argp-help.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libshouldbeinlibc/argp-help.c b/libshouldbeinlibc/argp-help.c index 5a893350..1be023f0 100644 --- a/libshouldbeinlibc/argp-help.c +++ b/libshouldbeinlibc/argp-help.c @@ -1333,6 +1333,10 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state, if (! nl) nl = fdoc + strlen (fdoc); + if (nl > fdoc && nl[-1] == '\r') + /* `consumes-args' marker. Removed the marker, and note that we + shouldn't process any children. */ + /* Manually do line wrapping so that it (probably) won't get wrapped at any embedded spaces. */ space (stream, 1 + nl - fdoc); @@ -1499,7 +1503,7 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream, do { int old_lm; - int old_wm = __argp_fmtstream_set_wmargin (fs, USAGE_INDENT); + int old_wm = __argp_fmtstream_set_wmargin (fs, uparams.usage_indent); char *levels = pattern_levels; __argp_fmtstream_printf (fs, "%s %s", @@ -1508,7 +1512,7 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream, /* We set the lmargin as well as the wmargin, because hol_usage manually wraps options with newline to avoid annoying breaks. */ - old_lm = __argp_fmtstream_set_lmargin (fs, USAGE_INDENT); + old_lm = __argp_fmtstream_set_lmargin (fs, uparams.usage_indent); if (flags & ARGP_HELP_SHORT_USAGE) /* Just show where the options go. */ |