Mercurial > vim
changeset 20788:072ad890c227 v8.2.0946
patch 8.2.0946: cannot use "q" to cancel a number prompt
Commit: https://github.com/vim/vim/commit/eebd555733491cb55b9f30fe28772c0fd0ebacf7
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jun 10 15:45:57 2020 +0200
patch 8.2.0946: cannot use "q" to cancel a number prompt
Problem: Cannot use "q" to cancel a number prompt.
Solution: Recognize "q" instead of ignoring it.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 10 Jun 2020 16:00:05 +0200 |
parents | a17de379e6bd |
children | 7177dae667cd |
files | src/misc1.c src/testdir/test_functions.vim src/version.c |
diffstat | 3 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)