Don't invoke "builtin" as an external editor. Note: It's not clear

to me that this is really the right approach.  Revisit Editor/Visual
some time.

diff --git a/compose.c b/compose.c
index 8bd93b01c99fedaef6bc6909e145876d5ee4dbcc..ad9dc22270c158e9a05a6dc188853736dc4566ee 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -572,8 +572,9 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
        }
        /* fall through */
       case OP_COMPOSE_EDIT_HEADERS:
-       if (op == OP_COMPOSE_EDIT_HEADERS ||
-           (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))
+       if (mutt_strcmp ("builtin", Editor) != 0 &&
+           (op == OP_COMPOSE_EDIT_HEADERS ||
+           (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS))))
        {
          char *tag = NULL, *err = NULL;
          mutt_env_to_local (msg->env);