From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 10 Nov 1998 19:20:12 +0000 (+0000)
Subject: Fix a multi_choice related bug.  From Vikas.
X-Git-Tag: mutt-0-94-16i-rel~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac50a2c39a2bd3e0bfa24c585f7d0fa45161496f;p=mutt

Fix a multi_choice related bug.  From Vikas.
---

diff --git a/compose.c b/compose.c
index ac31f8be..28cbfe74 100644
--- a/compose.c
+++ b/compose.c
@@ -205,6 +205,7 @@ static int pgp_send_menu (int bits, int *redraw)
     }
     break;
 
+  case -1: /* abort */
   case 6: /* (f)orget it */
     bits = 0;
     break;
diff --git a/curs_lib.c b/curs_lib.c
index 00e6ceb1..817a6dd8 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -403,7 +403,7 @@ int mutt_multi_choice (char *prompt, char *letters)
   {
     mutt_refresh ();
     ch  = mutt_getch ();
-    if (ch.ch == -1)
+    if (ch.ch == -1 || CI_is_return (ch.ch))
     {
       choice = -1;
       break;