aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.0946: cannot use "q" to cancel a number prompt

Browse Source 
Problem:    Cannot use "q" to cancel a number prompt.
Solution:   Recognize "q" instead of ignoring it.
This commit is contained in:
Bram Moolenaar 2020-06-10 15:45:57 +02:00
parent 152e79e94b
commit eebd555733
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/misc1.c
View File

@ -945,7 +945,7 @@ get_number(
do_redraw = FALSE; do_redraw = FALSE;
break; 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; break;
} }
--no_mapping; --no_mapping;
@ -967,9 +967,9 @@ prompt_for_number(int *mouse_used)
// When using ":silent" assume that <CR> was entered. // When using ":silent" assume that <CR> was entered.
if (mouse_used != NULL) 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 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 // 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 // get mouse events. redraw_after_callback() will not redraw if cmdline_row

12
src/testdir/test_functions.vim
View File

@ -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 feedkeys(":let c = inputlist(['Select color:', '1. red', '2. green', '3. blue'])\<cr>3\<cr>", 'tx')
call assert_equal(3, c) 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 " 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 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) call assert_equal(2, c)

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
946,
/**/ /**/
945, 945,
/**/ /**/