diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:29:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:29:08 -0800 |
| commit | 3cc3cf970c5ce477bde78df73614d1efba2b52eb (patch) | |
| tree | 2bcc9526ccf586db926050ee6e01fe2e2e418982 /parse-options.c | |
| parent | eb213fc3fce895e1b279247dd5e5fa6c168f90e4 (diff) | |
| parent | c082196575e13dd5960031f213b20e2df989ca18 (diff) | |
| download | git-3cc3cf970c5ce477bde78df73614d1efba2b52eb.tar.gz | |
Merge branch 'jx/utf8-printf-width'
Use a new helper that prints a message and counts its display width
to align the help messages parse-options produces.
* jx/utf8-printf-width:
Add utf8_fprintf helper that returns correct number of columns
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/parse-options.c b/parse-options.c index 67e98a6323..a6ce9efb79 100644 --- a/parse-options.c +++ b/parse-options.c @@ -3,6 +3,7 @@ #include "cache.h" #include "commit.h" #include "color.h" +#include "utf8.h" static int parse_options_usage(struct parse_opt_ctx_t *ctx, const char * const *usagestr, @@ -482,7 +483,7 @@ static int usage_argh(const struct option *opts, FILE *outfile) s = literal ? "[%s]" : "[<%s>]"; else s = literal ? " %s" : " <%s>"; - return fprintf(outfile, s, opts->argh ? _(opts->argh) : _("...")); + return utf8_fprintf(outfile, s, opts->argh ? _(opts->argh) : _("...")); } #define USAGE_OPTS_WIDTH 24 @@ -541,7 +542,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx, if (opts->long_name) pos += fprintf(outfile, "--%s", opts->long_name); if (opts->type == OPTION_NUMBER) - pos += fprintf(outfile, "-NUM"); + pos += utf8_fprintf(outfile, _("-NUM")); if ((opts->flags & PARSE_OPT_LITERAL_ARGHELP) || !(opts->flags & PARSE_OPT_NOARG)) |