X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=f82c717fd91217aa3b5dd526dc6553081e4feeab;hp=251f4795ec0352ec78485f4aaefe99b14ced8bb6;hb=6b4750772eba54f979455376713b49900a4d5016;hpb=fc9c62aae0a7ebf1ff9335e322e7c1f5d3e459d3

diff --git a/handler.c b/handler.c
index 251f479..f82c717 100644
--- a/handler.c
+++ b/handler.c
@@ -35,6 +35,7 @@
 #include "copy.h"
 #include "charset.h"
 #include "mutt_crypt.h"
+#include "lib.h"
 
 
 #define BUFI_SIZE 1000
@@ -1211,11 +1212,19 @@ static void print_flowed_line(char * line, STATE *s,int ql) {
   int len = strlen(line);
   int i;
 
-  width = COLS - WrapMargin - ql - 1;
-  if (option(OPTSTUFFQUOTED))
-    --width;
-  if (width < 0)
-    width = COLS;
+  if (MaxLineLength > 0) {
+    width = MaxLineLength - WrapMargin - ql - 1;
+    if (option(OPTSTUFFQUOTED))
+      --width;
+    if (width < 0)
+      width = MaxLineLength;
+  } else {
+    width = COLS - SidebarWidth - WrapMargin - ql - 1;
+    if (option(OPTSTUFFQUOTED))
+      --width;
+    if (width < 0)
+      width = COLS;
+  }
 
   /* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
 
@@ -1231,7 +1240,7 @@ static void print_flowed_line(char * line, STATE *s,int ql) {
 
   pos=line+ql+width;
   oldpos=line+ql;
-  if (ql>0 && isblank(*oldpos)) ++oldpos;
+  if (ql>0 && ISBLANK(*oldpos)) ++oldpos;
 
   /* fprintf(stderr,"oldpos = %p line+len = %p\n",oldpos,line+len); */