Revert "pager: add helper for getting $pager"

This reverts commit 8fb2f18.

attach/mutt_attach.c

@@ -650,8 +650,8 @@ int mutt_view_attachment(FILE *fp, struct Body *a, enum ViewAttachMode mode,
     else
     {
       StateFlags flags = STATE_DISPLAY | STATE_DISPLAY_ATTACH;
-      const char *const c_pager = pager_get_pager(NeoMutt->sub);
-      if (!c_pager)
+      const char *const c_pager = cs_subset_string(NeoMutt->sub, "pager");
+      if (!c_pager || mutt_str_equal(c_pager, "builtin"))
         flags |= STATE_PAGER;
 
       /* Use built-in handler */

copy.c

@@ -43,7 +43,6 @@
 #include "copy.h"
 #include "index/lib.h"
 #include "ncrypt/lib.h"
-#include "pager/lib.h"
 #include "send/lib.h"
 #include "format_flags.h"
 #include "globals.h" // IWYU pragma: keep
@@ -763,8 +762,8 @@ int mutt_copy_message_fp(FILE *fp_out, FILE *fp_in, struct Email *e,
     {
       state.flags |= STATE_DISPLAY;
       state.wraplen = wraplen;
-      const char *const c_pager = pager_get_pager(NeoMutt->sub);
-      if (!c_pager)
+      const char *const c_pager = cs_subset_string(NeoMutt->sub, "pager");
+      if (!c_pager || mutt_str_equal(c_pager, "builtin"))
         state.flags |= STATE_PAGER;
     }
     if (cmflags & MUTT_CM_PRINTING)

help.c

@@ -244,10 +244,10 @@ static void format_line(FILE *fp, int ismacro, const char *t1, const char *t2,
     col = pad(fp, mutt_strwidth(t1), col_a);
   }
 
-  const char *const c_pager = pager_get_pager(NeoMutt->sub);
+  const char *const c_pager = cs_subset_string(NeoMutt->sub, "pager");
   if (ismacro > 0)
   {
-    if (!c_pager)
+    if (!c_pager || mutt_str_equal(c_pager, "builtin"))
       fputs("_\010", fp); // Ctrl-H (backspace)
     fputs("M ", fp);
     col += 2;
@@ -287,18 +287,18 @@ static void format_line(FILE *fp, int ismacro, const char *t1, const char *t2,
 
       if (*t3)
       {
-        if (c_pager)
-        {
-          fputc('\n', fp);
-          n = 0;
-        }
-        else
+        if (mutt_str_equal(c_pager, "builtin"))
         {
           n += col - wraplen;
           const bool c_markers = cs_subset_bool(NeoMutt->sub, "markers");
           if (c_markers)
             n++;
         }
+        else
+        {
+          fputc('\n', fp);
+          n = 0;
+        }
         col = pad(fp, n, col_b);
       }
     }

index/functions.c

@@ -407,8 +407,8 @@ static int op_display_message(struct IndexSharedData *shared,
   const int index = menu_get_index(priv->menu);
   index_shared_data_set_email(shared, mutt_get_virt_email(shared->mailbox, index));
 
-  const char *const c_pager = pager_get_pager(NeoMutt->sub);
-  if (c_pager)
+  const char *const c_pager = cs_subset_string(NeoMutt->sub, "pager");
+  if (c_pager && !mutt_str_equal(c_pager, "builtin"))
   {
     op = external_pager(shared->mailbox, shared->email, c_pager);
   }

mutt_config.c

@@ -372,6 +372,9 @@ static struct ConfigDef MainVars[] = {
   { "new_mail_command", DT_STRING|DT_COMMAND, 0, 0, NULL,
     "External command to run when new mail arrives"
   },
+  { "pager", DT_STRING|DT_COMMAND, IP "builtin", 0, NULL,
+    "External command for viewing messages, or 'builtin' to use NeoMutt's"
+  },
   { "pipe_decode", DT_BOOL, false, 0, NULL,
     "Decode the message when piping it"
   },

pager/config.c

@@ -30,7 +30,6 @@
 #include <stddef.h>
 #include <config/lib.h>
 #include <stdbool.h>
-#include "mutt/lib.h"
 
 /**
  * PagerVars - Config definitions for the Pager
@@ -46,9 +45,6 @@ static struct ConfigDef PagerVars[] = {
   { "header_color_partial", DT_BOOL, false, 0, NULL,
     "Only colour the part of the header matching the regex"
   },
-  { "pager", DT_STRING|DT_COMMAND, IP "builtin", 0, NULL,
-    "External command for viewing messages, or 'builtin' to use NeoMutt's"
-  },
   { "pager_context", DT_NUMBER|DT_NOT_NEGATIVE, 0, 0, NULL,
     "Number of lines of overlap when changing pages in the pager"
   },
@@ -92,23 +88,6 @@ static struct ConfigDef PagerVars[] = {
   // clang-format on
 };
 
-/**
- * pager_get_pager - Get the value of $pager
- * @param sub Config Subset
- * @retval str  External command to use
- * @retval NULL The internal pager will be used
- *
- * @note If $pager has the magic value of "builtin", NULL will be returned
- */
-const char *const pager_get_pager(struct ConfigSubset *sub)
-{
-  const char *pager = cs_subset_string(sub, "pager");
-  if (!pager || mutt_str_cmp(pager, "builtin"))
-    return NULL;
-
-  return pager;
-}
-
 /**
  * config_init_pager - Register pager config variables - Implements ::module_init_config_t - @ingroup cfg_module_api
  */

pager/do_pager.c

@@ -156,7 +156,11 @@ int mutt_do_pager(struct PagerView *pview, struct Email *e)
   int rc;
 
   const char *const c_pager = cs_subset_string(NeoMutt->sub, "pager");
-  if (c_pager)
+  if (!c_pager || mutt_str_equal(c_pager, "builtin"))
+  {
+    rc = mutt_pager(pview);
+  }
+  else
   {
     struct Buffer *cmd = mutt_buffer_pool_get();
 
@@ -172,10 +176,6 @@ int mutt_do_pager(struct PagerView *pview, struct Email *e)
     mutt_file_unlink(pview->pdata->fname);
     mutt_buffer_pool_release(&cmd);
   }
-  else
-  {
-    rc = mutt_pager(pview);
-  }
 
   dialog_pop();
   mutt_window_free(&dlg);

pager/lib.h

@@ -50,7 +50,6 @@
 
 struct Email;
 struct IndexSharedData;
-struct ConfigSubset;
 struct Mailbox;
 struct MuttWindow;
 struct PagerPrivateData;
@@ -201,7 +200,6 @@ int mutt_display_message(struct MuttWindow *win_index, struct IndexSharedData *s
 int external_pager(struct Mailbox *m, struct Email *e, const char *command);
 void pager_queue_redraw(struct PagerPrivateData *priv, PagerRedrawFlags redraw);
 bool mutt_is_quote_line(char *buf, regmatch_t *pmatch);
-const char *const pager_get_pager(struct ConfigSubset *sub);
 
 void mutt_clear_pager_position(void);