Merge branch 'format-test'

diff --cc .gitignore
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc docs/README.manpages
index 6d6111df8eb7616b768bf9a02866613154b6938f,33693df31a7a173447d0043b1d89fafefff3dc21..6bb6636bc088c1c4e6d8e673574de13731078203
--- 1/docs/README.manpages
--- 2/docs/README.manpages
+++ b/docs/README.manpages
@@@ -8,8 -8,9 +8,10 @@@ nmh manpages should be in this general 
  .\"
  .SH NAME
  comp \- compose a message
 +.\"
  .SH SYNOPSIS
+ .HP 5
+ .na
  .B comp 
  .RI [ +folder ]
  .RI [ msgs ]

diff --cc sbr/fmt_compile.c
Simple merge

diff --cc sbr/fmt_scan.c
index 6cceff3266588ab15cc7b454cca6d34c4c040a29,e654b15e91a95fb9c5bdabae934e552a6f4ccc46..dad7a3c6a08c56700b2392a0af291bb548ceb928
--- 1/sbr/fmt_scan.c
--- 2/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@@ -351,10 -328,13 +351,11 @@@ get_x400_comp (char *mbox, char *key, c
  }
  
  struct format *
- fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat)
+ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
+         struct fmt_callbacks *callbacks)
  {
 -    char *cp, *ep;
 -    unsigned char *sp;
 -    char *savestr = NULL;
 -    unsigned char *str = NULL;
 +    char *cp, *ep, *sp;
 +    char *savestr = NULL, *str = NULL;
      char buffer[BUFSIZ], buffer2[BUFSIZ];
      int i, c, ljust, n;
      int value = 0;

diff --cc uip/forwsbr.c
Simple merge

diff --cc uip/mhlsbr.c
index 6babf5105e01118adf2505c0159aa3d93b79af4e,fc0a1a109a6d75cbb81a032958148ad603cf63cb..5dbf341cc09c99ccf366db7cbd2eef4e723d2ca4
--- 1/uip/mhlsbr.c
--- 2/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@@ -1881,9 -1871,9 +1883,9 @@@ filterbody (struct mcomp *c1, char *buf
         * Pull out each argument and scan them.
         */
  
 -      for (a = arglist_head, i = 1; a != NULL; a = a->a_next, i++) {
 +      for (a = arglist_head, i = argp; a != NULL; a = a->a_next, i++) {
            args[i] = mh_xmalloc(BUFSIZ);
-           fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat);
+           fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL);
            /*
             * fmt_scan likes to put a trailing newline at the end of the
             * format string.  If we have one, get rid of it.

diff --cc uip/rcvdist.c
Simple merge

diff --cc uip/replsbr.c
index eff1877e26d54f8faeb20431201d572f246a5790,2117037608c6d8b7f1526f9633e9544c46236c8b..a7a214bf538ad69ac735b7e420510148818d4e89
--- 1/uip/replsbr.c
--- 2/uip/replsbr.c
+++ b/uip/replsbr.c
@@@ -69,9 -71,10 +71,10 @@@ replout (FILE *inb, char *msg, char *dr
      struct format *fmt;
      register char **ap;
      int       char_read = 0, format_len, mask;
 -    char name[NAMESZ], *scanl;
 -    unsigned char *cp;
 +    char name[NAMESZ], *scanl, *cp;
      static int dat[5];                        /* aux. data for format routine */
 +    m_getfld_state_t gstate = 0;
+     struct fmt_callbacks cb;
  
      FILE *out;
      NMH_UNUSED (msg);

diff --cc uip/scansbr.c
Simple merge