CVS branch clean-up.

1 files changed, 10 insertions, 4 deletions

diff --git a/pager.c b/pager.c
index 02fd2c79..3109dcfb 100644
--- a/pager.c
+++ b/pager.c
@@ -21,6 +21,7 @@
 #include "mutt_regex.h"
 #include "keymap.h"
 #include "mutt_menu.h"
+#include "mapping.h"
 #include "sort.h"
 #include "pager.h"
 #include "attach.h"
@@ -1247,7 +1248,8 @@ upNLines (int nlines, struct line_t *info, int cur, int hiding)
    is there so that we can do operations on the current message without the
    need to pop back out to the main-menu.  */
 int 
-mutt_pager (const char *banner, const char *fname, int do_color, pager_t *extra)
+mutt_pager (const char *banner, const char *fname, int do_color, pager_t *extra,
+            const char *attach_msg_status /* invoked while attaching a message */)
 {
   static char searchbuf[STRING];
   char buffer[LONG_STRING];
@@ -1482,7 +1484,11 @@ mutt_pager (const char *banner, const char *fname, int do_color, pager_t *extra)
       menu_redraw_current (index);
 
       /* print out the index status bar */
-      menu_status_line (buffer, sizeof (buffer), index, Status);
+      if (*attach_msg_status)
+	 snprintf (buffer, sizeof (buffer), M_MODEFMT, attach_msg_status);
+      else
+	menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
+ 
       move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
       SETCOLOR (MT_COLOR_STATUS);
       printw ("%-*.*s", COLS, COLS, buffer);
@@ -1876,7 +1882,7 @@ mutt_pager (const char *banner, const char *fname, int do_color, pager_t *extra)
 	{
 	  ch = -1;
 	  rc = OP_MAIN_NEXT_UNDELETED;
-	};
+	}
 	break;
 
       case OP_DELETE_THREAD:
@@ -2050,7 +2056,7 @@ mutt_pager (const char *banner, const char *fname, int do_color, pager_t *extra)
       case OP_SAVE:
 	if (IsAttach (extra))
 	{
-	  mutt_save_attachment_list (extra->fp, 0, extra->bdy);
+	  mutt_save_attachment_list (extra->fp, 0, extra->bdy, extra->hdr);
 	  break;
 	}
 	/* fall through */