Turn off auto-clear outside of autocrypt initialization.

The auto-clearing code was added in commit 01bc088c, for autocrypt
initial prompting.  It removed having to keep track of every place a
browser or other menu might be displayed and having to remember to
clear it out.

However, clearing when mutt exits is a change of behavior for those
who have turned off alternative screens.

1 files changed, 10 insertions, 2 deletions

diff --git a/menu.c b/menu.c
index eeee8dd3..e567bc2a 100644
--- a/menu.c
+++ b/menu.c
@@ -789,8 +789,16 @@ void mutt_pop_current_menu (MUTTMENU *menu)
   else
   {
     CurrentMenu = MENU_MAIN;
-    move (0, 0);
-    clrtobot ();
+    /* Clearing when Mutt exits would be an annoying change in
+     * behavior for those who have disabled alternative screens.  The
+     * option is currently set by autocrypt initialization which mixes
+     * menus and prompts outside of the normal menu system state.
+     */
+    if (option (OPTMENUPOPCLEARSCREEN))
+    {
+      move (0, 0);
+      clrtobot ();
+    }
   }
 }