Don't do Context updates from the background, part 2.

diff --git a/curs_main.c b/curs_main.c
index e2fea86612d3cee493466b0d86886624bd237e0d..5936a53de4ecd37407193fd4f1b180b714490fdc 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -324,6 +324,11 @@ int mutt_index_menu (void)
        * changed about the file (either we got new mail or the file was
        * modified underneath us.)
        */
+
+#ifdef USE_IMAP
+      imap_allow_reopen (Context);
+#endif
+      
       index_hint = (Context->vcount) ? CURHDR->index : 0;
 
       if ((check = mx_check_mailbox (Context, &index_hint, check_lock)) < 0)
@@ -453,6 +458,10 @@ int mutt_index_menu (void)
 
        set_option (OPTSEARCHINVALID);
       }
+      
+#ifdef USE_IMAP
+      imap_disallow_reopen (Context);
+#endif
     }
 
     check_lock = 0;

diff --git a/pager.c b/pager.c
index 6f530eee9493b0ab7eff61f2c5a34c8a89bc85f2..7115f9e6582ebb6e6a5d14511dbf3a83b4d01f89 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1431,7 +1431,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
   int indicator = indexlen / 3;        /* the indicator line of the PI */
   int old_PagerIndexLines;             /* some people want to resize it
                                         * while inside the pager... */
-  int oldcount = -1;
 
   if (!(flags & M_SHOWCOLOR))
     flags |= M_SHOWFLAT;
@@ -1482,26 +1481,12 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
     strcat (helpstr, buffer);
   }
 
-  if (Context)
-    oldcount = Context->msgcount;
-  
   while (ch != -1)
   {
     mutt_curs_set (0);
 
     if (mutt_buffy_notify () && option (OPTBEEPNEW))
       beep ();
-    else if (Context && Context->msgcount != oldcount)
-    {
-      if (Context && Context->msgcount > oldcount)
-      {
-       mutt_message (_("New mail in this mailbox."));
-       if (option (OPTBEEPNEW))
-         beep ();
-       redraw |= REDRAW_STATUS;
-      }
-      oldcount = Context->msgcount;
-    }
 
     if (redraw & REDRAW_FULL)
     {