diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:03:59 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:03:59 -0800 |
commit | 75288cc7e120cfcce4b11699d034bcadccdf9344 (patch) | |
tree | 2150de06391c509528c4b4aa796868cd2d78d21f /parse-options.c | |
parent | d08d25909554497c85f19b1eebefcfd5b49c6613 (diff) | |
parent | c082196575e13dd5960031f213b20e2df989ca18 (diff) | |
download | git-75288cc7e120cfcce4b11699d034bcadccdf9344.tar.gz |
Merge branch 'jx/utf8-printf-width' into maint
* 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 c1c66bd408..670bf09b45 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, @@ -491,7 +492,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 @@ -550,7 +551,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)) |