gettext

2a88aede - xgettext: Delay calls to from_current_source_encoding, part 2.

xgettext: Delay calls to from_current_source_encoding, part 2. * gettext-tools/src/xg-arglist-parser.h: Include xg-mixed-string.h. (struct partial_call): Change type of fields msgctxt, msgid, msgid_plural to 'mixed_string_ty *'. (arglist_parser_remember, arglist_parser_remember_msgctxt): Take a 'mixed_string_ty *' argument instead of a 'char *' argument. * gettext-tools/src/xg-arglist-parser.c (arglist_parser_clone): Update accordingly. (arglist_parser_remember, arglist_parser_remember_msgctxt): Take a 'mixed_string_ty *' argument. (arglist_parser_done): Convert the mixed_string to UTF-8 encoded 'char *' here. This is where from_current_source_encoding gets invoked now: immediately before invoking remember_a_message, that is, only when we really need to know the --from-source encoding. * gettext-tools/src/x-c.c (extract_parenthesized): Pass the mixed_string to arglist_parser_remember. Don't set xgettext_current_source_encoding around arglist_parser_done calls. * gettext-tools/src/x-csharp.c (extract_parenthesized): Likewise. * gettext-tools/src/x-java.c (extract_parenthesized): Likewise. * gettext-tools/src/x-javascript.c (extract_balanced): Likewise. * gettext-tools/src/x-python.c (extract_balanced): Likewise. * gettext-tools/src/x-vala.c (extract_balanced): Likewise. * gettext-tools/src/x-lisp.c: Include xg-mixed-string.h. (read_object): Convert the string to a mixed_string_ty before passing it to arglist_parser_remember. * gettext-tools/src/x-elisp.c: Likewise. * gettext-tools/src/x-librep.c: Likewise. * gettext-tools/src/x-scheme.c: Likewise. * gettext-tools/src/x-awk.c: Include xg-mixed-string.h. (extract_parenthesized): Convert the string to a mixed_string_ty before passing it to arglist_parser_remember. * gettext-tools/src/x-lua.c: Include xg-mixed-string.h. (extract_balanced): Convert the string to a mixed_string_ty before passing it to arglist_parser_remember. * gettext-tools/src/x-php.c: Include xg-mixed-string.h. (extract_balanced): Convert the string to a mixed_string_ty before passing it to arglist_parser_remember. * gettext-tools/src/x-sh.c: Include xg-mixed-string.h. (read_command): Convert the string to a mixed_string_ty before passing it to arglist_parser_remember. * gettext-tools/src/x-tcl.c: Include xg-mixed-string.h. (read_command): Convert the string to a mixed_string_ty before passing it to arglist_parser_remember. * gettext-tools/src/x-perl.c (extract_balanced): Convert the string to a mixed_string_ty before passing it to arglist_parser_remember. Don't set xgettext_current_source_encoding around arglist_parser_done calls.