aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.0.0379: CTRL-Z and mouse click use CTRL-O unnecessary

Browse Source 
Problem:    CTRL-Z and mouse click use CTRL-O unnecessary.
Solution:   Remove stuffing CTRL-O. (James McCoy, closes #1453)
This commit is contained in:
Bram Moolenaar
2017-02-26 19:09:05 +01:00
parent 0c8485f0e4
commit 74a47162a0
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/edit.c
View File

@@ -1038,8 +1038,10 @@ doESCkey:
if (!p_im) if (!p_im)
goto normalchar; /* insert CTRL-Z as normal char */ goto normalchar; /* insert CTRL-Z as normal char */
do_cmdline_cmd((char_u *)"stop"); do_cmdline_cmd((char_u *)"stop");
c = Ctrl_O; #ifdef CURSOR_SHAPE
/*FALLTHROUGH*/ ui_cursor_shape(); /* may need to update cursor shape */
#endif
continue;
case Ctrl_O: /* execute one command */ case Ctrl_O: /* execute one command */
#ifdef FEAT_COMPL_FUNC #ifdef FEAT_COMPL_FUNC

4
src/normal.c
View File

@@ -2982,8 +2982,6 @@ do_mouse(
|| (mod_mask & MOD_MASK_MULTI_CLICK) == MOD_MASK_2CLICK) || (mod_mask & MOD_MASK_MULTI_CLICK) == MOD_MASK_2CLICK)
&& bt_quickfix(curbuf)) && bt_quickfix(curbuf))
{ {
if (State & INSERT)
stuffcharReadbuff(Ctrl_O);
if (curwin->w_llist_ref == NULL) /* quickfix window */ if (curwin->w_llist_ref == NULL) /* quickfix window */
do_cmdline_cmd((char_u *)".cc"); do_cmdline_cmd((char_u *)".cc");
else /* location list window */ else /* location list window */
@@ -6193,10 +6191,12 @@ nv_down(cmdarg_T *cap)
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
/* In a quickfix window a <CR> jumps to the error under the cursor. */ /* In a quickfix window a <CR> jumps to the error under the cursor. */
if (bt_quickfix(curbuf) && cap->cmdchar == CAR) if (bt_quickfix(curbuf) && cap->cmdchar == CAR)
{
if (curwin->w_llist_ref == NULL) if (curwin->w_llist_ref == NULL)
do_cmdline_cmd((char_u *)".cc"); /* quickfix window */ do_cmdline_cmd((char_u *)".cc"); /* quickfix window */
else else
do_cmdline_cmd((char_u *)".ll"); /* location list window */ do_cmdline_cmd((char_u *)".ll"); /* location list window */
}
else else
#endif #endif
{ {

2
src/version.c
View File

@@ -764,6 +764,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 */
/**/
379,
/**/ /**/
378, 378,
/**/ /**/