many simplifications, copyright statements.

[apps/madmutt.git] / pager.c

diff --git a/pager.c b/pager.c
index ea07331..a3ee8c6 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -28,7 +28,6 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
-#include <lib-lib/debug.h>
 #include <lib-lib/rx.h>
 
 #include <lib-ui/curses.h>
@@ -36,6 +35,7 @@
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "keymap.h"
 #include "sort.h"
 #include "pager.h"
@@ -943,7 +943,6 @@ fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf,
       }
       else if (*p == '\033' && *(p + 1) == ']'
                && check_attachment_marker ((char *) p) == 0) {
-        debug_print (2, ("seen attachment marker.\n"));
         while (*p++ != '\a')    /* skip pseudo-ANSI sequence */
           ;
       }
@@ -1002,7 +1001,6 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
 
     k = mbrtowc (&wc, (char *) buf + ch, cnt - ch, &mbstate);
     if (k == -2 || k == -1) {
-      debug_print (1, ("mbrtowc returned %d; errno = %d.\n", k, errno));
       if (col + 4 > wrap_cols)
         break;
       col += 4;
@@ -1095,7 +1093,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
         break;
       ++col;
       if (pa)
-        addch (replacement_char ());
+        addch (CharsetReplacement);
     }
   }
   *pspace = space;