Merge branch 'jk/subtree-do-not-push-if-split-fails'

diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index 030174db515e764aa883b21afe9be8fb3ae41f2e..7980abd1a71d0676f35eb300c46a30a7298e82f3 100644 (file)
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -78,7 +78,7 @@ void precompose_argv(int argc, const char **argv)
                size_t namelen;
                oldarg = argv[i];
                if (has_non_ascii(oldarg, (size_t)-1, &namelen)) {
-                       newarg = reencode_string_iconv(oldarg, namelen, ic_precompose);
+                       newarg = reencode_string_iconv(oldarg, namelen, ic_precompose, NULL);
                        if (newarg)
                                argv[i] = newarg;
                }