X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=ea3ec2b2fc04b24063efd9d62bba26dad78ea20d;hp=f0d366df03441f34d2db3e09ada496e0eadfb809;hb=2c56b665394c80195b976537e608b690947fcb14;hpb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a

diff --git a/pager.c b/pager.c
index f0d366d..ea3ec2b 100644
--- a/pager.c
+++ b/pager.c
@@ -16,6 +16,7 @@
 #endif
 
 #include <wchar.h>
+#include <wctype.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -27,19 +28,20 @@
 #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>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "keymap.h"
 #include "sort.h"
 #include "pager.h"
 #include "attach.h"
 #include "recvattach.h"
-#include "mbyte.h"
+#include "charset.h"
 #include "sidebar.h"
 #include "buffy.h"
 
@@ -49,7 +51,6 @@
 
 #include <lib-crypt/crypt.h>
 
-#include "lib/rx.h"
 
 #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT)
 
@@ -942,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 */
           ;
       }
@@ -1001,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;