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

diff --git a/pager.c b/pager.c
index ea3ec2b..cbdc8fa 100644
--- a/pager.c
+++ b/pager.c
@@ -11,28 +11,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# 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-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
 
 #include "mutt.h"
 #include "alias.h"
@@ -42,7 +26,6 @@
 #include "attach.h"
 #include "recvattach.h"
 #include "charset.h"
-#include "sidebar.h"
 #include "buffy.h"
 
 #include "mx.h"
@@ -51,7 +34,6 @@
 
 #include <lib-crypt/crypt.h>
 
-
 #define ISHEADER(x) ((x) == MT_COLOR_HEADER || (x) == MT_COLOR_HDEFAULT)
 
 #define IsAttach(x) (x && (x)->bdy)
@@ -1014,7 +996,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
 
     /* Handle backspace */
     special = 0;
-    if (IsWPrint (wc)) {
+    if (iswprint(wc)) {
       wchar_t wc1;
       mbstate_t mbstate1;
       int k1, k2;
@@ -1025,7 +1007,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
                            &mbstate1), k1 - k > 0 && wc1 == '\b')
              && (wc1 = 0, k2 =
                  mbrtowc (&wc1, (char *) buf + ch + k1, cnt - ch - k1,
-                          &mbstate1), k2 > 0 && IsWPrint (wc1))) {
+                          &mbstate1), k2 > 0 && iswprint(wc1))) {
         if (wc == wc1) {
           special |= (wc == '_' && special & A_UNDERLINE)
             ? A_UNDERLINE : A_BOLD;
@@ -1051,7 +1033,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
       last_special = special;
     }
 
-    if (IsWPrint (wc)) {
+    if (iswprint(wc)) {
       if (wc == ' ')
         space = ch;
       t = wcwidth (wc);
@@ -1093,7 +1075,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;