Also accept numbers as input in mutt_multi_choice(). From Byrial.

1 files changed, 15 insertions, 4 deletions

diff --git a/curs_lib.c b/curs_lib.c
index 113a6ef9..6b20d68f 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -382,25 +382,36 @@ void mutt_curs_set (int cursor)
 int mutt_multi_choice (char *prompt, char *letters)
 {
   event_t ch;
-  int choice = 0;
+  int choice;
   char *p;
 
   mvaddstr (LINES - 1, 0, prompt);
   clrtoeol ();
-  while (!choice)
+  FOREVER
   {
     mutt_refresh ();
     ch  = mutt_getch ();
     if (ch.ch == -1)
+    {
       choice = -1;
+      break;
+    }
     else
     {
       p = strchr (letters, ch.ch);
       if (p)
+      {
 	choice = p - letters + 1;
-      else
-	BEEP ();
+	break;
+      }
+      else if (ch.ch <= '9' && ch.ch > '0')
+      {
+	choice = ch.ch - '0';
+	if (choice <= strlen (letters))
+	  break;
+      }
     }
+    BEEP ();
   }
   CLEARLINE (LINES - 1);
   mutt_refresh ();