[unstable] merging in changes from stable.

diff --git a/curs_main.c b/curs_main.c
index 00ff7cd56102e0b326bb371a7fbe6e299c64d0cd..15de2c6e51efbc000528b09db48d9b709c05583b 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -321,7 +321,8 @@ int mutt_index_menu (void)
       }
       else if (check == M_NEW_MAIL || check == M_REOPENED)
       {
-       int *save_new;
+       /* store pointers to the newly added messages */
+       HEADER  **save_new = NULL;
 
        /* take note of the current message */
        if (oldcount)
@@ -358,9 +359,9 @@ int mutt_index_menu (void)
        /* save the list of new messages */
        if (oldcount && check != M_REOPENED)
        {
-         save_new = (int *) safe_malloc (sizeof (int) * (Context->msgcount - oldcount));
+         save_new = (void **) safe_malloc (sizeof (HEADER *) * (Context->msgcount - oldcount));
          for (j = oldcount; j < Context->msgcount; j++)
-           save_new[j-oldcount] = Context->hdrs[j]->index;
+           save_new[j-oldcount] = Context->hdrs[j];
         }
 
        /* if the mailbox was reopened, need to rethread from scratch */
@@ -394,7 +395,7 @@ int mutt_index_menu (void)
              for (k = 0; k < Context->msgcount; k++)
              {
                HEADER *h = Context->hdrs[k];
-               if (h->index == save_new[j] && (!Context->pattern || h->limited))
+               if (h == save_new[j] && (!Context->pattern || h->limited))
                  mutt_uncollapse_thread (Context, h);
              }
            }

diff --git a/reldate.h b/reldate.h
index 9a5a47ec88b0498622922b2ac0eeeffbff5c0e88..10a869e7e2da6d449b1453bc2f88880f2f6211ee 100644 (file)
--- a/reldate.h
+++ b/reldate.h
@@ -1 +1 @@
-const char *ReleaseDate = "1998-12-12";
+const char *ReleaseDate = "1999-01-04";