Allow nested setting of OPTIGNOREMACROEVENTS.

This will be needed for the first-run of autocrypt initialization.
The initialization involves a number of prompts, and can even use the
folder browser.  The browser could in turn connect to IMAP which might
invoke a certificate prompt, login prompt, etc.

1 files changed, 8 insertions, 3 deletions

diff --git a/curs_lib.c b/curs_lib.c
index 62792d4f..6db52a81 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -242,11 +242,16 @@ int _mutt_get_field (const char *field, char *buf, size_t buflen, int complete,
 
 int mutt_get_field_unbuffered (char *msg, char *buf, size_t buflen, int flags)
 {
-  int rc;
+  int rc, reset_ignoremacro = 0;
 
-  set_option (OPTIGNOREMACROEVENTS);
+  if (!option (OPTIGNOREMACROEVENTS))
+  {
+    set_option (OPTIGNOREMACROEVENTS);
+    reset_ignoremacro = 1;
+  }
   rc = mutt_get_field (msg, buf, buflen, flags);
-  unset_option (OPTIGNOREMACROEVENTS);
+  if (reset_ignoremacro)
+    unset_option (OPTIGNOREMACROEVENTS);
 
   return (rc);
 }