[geany/geany-plugins] fb5600: Merge pull request #1100 from techee/vimode_g_problem

[Frank Lanitz]

Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   GitHub <noreply at github.com>
Date:        Wed, 29 Sep 2021 17:11:19 UTC
Commit:      fb5600a819a39c9d4de3981674676548543121f3
             https://github.com/geany/geany-plugins/commit/fb5600a819a39c9d4de3981674676548543121f3

Log Message:
-----------
Merge pull request #1100 from techee/vimode_g_problem

vimode: Ignore special command handling in insert mode


Modified Paths:
--------------
    vimode/src/cmd-runner.c

Modified: vimode/src/cmd-runner.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -522,15 +522,15 @@ static CmdDef *get_cmd_to_run(GSList *kpl, CmdDef *cmds, gboolean have_selection
 				if (cmd->cmd == c)
 					return cmd;
 			}
-			else if (prev && prev->key == GDK_KEY_g)
+			else if (prev && prev->key == GDK_KEY_g && !VI_IS_INSERT(mode))
 			{
 				// takes care of operator commands like g~, gu, gU where we
 				// have no selection yet so the 2-letter command isn't found
 				// above and a corresponding 1-letter command ~, u, U exists and
 				// would be used instead of waiting for the full command
 			}
 			else if (is_cmdpart(kpl, text_object_cmds) &&
-					get_cmd_to_run(below, operator_cmds, TRUE))
+					get_cmd_to_run(below, operator_cmds, TRUE) && !VI_IS_INSERT(mode))
 			{
 				// if we received "a" or "i", we have to check if there's not
 				// an operator command below because these can be part of



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).