From: Ken Hornstein <kenh@pobox.com>
Date: Thu, 23 Jan 2014 18:35:31 +0000 (-0500)
Subject: Merge branch 'mhbuild-always'
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/64e8827c5d5def0325ab7181fe939623c77e807c?ds=inline;hp=--cc

Merge branch 'mhbuild-always'
---

64e8827c5d5def0325ab7181fe939623c77e807c
diff --cc uip/send.c
index be5dc793,3ba82fb5..626eba16
--- a/uip/send.c
+++ b/uip/send.c
@@@ -117,10 -117,10 +117,8 @@@ main (int argc, char **argv
      char *msgs[MAXARGS], **vec;
      struct msgs *mp;
      struct stat st;
-     char *attach = NMH_ATTACH_HEADER;	/* header field name for attachments */
-     int attachformat = 1; /* mhbuild format specifier for attachments */
  
 -#ifdef LOCALE
      setlocale(LC_ALL, "");
 -#endif
      invo_name = r1bindex (argv[0], '/');
  
      /* read user profile/context */
diff --cc uip/viamail.c
index 39ccf509,e0143992..13447382
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@@ -57,13 -57,12 +57,10 @@@ main (int argc, char **argv
      char *cp, buf[BUFSIZ];
      char **argp, **arguments;
  
 -#ifdef LOCALE
      setlocale(LC_ALL, "");
 -#endif
      invo_name = r1bindex (argv[0], '/');
  
-     /* foil search of user profile/context */
-     if (context_foil (NULL) == -1)
- 	done (1);
+     context_read();
  
      arguments = getarguments (invo_name, argc, argv, 0);
      argp = arguments;