Teach pager how to ignore $wrap and use it for help (closes #2896).

diff --git a/help.c b/help.c
index b43dce827f3b5183b89b9588a5cb5fbd1f493c1f..88f465a0e16ee654443ba21098b222a1646afaa7 100644 (file)
--- a/help.c
+++ b/help.c
@@ -373,7 +373,7 @@ void mutt_help (int menu)
   }
   while
     (mutt_do_pager (buf, t,
-                   M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP,
+                   M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP | M_PAGER_NOWRAP,
                    NULL)
      == OP_REFORMAT_WINCH);
 }

diff --git a/pager.c b/pager.c
index 73e2b43c6c7b0c60bc698c58884e6f67bdf226f0..c88b5d4c2be9e6b86d4d95b1532756db9168406f 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1066,7 +1066,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
   wchar_t wc;
   mbstate_t mbstate;
 
-  int wrap_cols = mutt_term_width (Wrap);
+  int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
   
   /* FIXME: this should come from lineInfo */
   memset(&mbstate, 0, sizeof(mbstate));
@@ -1687,7 +1687,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
       i = -1;
       j = -1;
       while (display_line (fp, &last_pos, &lineInfo, ++i, &lastLine, &maxLine,
-            has_types | SearchFlag, &QuoteList, &q_level, &force_redraw,
+            has_types | SearchFlag | (flags & M_PAGER_NOWRAP), &QuoteList, &q_level, &force_redraw,
             &SearchRE) == 0)
        if (!lineInfo[i].continuation && ++j == lines)
        {
@@ -1709,7 +1709,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
        {
          if (display_line (fp, &last_pos, &lineInfo, curline, &lastLine, 
                            &maxLine,
-                           (flags & M_DISPLAYFLAGS) | hideQuoted | SearchFlag, 
+                           (flags & M_DISPLAYFLAGS) | hideQuoted | SearchFlag | (flags & M_PAGER_NOWRAP),
                            &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
            lines++;
          curline++;
@@ -2075,7 +2075,7 @@ search_next:
          /* update the search pointers */
          i = 0;
          while (display_line (fp, &last_pos, &lineInfo, i, &lastLine, 
-                               &maxLine, M_SEARCH | (flags & M_PAGER_NSKIP),
+                               &maxLine, M_SEARCH | (flags & M_PAGER_NSKIP) | (flags & M_PAGER_NOWRAP),
                                &QuoteList, &q_level,
                                &force_redraw, &SearchRE) == 0)
            i++;
@@ -2156,7 +2156,7 @@ search_next:
 
          while ((new_topline < lastLine ||
                  (0 == (dretval = display_line (fp, &last_pos, &lineInfo,
-                        new_topline, &lastLine, &maxLine, M_TYPES,
+                        new_topline, &lastLine, &maxLine, M_TYPES | (flags & M_PAGER_NOWRAP),
                         &QuoteList, &q_level, &force_redraw, &SearchRE))))
                 && lineInfo[new_topline].type != MT_COLOR_QUOTED)
            new_topline++;
@@ -2169,7 +2169,7 @@ search_next:
 
          while ((new_topline < lastLine ||
                  (0 == (dretval = display_line (fp, &last_pos, &lineInfo,
-                        new_topline, &lastLine, &maxLine, M_TYPES,
+                        new_topline, &lastLine, &maxLine, M_TYPES | (flags & M_PAGER_NOWRAP),
                         &QuoteList, &q_level, &force_redraw, &SearchRE))))
                 && lineInfo[new_topline].type == MT_COLOR_QUOTED)
            new_topline++;
@@ -2189,7 +2189,7 @@ search_next:
          i = curline;
          /* make sure the types are defined to the end of file */
          while (display_line (fp, &last_pos, &lineInfo, i, &lastLine, 
-                               &maxLine, has_types, 
+                               &maxLine, has_types | (flags & M_PAGER_NOWRAP),
                                &QuoteList, &q_level, &force_redraw,
                                &SearchRE) == 0)
            i++;
@@ -2374,7 +2374,7 @@ search_next:
          lastLine = 0;
          while (j > 0 && display_line (fp, &last_pos, &lineInfo, topline, 
                                        &lastLine, &maxLine,
-                                       (has_types ? M_TYPES : 0),
+                                       (has_types ? M_TYPES : 0) | (flags & M_PAGER_NOWRAP),
                                        &QuoteList, &q_level, &force_redraw,
                                        &SearchRE) == 0)
          {

diff --git a/pager.h b/pager.h
index 1cbd92ab4955bcbcada826c4b5e8e6bcbe1f126f..baa1ad4eae935b85b8428d19137bad57bcf90728 100644 (file)
--- a/pager.h
+++ b/pager.h
@@ -32,6 +32,7 @@
 #define M_PAGER_RETWINCH       (1<<7)  /* need reformatting on SIGWINCH */
 #define M_PAGER_MESSAGE                (M_SHOWCOLOR | M_PAGER_MARKER)
 #define M_PAGER_ATTACHMENT     (1<<8)
+#define M_PAGER_NOWRAP         (1<<9)  /* format for term width, ignore $wrap */
 
 #define M_DISPLAYFLAGS (M_SHOW | M_PAGER_NSKIP | M_PAGER_MARKER)