From 198f6eea2ecd25012a1b426027eac13c0d72aaea Mon Sep 17 00:00:00 2001 From: pdmef Date: Mon, 20 Feb 2006 15:28:02 +0000 Subject: [PATCH] Rocco Rutte: - dirty fix compose screen's attachment where lines are too long (due to mutt_FormatString() ignoring sidebar) (reported by Michael Kjorling ) git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@784 e385b8ad-14ed-0310-8656-cc95a2468c6d --- VERSION.svn | 2 +- compose.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/VERSION.svn b/VERSION.svn index 634a083..3aedf24 100644 --- a/VERSION.svn +++ b/VERSION.svn @@ -1 +1 @@ -783 +784 diff --git a/compose.c b/compose.c index bb977da..2a701db 100644 --- a/compose.c +++ b/compose.c @@ -133,9 +133,27 @@ static struct mapping_t ComposeNewsHelp[] = { static void snd_entry (char *b, size_t blen, MUTTMENU * menu, int num) { + int old1=DrawFullLine,old2=option(OPTSTATUSONTOP); + + /* + * XXX + * mutt_FormatString is totally broken as it tries to determine + * the max. width of the output string itself which may fail + * (for example, for $status_on_top, many of the format strings + * are as wide as screen but $attach_format is not, etc.) + * + * When $status_on_top is unset, mutt_FormatString() will respect + * sidebar so unset it for compose menu entries by force... ;-( + */ + DrawFullLine=0; + unset_option(OPTSTATUSONTOP); + mutt_FormatString (b, blen, NONULL (AttachFormat), mutt_attach_fmt, (unsigned long) (((ATTACHPTR **) menu->data)[num]), M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR); + + DrawFullLine=old1; + if (old2) set_option(OPTSTATUSONTOP); } -- 2.20.1