mutt stable branch with some hacks
allow autoview preview of multipart/alternative content
add view-alt function, so now we have
* view-alt "v"
* view-alt-text "Esc v"
* view-alt-mailcap "V"
authored by
madroach
and committed by
Kevin J. McCarthy
e850e89f
20c7b0d8
+22
-8
+1
OPS
+1
OPS
···
49
49
OP_COMPOSE_TOGGLE_DISPOSITION "toggle disposition between inline/attachment"
50
50
OP_COMPOSE_TOGGLE_UNLINK "toggle whether to delete file after sending it"
51
51
OP_COMPOSE_UPDATE_ENCODING "update an attachment's encoding info"
52
+
OP_COMPOSE_VIEW_ALT "view multipart/alternative"
52
53
OP_COMPOSE_VIEW_ALT_TEXT "view multipart/alternative as text"
53
54
OP_COMPOSE_VIEW_ALT_MAILCAP "view multipart/alternative using mailcap"
54
55
OP_COMPOSE_WRITE_MESSAGE "write the message to a folder"
+14
-3
compose.c
+14
-3
compose.c
···
1509
1509
mutt_message_hook (NULL, msg, MUTT_SEND2HOOK);
1510
1510
break;
1511
1511
1512
+
case OP_COMPOSE_VIEW_ALT:
1512
1513
case OP_COMPOSE_VIEW_ALT_TEXT:
1513
1514
case OP_COMPOSE_VIEW_ALT_MAILCAP:
1514
1515
{
···
1522
1523
alternative = mutt_run_send_alternative_filter (msg->content);
1523
1524
if (!alternative)
1524
1525
break;
1525
-
mutt_view_attachment (NULL, alternative,
1526
-
op == OP_COMPOSE_VIEW_ALT_TEXT ? MUTT_AS_TEXT : MUTT_MAILCAP,
1527
-
NULL, actx);
1526
+
switch (op)
1527
+
{
1528
+
case OP_COMPOSE_VIEW_ALT_TEXT:
1529
+
op = MUTT_AS_TEXT;
1530
+
break;
1531
+
case OP_COMPOSE_VIEW_ALT_MAILCAP:
1532
+
op = MUTT_MAILCAP;
1533
+
break;
1534
+
default:
1535
+
op = MUTT_REGULAR;
1536
+
break;
1537
+
}
1538
+
mutt_view_attachment (NULL, alternative, op, NULL, actx);
1528
1539
mutt_free_body (&alternative);
1529
1540
break;
1530
1541
}
+5
-4
doc/manual.xml.head
+5
-4
doc/manual.xml.head
···
8157
8157
</screen>
8158
8158
8159
8159
<para>
8160
-
A preview of the alternative can be viewed in the compose menu
8161
-
using the functions <literal><view-alt-text></literal> and
8162
-
<literal><view-alt-mailcap></literal>, bound to "v"
8163
-
and "V" by default.
8160
+
A preview of the alternative can be viewed in the compose menu using the functions
8161
+
<literal><view-alt></literal>,
8162
+
<literal><view-alt-text></literal> and
8163
+
<literal><view-alt-mailcap></literal>, bound to
8164
+
"v", "Esc v" and "V" by default.
8164
8165
</para>
8165
8166
8166
8167
</sect1>
+2
-1
functions.h
+2
-1
functions.h
···
384
384
{ "toggle-recode", OP_COMPOSE_TOGGLE_RECODE, NULL },
385
385
{ "update-encoding", OP_COMPOSE_UPDATE_ENCODING, "U" },
386
386
{ "view-attach", OP_VIEW_ATTACH, MUTT_ENTER_S },
387
-
{ "view-alt-text", OP_COMPOSE_VIEW_ALT_TEXT, "v" },
387
+
{ "view-alt", OP_COMPOSE_VIEW_ALT, "v" },
388
+
{ "view-alt-text", OP_COMPOSE_VIEW_ALT_TEXT, "\033v" },
388
389
{ "view-alt-mailcap", OP_COMPOSE_VIEW_ALT_MAILCAP, "V" },
389
390
{ "send-message", OP_COMPOSE_SEND_MESSAGE, "y" },
390
391
{ "pipe-entry", OP_PIPE, "|" },