Rocco Rutte:

[apps/madmutt.git] / pager.c

diff --git a/pager.c b/pager.c
index 8ed08a8..c7cd750 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -17,7 +17,6 @@
 
 #include "mutt.h"
 #include "mutt_curses.h"
-#include "mutt_regex.h"
 #include "keymap.h"
 #include "mutt_menu.h"
 #include "mapping.h"
@@ -38,6 +37,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/rx.h"
 
 #include <sys/stat.h>
 #include <ctype.h>
@@ -672,7 +672,7 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
       lineInfo[n].type = MT_COLOR_HDEFAULT;
       color_line = ColorHdrList;
       while (color_line) {
-        if (REGEXEC (color_line->rx, buf) == 0) {
+        if (REGEXEC (&color_line->rx, buf) == 0) {
           lineInfo[n].type = MT_COLOR_HEADER;
           lineInfo[n].syntax[0].color = color_line->pair;
           break;
@@ -1630,9 +1630,12 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
         _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
                            Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
       }
-      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
-            option (OPTSTATUSONTOP) ? 0 : SidebarWidth);
-      mutt_paddstr (COLS - 10, IsHeader (extra)
+      if (option(OPTSTATUSONTOP)) {
+        move(0,0);
+      }
+      /*move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (InHelp?(LINES-2):(indexlen - 1))),
+            option (OPTSTATUSONTOP) ? 0 : SidebarWidth);*/
+      mutt_paddstr (COLS - 10 - (option(OPTSTATUSONTOP)?0:SidebarWidth), IsHeader (extra)
                     || IsMsgAttach (extra) ? buffer : banner);
 
       addstr (" -- (");
@@ -1645,13 +1648,13 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     }
 
     if (redraw & REDRAW_SIDEBAR)
-      draw_sidebar (MENU_PAGER);
+      sidebar_draw (MENU_PAGER);
 
     if ((redraw & REDRAW_INDEX) && index) {
       /* redraw the pager_index indicator, because the
        * flags for this message might have changed. */
       menu_redraw_current (index);
-      draw_sidebar (MENU_PAGER);
+      sidebar_draw (MENU_PAGER);
       /* print out the index status bar */
       menu_status_line (buffer, sizeof (buffer), index, NONULL (Status));
       move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
@@ -1663,7 +1666,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     }
     /* if we're not using the index, update every time */
     if (index == 0)
-      draw_sidebar (MENU_PAGER);
+      sidebar_draw (MENU_PAGER);
 
     redraw = 0;
 
@@ -2586,7 +2589,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
     case OP_SIDEBAR_NEXT_NEW:
     case OP_SIDEBAR_PREV:
     case OP_SIDEBAR_PREV_NEW:
-      scroll_sidebar (ch, MENU_PAGER);
+      sidebar_scroll (ch, MENU_PAGER);
       break;
     default:
       ch = -1;