Fix a multi_choice related bug. From Vikas.

diff --git a/compose.c b/compose.c
index ac31f8be7097ab73ae08bb2f99805f0b7efa2daa..28cbfe74fc44bd3def1591ccb94d0739f64dff88 100644 (file)
--- 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 00e6ceb1f64f836ff8c95650b4a6d467430d22f7..817a6dd8299ff279fb6fea40116289a5d3519a53 100644 (file)
--- 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;