Rocco Rutte:

[apps/madmutt.git] / pager.c

diff --git a/pager.c b/pager.c
index 4b1c48a..c2f784b 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1754,8 +1754,10 @@ 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);
       }
-      mutt_paddstr (COLS-10-SidebarWidth, IsHeader (extra) || IsMsgAttach (extra) ?
-                   buffer : banner);
+      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),option(OPTSTATUSONTOP)?0:SidebarWidth);
+      mutt_paddstr (COLS-10, IsHeader (extra) || IsMsgAttach (extra) ?
+                    buffer : banner);
+
       addstr (" -- (");
       if (last_pos < sb.st_size - 1)
        printw ("%d%%)", (int) (100 * last_offset / sb.st_size));
@@ -1776,9 +1778,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
       draw_sidebar(MENU_PAGER);
       /* print out the index status bar */
       menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
-      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),SidebarWidth);
+      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),option(OPTSTATUSONTOP)?0:SidebarWidth);
       SETCOLOR (MT_COLOR_STATUS);
-      mutt_paddstr (COLS-SidebarWidth, buffer);
+      mutt_paddstr (COLS-(option(OPTSTATUSONTOP)?0:SidebarWidth), buffer);
       SETCOLOR (MT_COLOR_NORMAL);
     }
        /* if we're not using the index, update every time */
@@ -2699,6 +2701,7 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
 
       case OP_BUFFY_LIST:
        mutt_buffy_list ();
+    redraw |= REDRAW_SIDEBAR;
        break;
 
       case OP_VIEW_ATTACHMENTS:
@@ -2747,7 +2750,9 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
          case OP_SIDEBAR_SCROLL_UP:
          case OP_SIDEBAR_SCROLL_DOWN:
          case OP_SIDEBAR_NEXT:
+         case OP_SIDEBAR_NEXT_NEW:
          case OP_SIDEBAR_PREV:
+         case OP_SIDEBAR_PREV_NEW:
            scroll_sidebar(ch, MENU_PAGER);
                break;
       default: