Andreas Krennmair:

	fixed a bug where lines in f=f messages weren't wrapped properly when the sidebar was active. This led to lines wrapped by the pager.
	fixed a wrong option used by Nico: the option to check whether the sidebar is visible is OPTMBOXPANE, not OPTSTATUSONTOP.

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@167 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/compose.c b/compose.c
index d529d4a..ddf10cc 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -588,7 +588,7 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
 #endif
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, ComposeHelp);
   
-  if (option (OPTSTATUSONTOP))
+  if (option(OPTMBOXPANE))
     mutt_buffy_check(1);
   while (loop)
   {

diff --git a/handler.c b/handler.c
index cae8a2e..f82c717 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -1219,7 +1219,7 @@ static void print_flowed_line(char * line, STATE *s,int ql) {
     if (width < 0)
       width = MaxLineLength;
   } else {
-    width = COLS - WrapMargin - ql - 1;
+    width = COLS - SidebarWidth - WrapMargin - ql - 1;
     if (option(OPTSTUFFQUOTED))
       --width;
     if (width < 0)