X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=d5182cad0e51bedd85c8a89ca4b581d11b943df8;hp=1162b23d342ba7446b230c9c75e9d9e9aea130f8;hb=2b735edae04bed3ed92a0fb43b4dffc6c81331d8;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638

diff --git a/help.c b/help.c
index 1162b23..d5182ca 100644
--- 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);
       }
     }
@@ -284,7 +276,7 @@ void mutt_help (int menu)
         desc = _("<UNKNOWN>");
 
     do {
-        f = m_tempfile(tmp, sizeof(tmp), NONULL(Tempdir), NULL);
+        f = m_tempfile(tmp, sizeof(tmp), NONULL(MCore.tmpdir), NULL);
         if (!f) {
             mutt_perror(tmp);
             return;
@@ -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);
 }