From 8be4c668373a84fa67700d22c7c59232eaa045a3 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Tue, 16 May 2017 14:18:34 +0100
Subject: [PATCH] replace 'pager_t' with 'struct Pager'

---
 attach.c   | 2 +-
 commands.c | 4 ++--
 curs_lib.c | 2 +-
 pager.c    | 4 ++--
 pager.h    | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/attach.c b/attach.c
index c9499ca00..5ed0ddcaa 100644
--- a/attach.c
+++ b/attach.c
@@ -555,7 +555,7 @@ int mutt_view_attachment(FILE *fp, struct Body *a, int flag, struct Header *hdr,
 
   if (use_pager)
   {
-    pager_t info;
+    struct Pager info;
 
     memset(&info, 0, sizeof(info));
     info.fp = fp;
diff --git a/commands.c b/commands.c
index e191c44b2..40b1e7893 100644
--- a/commands.c
+++ b/commands.c
@@ -180,7 +180,7 @@ int mutt_display_message(struct Header *cur)
 
   if (builtin)
   {
-    pager_t info;
+    struct Pager info;
 
     if (WithCrypto && (cur->security & APPLICATION_SMIME) && (cmflags & MUTT_CM_VERIFY))
     {
@@ -208,7 +208,7 @@ int mutt_display_message(struct Header *cur)
     }
 
     /* Invoke the builtin pager */
-    memset(&info, 0, sizeof(pager_t));
+    memset(&info, 0, sizeof(struct Pager));
     info.hdr = cur;
     info.ctx = Context;
     rc = mutt_pager(NULL, tempfile, MUTT_PAGER_MESSAGE, &info);
diff --git a/curs_lib.c b/curs_lib.c
index 00d598c93..6862fd8c3 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -837,7 +837,7 @@ int mutt_any_key_to_continue(const char *s)
   return (ch >= 0) ? ch : EOF;
 }
 
-int mutt_do_pager(const char *banner, const char *tempfile, int do_color, pager_t *info)
+int mutt_do_pager(const char *banner, const char *tempfile, int do_color, struct Pager *info)
 {
   int rc;
 
diff --git a/pager.c b/pager.c
index 9a3e9d731..3cb66f097 100644
--- a/pager.c
+++ b/pager.c
@@ -1639,7 +1639,7 @@ void mutt_clear_pager_position(void)
 typedef struct
 {
   int flags;
-  pager_t *extra;
+  struct Pager *extra;
   int indexlen;
   int indicator; /* the indicator line of the PI */
   int oldtopline;
@@ -1950,7 +1950,7 @@ static void pager_menu_redraw(struct Menu *pager_menu)
    can be distinguished by whether or not ``hdr'' is NULL.  The ``hdr'' arg
    is there so that we can do operations on the current message without the
    need to pop back out to the main-menu.  */
-int mutt_pager(const char *banner, const char *fname, int flags, pager_t *extra)
+int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *extra)
 {
   static char searchbuf[STRING] = "";
   char buffer[LONG_STRING];
diff --git a/pager.h b/pager.h
index 886dea492..cc59ef5d1 100644
--- a/pager.h
+++ b/pager.h
@@ -38,7 +38,7 @@
 
 #define MUTT_DISPLAYFLAGS (MUTT_SHOW | MUTT_PAGER_NSKIP | MUTT_PAGER_MARKER)
 
-typedef struct
+struct Pager
 {
   struct Context *ctx;    /* current mailbox */
   struct Header *hdr;     /* current message */
@@ -46,10 +46,10 @@ typedef struct
   FILE *fp;        /* source stream */
   struct AttachPtr **idx; /* attachment information */
   short idxlen;
-} pager_t;
+};
 
-int mutt_do_pager(const char *banner, const char *tempfile, int do_color, pager_t *info);
-int mutt_pager(const char *banner, const char *fname, int flags, pager_t *extra);
+int mutt_do_pager(const char *banner, const char *tempfile, int do_color, struct Pager *info);
+int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *extra);
 void update_index(struct Menu *menu, struct Context *ctx, int check, int oldcount, int index_hint);
 
 #endif /* _MUTT_PAGER_H */
-- 
2.49.0