X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=44c7f4df2c0037d5b3001629f1c89dfeaca04eca;hp=aed420ba5549638da6e792832a3dc255b162f967;hb=a8808601c98c76ec8344c8e4ba5a607d72c2805e;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1

diff --git a/compose.c b/compose.c
index aed420b..44c7f4d 100644
--- a/compose.c
+++ b/compose.c
@@ -142,7 +142,7 @@ static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
                      M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
 }
 
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 static void redraw_crypt_lines (HEADER * msg)
 {
@@ -686,8 +686,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
     case OP_COMPOSE_EDIT_MESSAGE:
-      if (Editor && (m_strcmp("builtin", Editor) != 0)
-          && !option (OPTEDITHDRS)) {
+      if (Editor && !option (OPTEDITHDRS)) {
         mutt_edit_file (Editor, msg->content->filename);
         mutt_update_encoding (msg->content);
         menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
@@ -696,8 +695,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       }
       /* fall through */
     case OP_COMPOSE_EDIT_HEADERS:
-      if (m_strcmp("builtin", Editor) != 0 &&
-          (op == OP_COMPOSE_EDIT_HEADERS ||
+      if ((op == OP_COMPOSE_EDIT_HEADERS ||
            (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
         const char *tag = NULL;
         const char *err = NULL;
@@ -710,13 +708,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           p_delete(&err);
         }
       }
-      else {
-        /* this is grouped with OP_COMPOSE_EDIT_HEADERS because the
-           attachment list could change if the user invokes ~v to edit
-           the message with headers, in which we need to execute the
-           code below to regenerate the index array */
-        mutt_builtin_editor (msg->content->filename, msg, cur);
-      }
       mutt_update_encoding (msg->content);
 
       /* attachments may have been added */
@@ -853,12 +844,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         else
 #endif
           mutt_expand_path (fname, sizeof (fname));
-#ifdef USE_IMAP
         if (mx_get_magic (fname) != M_IMAP)
-#endif
-#ifdef USE_POP
           if (mx_get_magic (fname) != M_POP)
-#endif
 #ifdef USE_NNTP
             if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS))
 #endif