X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e768e3cc0ce768373d3320eca4cdd08b8cf646a..be6c3984:/uip/conflict.c?ds=sidebyside diff --git a/uip/conflict.c b/uip/conflict.c index a43c70ee..4c140022 100644 --- a/uip/conflict.c +++ b/uip/conflict.c @@ -68,14 +68,7 @@ main (int argc, char **argv) char *cp, **argp, **arguments; char buf[BUFSIZ], *akv[50]; -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); - - /* foil search of user profile/context */ - if (context_foil (NULL) == -1) - done (1); + if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; } mts_init (invo_name); arguments = getarguments (invo_name, argc, argv, 0);