jcs.org / mutt
mutt stable branch with some hacks
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Kevin McCarthy 8914a1ba bbe9bd1a

+18 -2
+7
autocrypt/autocrypt.c
··· 80 80 return -1; 81 81 82 82 set_option (OPTIGNOREMACROEVENTS); 83 + /* The init process can display menus at various points 84 + * (e.g. browser, pgp key selection). This allows the screen to be 85 + * autocleared after each menu, so the subsequent prompts can be 86 + * read. */ 87 + set_option (OPTMENUPOPCLEARSCREEN); 83 88 84 89 if (autocrypt_dir_init (can_create)) 85 90 goto bail; ··· 91 96 goto bail; 92 97 93 98 unset_option (OPTIGNOREMACROEVENTS); 99 + unset_option (OPTMENUPOPCLEARSCREEN); 94 100 95 101 return 0; 96 102 97 103 bail: 98 104 unset_option (OPTIGNOREMACROEVENTS); 105 + unset_option (OPTMENUPOPCLEARSCREEN); 99 106 unset_option (OPTAUTOCRYPT); 100 107 mutt_autocrypt_db_close (); 101 108 return -1;
+10 -2
menu.c
··· 789 789 else 790 790 { 791 791 CurrentMenu = MENU_MAIN; 792 - move (0, 0); 793 - clrtobot (); 792 + /* Clearing when Mutt exits would be an annoying change in 793 + * behavior for those who have disabled alternative screens. The 794 + * option is currently set by autocrypt initialization which mixes 795 + * menus and prompts outside of the normal menu system state. 796 + */ 797 + if (option (OPTMENUPOPCLEARSCREEN)) 798 + { 799 + move (0, 0); 800 + clrtobot (); 801 + } 794 802 } 795 803 } 796 804
+1
mutt.h
··· 617 617 OPTDONTHANDLEPGPKEYS, /* (pseudo) used to extract PGP keys */ 618 618 OPTIGNOREMACROEVENTS, /* (pseudo) don't process macro/push/exec events while set */ 619 619 OPTAUTOCRYPTGPGME, /* (pseudo) use Autocrypt context inside crypt-gpgme.c */ 620 + OPTMENUPOPCLEARSCREEN, /* (pseudo) clear the screen when popping the last menu. */ 620 621 621 622 OPTMAX 622 623 };