diff options
author | Kevin McCarthy <kevin@8t8.us> | 2019-12-21 19:40:52 -0800 |
---|---|---|
committer | Kevin McCarthy <kevin@8t8.us> | 2019-12-21 19:40:52 -0800 |
commit | 8914a1ba38ef394db3d89ff8d0e54774ca9dca48 (patch) | |
tree | dbea1aa19ab1c248190696fac3f9f4fe985ae4ad /autocrypt | |
parent | bbe9bd1aada2d9788ea74b7047170abaecc23d78 (diff) |
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.
Diffstat (limited to 'autocrypt')
-rw-r--r-- | autocrypt/autocrypt.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/autocrypt/autocrypt.c b/autocrypt/autocrypt.c index 0df17923..7a3be260 100644 --- a/autocrypt/autocrypt.c +++ b/autocrypt/autocrypt.c @@ -80,6 +80,11 @@ int mutt_autocrypt_init (int can_create) return -1; set_option (OPTIGNOREMACROEVENTS); + /* The init process can display menus at various points + * (e.g. browser, pgp key selection). This allows the screen to be + * autocleared after each menu, so the subsequent prompts can be + * read. */ + set_option (OPTMENUPOPCLEARSCREEN); if (autocrypt_dir_init (can_create)) goto bail; @@ -91,11 +96,13 @@ int mutt_autocrypt_init (int can_create) goto bail; unset_option (OPTIGNOREMACROEVENTS); + unset_option (OPTMENUPOPCLEARSCREEN); return 0; bail: unset_option (OPTIGNOREMACROEVENTS); + unset_option (OPTMENUPOPCLEARSCREEN); unset_option (OPTAUTOCRYPT); mutt_autocrypt_db_close (); return -1; |