IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15213 from zeertzjq/vim-8.2.3236

Browse Source 
vim-patch:8.2.3236: mode() does not indicate using CTRL-O in Select mode
This commit is contained in:
Thomas Vigouroux 2021-07-29 17:03:12 +02:00 committed by GitHub
commit 3b6d95b5f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/eval.txt
View File

@ -6350,6 +6350,10 @@ mode([expr]) Return a string that indicates the current mode.
s Select by character s Select by character
S Select by line S Select by line
CTRL-S Select blockwise CTRL-S Select blockwise
vs Visual by character using |v_CTRL-O| from
Select mode
Vs Visual by line using |v_CTRL-O| from Select mode
CTRL-Vs Visual blockwise using |v_CTRL-O| from Select mode
i Insert i Insert
ic Insert mode completion |compl-generic| ic Insert mode completion |compl-generic|
ix Insert mode |i_CTRL-X| completion ix Insert mode |i_CTRL-X| completion

2
src/nvim/globals.h
View File

@ -524,6 +524,8 @@ EXTERN pos_T VIsual;
EXTERN int VIsual_active INIT(= false); EXTERN int VIsual_active INIT(= false);
/// Whether Select mode is active. /// Whether Select mode is active.
EXTERN int VIsual_select INIT(= false); EXTERN int VIsual_select INIT(= false);
/// Restart Select mode when next cmd finished
EXTERN int restart_VIsual_select INIT(= 0);
/// Whether to restart the selection after a Select-mode mapping or menu. /// Whether to restart the selection after a Select-mode mapping or menu.
EXTERN int VIsual_reselect; EXTERN int VIsual_reselect;
/// Type of Visual mode. /// Type of Visual mode.

2
src/nvim/normal.c
View File

@ -92,8 +92,6 @@ static linenr_T resel_VIsual_line_count; /* number of lines */
static colnr_T resel_VIsual_vcol; /* nr of cols or end col */ static colnr_T resel_VIsual_vcol; /* nr of cols or end col */
static int VIsual_mode_orig = NUL; /* saved Visual mode */ static int VIsual_mode_orig = NUL; /* saved Visual mode */
static int restart_VIsual_select = 0;
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "normal.c.generated.h" # include "normal.c.generated.h"

3
src/nvim/state.c
View File

@ -144,6 +144,9 @@ char *get_mode(void)
buf[0] = (char)(VIsual_mode + 's' - 'v'); buf[0] = (char)(VIsual_mode + 's' - 'v');
} else { } else {
buf[0] = (char)VIsual_mode; buf[0] = (char)VIsual_mode;
if (restart_VIsual_select) {
buf[1] = 's';
}
} }
} else if (State == HITRETURN || State == ASKMORE || State == SETWSIZE } else if (State == HITRETURN || State == ASKMORE || State == SETWSIZE
|| State == CONFIRM) { || State == CONFIRM) {

10
src/nvim/testdir/test_functions.vim
View File

@ -534,6 +534,7 @@ func Test_mode()
set complete=. set complete=.
inoremap <F2> <C-R>=Save_mode()<CR> inoremap <F2> <C-R>=Save_mode()<CR>
xnoremap <F2> <Cmd>call Save_mode()<CR>
normal! 3G normal! 3G
exe "normal i\<F2>\<Esc>" exe "normal i\<F2>\<Esc>"
@ -645,6 +646,14 @@ func Test_mode()
call assert_equal("\<C-S>", mode(1)) call assert_equal("\<C-S>", mode(1))
call feedkeys("\<Esc>", 'xt') call feedkeys("\<Esc>", 'xt')
" v_CTRL-O
exe "normal gh\<C-O>\<F2>\<Esc>"
call assert_equal("v-vs", g:current_modes)
exe "normal gH\<C-O>\<F2>\<Esc>"
call assert_equal("V-Vs", g:current_modes)
exe "normal g\<C-H>\<C-O>\<F2>\<Esc>"
call assert_equal("\<C-V>-\<C-V>s", g:current_modes)
call feedkeys(":echo \<C-R>=Save_mode()\<C-U>\<CR>", 'xt') call feedkeys(":echo \<C-R>=Save_mode()\<C-U>\<CR>", 'xt')
call assert_equal('c-c', g:current_modes) call assert_equal('c-c', g:current_modes)
call feedkeys("gQecho \<C-R>=Save_mode()\<CR>\<CR>vi\<CR>", 'xt') call feedkeys("gQecho \<C-R>=Save_mode()\<CR>\<CR>vi\<CR>", 'xt')
@ -653,6 +662,7 @@ func Test_mode()
bwipe! bwipe!
iunmap <F2> iunmap <F2>
xunmap <F2>
set complete& set complete&
endfunc endfunc