From d4f626bd3d644461a5d60bd9813bde871742b218 Mon Sep 17 00:00:00 2001 From: Rocco Rutte Date: Mon, 15 Jun 2009 16:15:45 +0200 Subject: [PATCH] pager: Ignore $wrap for attachment markers --- ChangeLog | 29 +++++++++++++++++++++++++++++ pager.c | 6 ++++-- sendlib.c | 2 +- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d0ed82dd..712bc06d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2009-06-14 20:57 -0700 Brendan Cully (d2e0b495b148) + + * build-release: Remove duplicate update-changelog call. + +2009-06-14 20:51 -0700 Antonio Radici (fef17099376d) + + * doc/mutt.man: Escape hyphens in man page. Closes #1937 again. + +2009-06-14 12:29 -0700 Brendan Cully (7f8a2ba64516) + + * UPDATING: Update UPDATING + +2009-06-14 12:17 -0700 Brendan Cully (71647a900ebe) + + * .hgsigs: mutt-1.5.20 signed + +2009-06-14 11:55 -0700 Brendan Cully (4c9c68ff5c33) + + * .hgtags: Added tag mutt-1-5-20-rel for changeset f399371bb9b0 + +2009-06-14 11:55 -0700 Brendan Cully (f399371bb9b0) + + * ChangeLog, VERSION, po/bg.po, po/ca.po, po/cs.po, po/da.po, + po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/eu.po, + po/fr.po, po/ga.po, po/gl.po, po/hu.po, po/id.po, po/it.po, + po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, + po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, + po/zh_TW.po: automatic post-release commit for mutt-1.5.20 + 2009-06-14 10:43 -0700 Brendan Cully (a18e286f4365) * imap/imap.c: Save a dereference, and close #3226 with voodoo. diff --git a/pager.c b/pager.c index 61fe0965b..4b0cd71c1 100644 --- a/pager.c +++ b/pager.c @@ -1069,9 +1069,11 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf, int ch, vch, k, last_special = -1, special = 0, t; wchar_t wc; mbstate_t mbstate; - int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap); - + + if (check_attachment_marker ((char *)buf) == 0) + wrap_cols = COLS; + /* FIXME: this should come from lineInfo */ memset(&mbstate, 0, sizeof(mbstate)); diff --git a/sendlib.c b/sendlib.c index 48b94e8a6..feef4dd4c 100644 --- a/sendlib.c +++ b/sendlib.c @@ -1741,7 +1741,7 @@ static int write_one_header (FILE *fp, int pfxw, int max, int wraplen, tagbuf = mutt_substrdup (start, t); valbuf = mutt_substrdup (t + 2, end); dprint(4,(debugfile,"mwoh: buf[%s%s] too long, " - "max width = %d > %dn", + "max width = %d > %d\n", NONULL(pfx), valbuf, max, wraplen)); if (fold_one_header (fp, tagbuf, valbuf, pfx, wraplen, flags) < 0) return -1; -- 2.40.0