#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
-#include "enter.h"
-#include "mutt_curses.h"
#include "mutt_idna.h"
-#include "mutt_menu.h"
#include "rfc1524.h"
#include "attach.h"
#include "recvattach.h"
M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
}
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
static void redraw_crypt_lines (HEADER * msg)
{
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;
}
/* 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;
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 */