diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-10 15:45:57 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-10 15:45:57 +0200 |
| commit | eebd555733491cb55b9f30fe28772c0fd0ebacf7 (patch) | |
| tree | e8f8946971343494c37cd9c4d0e366702408527d | |
| parent | 152e79e94bb935e75b866bd55479648cde11066a (diff) | |
| download | vim-git-8.2.0946.tar.gz | |
patch 8.2.0946: cannot use "q" to cancel a number promptv8.2.0946
Problem: Cannot use "q" to cancel a number prompt.
Solution: Recognize "q" instead of ignoring it.
| -rw-r--r-- | src/misc1.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_functions.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/src/misc1.c b/src/misc1.c index a370a82f8..db76d9bfa 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -945,7 +945,7 @@ get_number( do_redraw = FALSE; break; } - else if (c == CAR || c == NL || c == Ctrl_C || c == ESC) + else if (c == CAR || c == NL || c == Ctrl_C || c == ESC || c == 'q') break; } --no_mapping; @@ -967,9 +967,9 @@ prompt_for_number(int *mouse_used) // When using ":silent" assume that <CR> was entered. if (mouse_used != NULL) - msg_puts(_("Type number and <Enter> or click with mouse (empty cancels): ")); + msg_puts(_("Type number and <Enter> or click with the mouse (q or empty cancels): ")); else - msg_puts(_("Type number and <Enter> (empty cancels): ")); + msg_puts(_("Type number and <Enter> (q or empty cancels): ")); // Set the state such that text can be selected/copied/pasted and we still // get mouse events. redraw_after_callback() will not redraw if cmdline_row diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index 1de9c4c55..d3bf1db25 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1371,6 +1371,18 @@ func Test_inputlist() call feedkeys(":let c = inputlist(['Select color:', '1. red', '2. green', '3. blue'])\<cr>3\<cr>", 'tx') call assert_equal(3, c) + " CR to cancel + call feedkeys(":let c = inputlist(['Select color:', '1. red', '2. green', '3. blue'])\<cr>\<cr>", 'tx') + call assert_equal(0, c) + + " Esc to cancel + call feedkeys(":let c = inputlist(['Select color:', '1. red', '2. green', '3. blue'])\<cr>\<Esc>", 'tx') + call assert_equal(0, c) + + " q to cancel + call feedkeys(":let c = inputlist(['Select color:', '1. red', '2. green', '3. blue'])\<cr>q", '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 30106ff00..bce00b3cb 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 946, +/**/ 945, /**/ 944, |