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

diff --git a/pager.c b/pager.c
index e18bd14..ea3ec2b 100644
--- a/pager.c
+++ b/pager.c
@@ -15,21 +15,33 @@
 # include "config.h"
 #endif
 
+#include <wchar.h>
+#include <wctype.h>
+#include <sys/stat.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.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 "enter.h"
-#include "mutt_curses.h"
+#include "alias.h"
 #include "keymap.h"
-#include "mutt_menu.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"
 
@@ -39,16 +51,6 @@
 
 #include <lib-crypt/crypt.h>
 
-#include "lib/rx.h"
-#include "lib/debug.h"
-
-#include <wchar.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
 
 #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT)
 
@@ -941,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 */
           ;
       }
@@ -1000,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;