projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use nntp_data_new and stop hiding the group in the struct, useless win.
[apps/madmutt.git]
/
recvcmd.c
diff --git
a/recvcmd.c
b/recvcmd.c
index
71fc95b
..
28cfc16
100644
(file)
--- a/
recvcmd.c
+++ b/
recvcmd.c
@@
-155,7
+155,6
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
buf[0] = 0;
rfc822_addrcat(buf, sizeof(buf), adr, 1);
buf[0] = 0;
rfc822_addrcat(buf, sizeof(buf), adr, 1);
-#define extra_space (15+7+2)
/*
* See commands.c.
*/
/*
* See commands.c.
*/
@@
-163,6
+162,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
(p ? _("Bounce message to %s") : _("Bounce messages to %s")),
buf);
(p ? _("Bounce message to %s") : _("Bounce messages to %s")),
buf);
+#define extra_space (15+7+2)
if (m_strwidth(prompt) > COLS - extra_space) {
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
if (m_strwidth(prompt) > COLS - extra_space) {
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
@@
-171,6
+171,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
} else {
m_strcat(prompt, sizeof(prompt), "?");
}
} else {
m_strcat(prompt, sizeof(prompt), "?");
}
+#undef extra_space
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
address_list_wipe(&adr);
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
address_list_wipe(&adr);
@@
-440,7
+441,7
@@
static void attach_forward_bodies (FILE * fp, HEADER * hdr,
tmphdr->env = envelope_new();
mutt_make_forward_subject (tmphdr->env, Context, parent);
tmphdr->env = envelope_new();
mutt_make_forward_subject (tmphdr->env, Context, parent);
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
MC
ore.tmpdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
mod_c
ore.tmpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
return;
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
return;
@@
-602,7
+603,7
@@
static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)
/* no MIME encapsulation */
/* no MIME encapsulation */
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
MC
ore.tmpdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
mod_c
ore.tmpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
@@
-849,7
+850,7
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
return;
}
return;
}
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
MC
ore.tmpdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
mod_c
ore.tmpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);