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

vim-patch:7.4.807

Browse Source 
Problem:    After CTRL-V CTRL-A mode isn't updated. (Hirohito Higashi)
Solution:   Clear the command line or update the displayed command.

0bbcb5c8ef
This commit is contained in:
watiko 2016-01-18 10:04:11 +09:00
parent d21aaef456
commit 9664f513f4
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/nvim/normal.c
View File

@ -1705,10 +1705,7 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
VIsual_active = false; VIsual_active = false;
setmouse(); setmouse();
mouse_dragging = 0; mouse_dragging = 0;
if (mode_displayed) may_clear_cmdline();
clear_cmdline = true; /* unshow visual mode later */
else
clear_showcmd();
if ((oap->op_type == OP_YANK if ((oap->op_type == OP_YANK
|| oap->op_type == OP_COLON || oap->op_type == OP_COLON
|| oap->op_type == OP_FUNCTION || oap->op_type == OP_FUNCTION
@ -2852,10 +2849,7 @@ void end_visual_mode(void)
if (!virtual_active()) if (!virtual_active())
curwin->w_cursor.coladd = 0; curwin->w_cursor.coladd = 0;
if (mode_displayed) may_clear_cmdline();
clear_cmdline = true; /* unshow visual mode later */
else
clear_showcmd();
adjust_cursor_eol(); adjust_cursor_eol();
} }
@ -3149,10 +3143,19 @@ static void unshift_special(cmdarg_T *cap)
cap->cmdchar = simplify_key(cap->cmdchar, &mod_mask); cap->cmdchar = simplify_key(cap->cmdchar, &mod_mask);
} }
/* /// If the mode is currently displayed clear the command line or update the
* Routines for displaying a partly typed command /// command displayed.
*/ static void may_clear_cmdline(void)
{
if (mode_displayed) {
// unshow visual mode later
clear_cmdline = true;
} else {
clear_showcmd();
}
}
// Routines for displaying a partly typed command
# define SHOWCMD_BUFLEN SHOWCMD_COLS + 1 + 30 # define SHOWCMD_BUFLEN SHOWCMD_COLS + 1 + 30
static char_u showcmd_buf[SHOWCMD_BUFLEN]; static char_u showcmd_buf[SHOWCMD_BUFLEN];
static char_u old_showcmd_buf[SHOWCMD_BUFLEN]; /* For push_showcmd() */ static char_u old_showcmd_buf[SHOWCMD_BUFLEN]; /* For push_showcmd() */
@ -3532,6 +3535,7 @@ static void nv_help(cmdarg_T *cap)
static void nv_addsub(cmdarg_T *cap) static void nv_addsub(cmdarg_T *cap)
{ {
bool visual = VIsual_active; bool visual = VIsual_active;
if (cap->oap->op_type == OP_NOP if (cap->oap->op_type == OP_NOP
&& do_addsub((int)cap->cmdchar, cap->count1, cap->arg) == OK) { && do_addsub((int)cap->cmdchar, cap->count1, cap->arg) == OK) {
if (visual) { if (visual) {
@ -3549,6 +3553,7 @@ static void nv_addsub(cmdarg_T *cap)
if (visual) { if (visual) {
VIsual_active = false; VIsual_active = false;
redo_VIsual_busy = false; redo_VIsual_busy = false;
may_clear_cmdline();
redraw_later(INVERTED); redraw_later(INVERTED);
} }
} }

2
src/nvim/version.c
View File

@ -327,7 +327,7 @@ static int included_patches[] = {
// 810, // 810,
809, 809,
// 808 NA // 808 NA
// 807, 807,
806, 806,
// 805, // 805,
// 804, // 804,