projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The little Christmas candy bar: allow utf-8 chars in Tochars \o/
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
d8d8cf5
..
a2e03b0
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-135,14
+135,14
@@
static void post_entry (char *s, ssize_t slen, MUTTMENU * menu, int entry)
CONTEXT *ctx = (CONTEXT *) menu->data;
_mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry],
CONTEXT *ctx = (CONTEXT *) menu->data;
_mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry],
-
M_FORMAT_ARROWCURSOR
);
+
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0
);
}
static HEADER *select_msg (void)
{
MUTTMENU *menu;
int i, done = 0, r = -1;
}
static HEADER *select_msg (void)
{
MUTTMENU *menu;
int i, done = 0, r = -1;
- char helpstr[S
HORT_S
TRING];
+ char helpstr[STRING];
short orig_sort;
menu = mutt_new_menu ();
short orig_sort;
menu = mutt_new_menu ();
@@
-343,8
+343,6
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
string_list_wipe(&tmp);
tmp = next;
}
string_list_wipe(&tmp);
tmp = next;
}
-
-#ifdef MIXMASTER
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
@@
-365,8
+363,6
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
string_list_wipe(&tmp);
tmp = next;
}
string_list_wipe(&tmp);
tmp = next;
}
-#endif
-
else {
last = tmp;
tmp = tmp->next;
else {
last = tmp;
tmp = tmp->next;
@@
-593,22
+589,18
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
s.flags = 0;
if (b->type == TYPETEXT) {
s.flags = 0;
if (b->type == TYPETEXT) {
- if (!ascii_strcasecmp
- ("yes", parameter_getval(b->parameter, "x-mutt-noconv")))
- b->noconv = 1;
- else {
+ b->noconv = !ascii_strcasecmp("yes", parameter_getval(b->parameter,
+ "x-mutt-noconv"));
+ if (b->noconv)
s.flags |= M_CHARCONV;
s.flags |= M_CHARCONV;
- b->noconv = 0;
- }
parameter_delval(&b->parameter, "x-mutt-noconv");
}
parameter_delval(&b->parameter, "x-mutt-noconv");
}
-
mutt_adv_mktemp (NULL, file, sizeof (file)
);
- if (
(s.fpout = safe_fopen (file, "w")) == NULL
)
+
s.fpout = m_tempfile(file, sizeof(file), NONULL(Tempdir), file
);
+ if (
!s.fpout
)
goto bail;
goto bail;
-
if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
mutt_body_handler (b, &s);
if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
mutt_body_handler (b, &s);