handler.c: Properly handle message/external-body expiry.

menu.c: Small fix from Liviu.
send.c: Honor confirm_create for FCCs.
cvs: ----------------------------------------------------------------------

1 files changed, 6 insertions, 3 deletions

diff --git a/menu.c b/menu.c
index 22e9244e..a9beccf3 100644
--- a/menu.c
+++ b/menu.c
@@ -274,13 +274,16 @@ void menu_redraw_current (MUTTMENU *menu)
 
 void menu_check_recenter (MUTTMENU *menu)
 {
-  if (menu->current >= menu->top + menu->pagelen)
+  if (menu->max <= menu->pagelen)
+  {
+    menu->top = 0;
+  }
+  else if (menu->current >= menu->top + menu->pagelen)
   {
     if (option (OPTMENUSCROLL))
       menu->top = menu->current - menu->pagelen + 1;
     else
       menu->top += menu->pagelen * ((menu->current - menu->top) / menu->pagelen);
-    menu->redraw = REDRAW_INDEX;
   }
   else if (menu->current < menu->top)
   {
@@ -292,8 +295,8 @@ void menu_check_recenter (MUTTMENU *menu)
       if (menu->top < 0)
 	menu->top = 0;
     }
-    menu->redraw = REDRAW_INDEX;
   }
+  menu->redraw |= REDRAW_INDEX;
 }
 
 void menu_jump (MUTTMENU *menu)