drop !builtin pager, sucks badly, and I plan to improve the pager anyways.

[apps/madmutt.git] / help.c

diff --git a/help.c b/help.c
index 062f975..d5182ca 100644 (file)
--- a/help.c
+++ b/help.c
@@ -164,9 +164,7 @@ static void format_line (FILE * f, int ismacro,
   }
 
   if (ismacro > 0) {
-    if (!m_strcmp(Pager, "builtin"))
-      fputs ("_\010", f);
-    fputs ("M ", f);
+    fputs ("_\010M ", f);
     col += 2;
 
     if (!split) {
@@ -205,15 +203,9 @@ static void format_line (FILE * f, int ismacro,
       print_macro (f, n, &t3);
 
       if (*t3) {
-        if (m_strcmp(Pager, "builtin")) {
-          fputc ('\n', f);
-          n = 0;
-        }
-        else {
-          n += col - COLS;
-          if (option (OPTMARKERS))
-            ++n;
-        }
+        n += col - COLS;
+        if (option (OPTMARKERS))
+          ++n;
         col = pad (f, n, col_b);
       }
     }
@@ -306,7 +298,7 @@ void mutt_help (int menu)
         m_fclose(&f);
 
         snprintf(buf, sizeof (buf), _("Help for %s"), desc);
-    } while (mutt_do_pager(buf, tmp,
-                           M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP,
-                           NULL) == OP_REFORMAT_WINCH);
+    } while (mutt_pager(buf, tmp,
+                        M_PAGER_RETWINCH | M_PAGER_MARKER | M_PAGER_NSKIP,
+                        NULL) == OP_REFORMAT_WINCH);
 }