X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/17932f7aea1c21cf17738f47996345d9d0a6ce51..bc49ece4e36e2e50c330df468b325aa3741dc682:/uip/dist.c

diff --git a/uip/dist.c b/uip/dist.c
index d3ceaec2..09c501a8 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -83,13 +83,7 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     struct stat st;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -238,7 +232,8 @@ try_it_again:
     if (stat (drft, &st) != NOTOK) {
 	printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size);
 	for (i = LISTDSW; i != YESW;) {
-	    if (!(argp = getans ("\nDisposition? ", isdf ? aqrnl : aqrl)))
+	    if (!(argp = read_switch_multiword ("\nDisposition? ",
+						isdf ? aqrnl : aqrl)))
 		done (1);
 	    switch (i = smatch (*argp, isdf ? aqrnl : aqrl)) {
 		case NOSW: