From 5cf94577cf2045fec87344d7d89422fe6dfce62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=3D=3FUTF-8=3Fq=3FLuka=3D20Marku=3DC5=3DA1i=3DC4=3D87=3F?= =?UTF-8?q?=3D?= Date: Thu, 20 May 2021 21:14:20 +0200 Subject: 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) --- src/misc1.c | 7 ++++++- src/testdir/test_functions.vim | 4 ++++ src/version.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/misc1.c b/src/misc1.c index a72dc9bf2..7cac06b92 100644 --- 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 96cf16ce4..b4d462b86 100644 --- 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'])\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'])\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'])\1\3\2\", 'tx') call assert_equal(2, c) diff --git a/src/version.c b/src/version.c index 7f163f8a3..d593a2207 100644 --- 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, /**/ -- cgit v1.2.1