X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=9cf043719b67b9c780466100e789bc1162dfd697;hb=d6752c527a018c1bbb44d40dd40de7bbb1ef975b;hp=32669b1c7ca8ba8679076f2094bd6adcc59c98af;hpb=4761fa78a6dfc9437caa6e6e0aac806e50e01c83;p=apps%2Fmadmutt.git

diff --git a/main.c b/main.c
index 32669b1..9cf0437 100644
--- a/main.c
+++ b/main.c
@@ -185,7 +185,6 @@ options:\n\
   -t\t\tprint the value of all variables to stdout\n\
   -T\t\tprint the value of all changed variables to stdout\n\
   -v\t\tshow version and compile-time definitions\n\
-  -x\t\tsimulate the mailx send mode\n\
   -y\t\tselect a mailbox specified in your `mailboxes' list\n\
   -z\t\texit immediately if there are no messages in the mailbox\n\
   -Z\t\topen the first folder with new message, exit immediately if none\n\
@@ -559,10 +558,10 @@ int main (int argc, char **argv)
 #ifdef USE_NNTP
   while ((i =
           getopt (argc, argv,
-                  "A:a:b:F:f:c:d:e:g:GH:s:i:hm:npQ:RTtvxyzZ")) != EOF)
+                  "A:a:b:F:f:c:d:e:g:GH:s:i:hm:npQ:RTtvyzZ")) != EOF)
 #else
   while ((i =
-          getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvxyzZ")) != EOF)
+          getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF)
 #endif
     switch (i) {
     case 'A':
@@ -589,9 +588,9 @@ int main (int argc, char **argv)
     case 'b':
     case 'c':
       if (!msg)
-        msg = mutt_new_header ();
+        msg = header_new();
       if (!msg->env)
-        msg->env = mutt_new_envelope ();
+        msg->env = envelope_new();
       if (i == 'b')
         msg->env->bcc = rfc822_parse_adrlist (msg->env->bcc, optarg);
       else
@@ -658,10 +657,6 @@ int main (int argc, char **argv)
       version++;
       break;
 
-    case 'x':                  /* mailx compatible send mode */
-      sendflags |= SENDMAILX;
-      break;
-
     case 'y':                  /* My special hack mode */
       flags |= M_SELECT;
       break;
@@ -765,16 +760,16 @@ int main (int argc, char **argv)
   if (!option (OPTNOCURSES) && Maildir) {
     struct stat sb;
     char fpath[_POSIX_PATH_MAX];
-    char msg[STRING];
+    char mesg[STRING];
 
     m_strcpy(fpath, sizeof(fpath), Maildir);
     mutt_expand_path (fpath, sizeof (fpath));
     /* we're not connected yet - skip mail folder creation */
     if (mx_get_magic (fpath) != M_IMAP)
       if (stat (fpath, &sb) == -1 && errno == ENOENT) {
-        snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
+        snprintf (mesg, sizeof (mesg), _("%s does not exist. Create it?"),
                   Maildir);
-        if (mutt_yesorno (msg, M_YES) == M_YES) {
+        if (mutt_yesorno (mesg, M_YES) == M_YES) {
           if (mkdir (fpath, 0700) == -1 && errno != EEXIST)
             mutt_error (_("Can't create %s: %s."), Maildir, strerror (errno));
         }
@@ -798,13 +793,13 @@ int main (int argc, char **argv)
       mutt_flushinp ();
 
     if (!msg)
-      msg = mutt_new_header ();
+      msg = header_new();
 
     if (draftFile)
       infile = draftFile;
     else {
       if (!msg->env)
-        msg->env = mutt_new_envelope ();
+        msg->env = envelope_new();
 
       for (i = optind; i < argc; i++) {
         if (url_check_scheme (argv[i]) == U_MAILTO)