Remove unused MUTT_FORMAT_MAKEPRINT flag

The code in mutt_FormatString() that was using it was commented out 19
years ago.

Co-authored-by: Richard Russon <rich@flatcap.org>

diff --git a/commands.c b/commands.c
index c76aa14189ce5bdf71df9d925990f5ae5beb85c5..cb3ea615bb1d7139fe67e7a5424bdedb59304c4d 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -258,7 +258,7 @@ int mutt_display_message(struct Email *cur)
     hfi.pager_progress = ExtPagerProgress;
     hfi.email = cur;
     mutt_make_string_info(buf, sizeof(buf), MuttIndexWindow->cols,
-                          NONULL(PagerFormat), &hfi, MUTT_FORMAT_MAKEPRINT);
+                          NONULL(PagerFormat), &hfi, 0);
     fputs(buf, fpout);
     fputs("\n\n", fpout);
   }

diff --git a/format_flags.h b/format_flags.h
index a0e398984ab3a7c1de6bc2274982c6f0b872e2e4..528b49618aaa275b92aeec4f9a5224eddbb0d2be 100644 (file)
--- a/format_flags.h
+++ b/format_flags.h
@@ -32,13 +32,12 @@ enum FormatFlag
 {
   MUTT_FORMAT_FORCESUBJ   = (1 << 0), ///< print the subject even if unchanged
   MUTT_FORMAT_TREE        = (1 << 1), ///< draw the thread tree
-  MUTT_FORMAT_MAKEPRINT   = (1 << 2), ///< make sure that all chars are printable
-  MUTT_FORMAT_OPTIONAL    = (1 << 3), ///< allow optional field processing
-  MUTT_FORMAT_STAT_FILE   = (1 << 4), ///< used by attach_format_str
-  MUTT_FORMAT_ARROWCURSOR = (1 << 5), ///< reserve space for arrow_cursor
-  MUTT_FORMAT_INDEX       = (1 << 6), ///< this is a main index entry
-  MUTT_FORMAT_NOFILTER    = (1 << 7), ///< do not allow filtering on this pass
-  MUTT_FORMAT_PLAIN       = (1 << 8), ///< do not prepend DISP_TO, DISP_CC ...
+  MUTT_FORMAT_OPTIONAL    = (1 << 2), ///< allow optional field processing
+  MUTT_FORMAT_STAT_FILE   = (1 << 3), ///< used by attach_format_str
+  MUTT_FORMAT_ARROWCURSOR = (1 << 4), ///< reserve space for arrow_cursor
+  MUTT_FORMAT_INDEX       = (1 << 5), ///< this is a main index entry
+  MUTT_FORMAT_NOFILTER    = (1 << 6), ///< do not allow filtering on this pass
+  MUTT_FORMAT_PLAIN       = (1 << 7), ///< do not prepend DISP_TO, DISP_CC ...
 };
 
 /**

diff --git a/index.c b/index.c
index cae9266b786bc9bbea4f5c629013567f91507832..f0cf3c456862227d74709009b689c976da3f23ca 100644 (file)
--- a/index.c
+++ b/index.c
@@ -675,7 +675,7 @@ void index_make_entry(char *buf, size_t buflen, struct Menu *menu, int line)
   if (!e)
     return;
 
-  enum FormatFlag flag = MUTT_FORMAT_MAKEPRINT | MUTT_FORMAT_ARROWCURSOR | MUTT_FORMAT_INDEX;
+  enum FormatFlag flag = MUTT_FORMAT_ARROWCURSOR | MUTT_FORMAT_INDEX;
   struct MuttThread *tmp = NULL;
 
   if ((Sort & SORT_MASK) == SORT_THREADS && e->tree)

diff --git a/pager.c b/pager.c
index f226ee44c9c818443d99a91c18b5c8fa10f16185..620e8f2119ce2bd7af4efe14d892b3ca48b204ec 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -2179,7 +2179,7 @@ static void pager_custom_redraw(struct Menu *pager_menu)
       size_t l2 = sizeof(buffer);
       hfi.email = (IsEmail(rd->extra)) ? rd->extra->email : rd->extra->bdy->email;
       mutt_make_string_info(buffer, l1 < l2 ? l1 : l2, rd->pager_status_window->cols,
-                            NONULL(PagerFormat), &hfi, MUTT_FORMAT_MAKEPRINT);
+                            NONULL(PagerFormat), &hfi, 0);
       mutt_draw_statusline(rd->pager_status_window->cols, buffer, l2);
     }
     else

diff --git a/recvattach.c b/recvattach.c
index 5f8a4b2c8bdd2586a5b21b2fdffa67dbf516d636..58894db0ef5746e07b336a1dbcc23636b7d8f825 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -258,9 +258,9 @@ const char *attach_format_str(char *buf, size_t buflen, size_t col, int cols,
             MessageFormat && aptr->content->email)
         {
           char s[SHORT_STRING];
-          mutt_make_string_flags(
-              s, sizeof(s), MessageFormat, NULL, aptr->content->email,
-              MUTT_FORMAT_FORCESUBJ | MUTT_FORMAT_MAKEPRINT | MUTT_FORMAT_ARROWCURSOR);
+          mutt_make_string_flags(s, sizeof(s), MessageFormat, NULL,
+                                 aptr->content->email,
+                                 MUTT_FORMAT_FORCESUBJ | MUTT_FORMAT_ARROWCURSOR);
           if (*s)
           {
             mutt_format_s(buf, buflen, prec, s);