patch 8.2.2875: cancelling inputlist() after a digit does not return zero

Problem:    Cancelling inputlist() after a digit does not return zero.
Solution:   Always return zero when cancelling. (closes #8231)

diff --git a/src/misc1.c b/src/misc1.c
index a72dc9bf212ea6a469e87ea53ec4fe713d2bb156..7cac06b9262cd82df552975e25869c88103a922d 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -946,7 +946,12 @@ get_number(
            do_redraw = FALSE;
            break;
        }
-       else if (c == CAR || c == NL || c == Ctrl_C || c == ESC || c == 'q')
+       else if (c == Ctrl_C || c == ESC || c == 'q')
+       {
+           n = 0;
+           break;
+       }
+       else if (c == CAR || c == NL )
            break;
     }
     --no_mapping;

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 96cf16ce46aa7ad05f6dd7c3eaca4a39a8d83c63..b4d462b86c03e42ed6536c59ca554c416e0fc1fb 100644 (file)
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1480,6 +1480,10 @@ func Test_inputlist()
   call feedkeys(":let c = inputlist(['Select color:', '1. red', '2. green', '3. blue'])\<cr>q", 'tx')
   call assert_equal(0, c)
 
+  " Cancel after inputting a number
+  call feedkeys(":let c = inputlist(['Select color:', '1. red', '2. green', '3. blue'])\<cr>5q", 'tx')
+  call assert_equal(0, c)
+
   " Use backspace to delete characters in the prompt
   call feedkeys(":let c = inputlist(['Select color:', '1. red', '2. green', '3. blue'])\<cr>1\<BS>3\<BS>2\<cr>", 'tx')
   call assert_equal(2, c)

diff --git a/src/version.c b/src/version.c
index 7f163f8a3c7cbd3d51b7c3d2f2d80da2305c548b..d593a2207360f97ed093cc9c7ab32e323d55a7fb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2875,
 /**/
     2874,
 /**/