Andreas Krennmair:

[apps/madmutt.git] / handler.c

diff --git a/handler.c b/handler.c
index 251f479..f82c717 100644 (file)
--- 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); */