pending-release-notes: add mhshow's "-prefer", and mh-format's %(kibi/kilo)

[nmh] / uip / repl.c

diff --git a/uip/repl.c b/uip/repl.c
index e8d64907cdb63bea01eb583524cc69545bdff2ee..a9f03b3efa77c48361f29a90f7439625ce2d60f2 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -17,7 +17,7 @@
     X("annotate", 0, ANNOSW) \
     X("noannotate", 0, NANNOSW) \
     X("cc all|to|cc|me", 0, CCSW) \
-    X("nocc type", 0, NCCSW) \
+    X("nocc all|to|cc|me", 0, NCCSW) \
     X("draftfolder +folder", 0, DFOLDSW) \
     X("draftmessage msg", 0, DMSGSW) \
     X("nodraftfolder", 0, NDFLDSW) \
@@ -96,19 +96,19 @@ short cccc = -1;
 short ccme = -1;
 short querysw = 0;
 
-short outputlinelen = OUTPUTLINELEN;
-short groupreply = 0;          /* Is this a group reply?        */
+static short outputlinelen = OUTPUTLINELEN;
+static short groupreply = 0;           /* Is this a group reply?        */
 
-int mime = 0;                  /* include original as MIME part */
-char *form   = NULL;           /* form (components) file        */
-char *filter = NULL;           /* message filter file           */
-char *fcc    = NULL;           /* folders to add to Fcc: header */
+static int mime = 0;                   /* include original as MIME part */
+static char *form   = NULL;            /* form (components) file        */
+static char *filter = NULL;            /* message filter file           */
+static char *fcc    = NULL;            /* folders to add to Fcc: header */
 
 
 /*
  * prototypes
  */
-void docc (char *, int);
+static void docc (char *, int);
 
 
 int
@@ -129,13 +129,7 @@ main (int argc, char **argv)
 
     int buildsw = 0;
 
-#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;
@@ -386,7 +380,7 @@ try_it_again:
            adios (maildir, "unable to change directory to");
 
        /* read folder and create message structure */
-       if (!(mp = folder_read (folder)))
+       if (!(mp = folder_read (folder, 1)))
            adios (NULL, "unable to read folder %s", folder);
 
        /* check for empty folder */