projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oopsie, small fixes.
[apps/madmutt.git]
/
pager.c
diff --git
a/pager.c
b/pager.c
index
05c7688
..
ea3ec2b
100644
(file)
--- a/
pager.c
+++ b/
pager.c
@@
-15,22
+15,33
@@
# include "config.h"
#endif
# 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/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/curses.h>
#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
#include "mutt.h"
+#include "alias.h"
#include "keymap.h"
#include "keymap.h"
-#include "mutt_menu.h"
#include "sort.h"
#include "pager.h"
#include "attach.h"
#include "recvattach.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"
#include "sidebar.h"
#include "buffy.h"
@@
-40,16
+51,6
@@
#include <lib-crypt/crypt.h>
#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)
#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) {
}
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 */
;
}
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) {
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;
if (col + 4 > wrap_cols)
break;
col += 4;