summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3ca6b4f)
- ignore $stuff_quoted when preparing f=f replies
- always display (partial) messages even if body handlers fail; e.g. for invalid passphrases we now at least have gpg/pgp output instead of no output and error 'could not copy message'
git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@452
e385b8ad-14ed-0310-8656-
cc95a2468c6d
mutt_wait_filter (filterpid);
safe_fclose (&fpfilterout);
}
mutt_wait_filter (filterpid);
safe_fclose (&fpfilterout);
}
+#if 0
+ /* this is maybe just plain wrong but it makes the pager display
+ * what we have; i.e. for the crypto stuff we only get
+ * 'Could not copy message' for invalid passphrases, no PGP output
+ * not nothing; so just display what we have...
+ * - pdmef
+ */
mutt_unlink (tempfile);
return 0;
mutt_unlink (tempfile);
return 0;
}
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
}
if (fpfilterout != NULL && mutt_wait_filter (filterpid) != 0)
if (MaxLineLength > 0) {
width = MaxLineLength - WrapMargin - ql - 1;
if (MaxLineLength > 0) {
width = MaxLineLength - WrapMargin - ql - 1;
- if (option (OPTSTUFFQUOTED))
+ if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED))
--width;
if (width < 0)
width = MaxLineLength;
--width;
if (width < 0)
width = MaxLineLength;
else
width = COLS - WrapMargin - ql - 1;
else
width = COLS - WrapMargin - ql - 1;
- if (option (OPTSTUFFQUOTED))
+ if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED))
--width;
if (width < 0)
width = COLS;
--width;
if (width < 0)
width = COLS;
if (s->prefix)
state_puts(s->prefix,s);
for (i=0;i<ql;++i) state_putc('>',s);
if (s->prefix)
state_puts(s->prefix,s);
for (i=0;i<ql;++i) state_putc('>',s);
- if (option(OPTSTUFFQUOTED))
+ if (!(s->flags & M_REPLYING) && option(OPTSTUFFQUOTED))
state_putc(' ',s);
}
state_putc('\n',s);
state_putc(' ',s);
}
state_putc('\n',s);
for (i = 0; i < ql; ++i)
state_putc ('>', s);
for (i = 0; i < ql; ++i)
state_putc ('>', s);
- if (option (OPTSTUFFQUOTED) && (ql > 0 || s->prefix))
+ if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED) &&
+ (ql > 0 || s->prefix))
state_putc (' ', s);
if (delsp && spaces && space_len > 0) {
state_putc (' ', s);
if (delsp && spaces && space_len > 0) {
}
debug_print (4, ("f=f: quotelevel = %d, new prefix = '%s'\n",
i, NONULL (quote)));
}
debug_print (4, ("f=f: quotelevel = %d, new prefix = '%s'\n",
i, NONULL (quote)));
- /* if we changed prefix, make sure we respect $stuff_quoted */
- snprintf (dst, dstlen, "%s%s%s%s", NONULL (s->prefix), NONULL (quote),
- option (OPTSTUFFQUOTED) && line[offset] != ' ' ? " " : "",
+ snprintf (dst, dstlen, "%s%s%s", NONULL (s->prefix), NONULL (quote),