X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=56030ee48350371eff09e9a1d1ec26af442fe73a;hp=06a8a6f2789108d13ab57e267234c4d92e1abc56;hb=99f5c6c8a6c4e73aeb253e5c7f1d0035cabc8db0;hpb=766fd6928123218aca635827248299ceeeb1d170

diff --git a/main.c b/main.c
index 06a8a6f..56030ee 100644
--- a/main.c
+++ b/main.c
@@ -28,7 +28,7 @@
 #include "mx.h"
 #include "buffy.h"
 #include "sort.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "url.h"
@@ -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\
@@ -301,21 +300,11 @@ static void show_version (void)
 #endif
     );
   puts (
-#ifdef USE_POP
-         "  +USE_POP  "
-#else
-         "  -USE_POP  "
-#endif
 #ifdef USE_NNTP
          "+USE_NNTP  "
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_IMAP
-         "+USE_IMAP  "
-#else
-         "-USE_IMAP  "
-#endif
 #ifdef USE_GSS
          "+USE_GSS  "
 #else
@@ -569,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':
@@ -668,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;
@@ -779,10 +764,8 @@ int main (int argc, char **argv)
 
     m_strcpy(fpath, sizeof(fpath), Maildir);
     mutt_expand_path (fpath, sizeof (fpath));
-#ifdef USE_IMAP
     /* we're not connected yet - skip mail folder creation */
     if (mx_get_magic (fpath) != M_IMAP)
-#endif
       if (stat (fpath, &sb) == -1 && errno == ENOENT) {
         snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
                   Maildir);