From 01ac0a1f664c5b1ffd5c9ef196d4b47edf2fd494 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 5 Apr 2021 18:20:45 +0200
Subject: [PATCH] patch 8.2.2720: GTK menu tooltip moves the cursor

Problem:    GTK menu tooltip moves the cursor.
Solution:   Position the cursor after displaying the tooltip.  Do not show the
            tooltip when editing the command line.
---
 src/gui_gtk.c | 6 ++++++
 src/version.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 3c435f9609..77076fcbeb 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -691,17 +691,23 @@ menu_item_select(GtkWidget *widget UNUSED, gpointer data)
     char_u	*tooltip;
     static int	did_msg = FALSE;
 
+    if (State & CMDLINE)
+	return;
     menu = (vimmenu_T *)data;
     tooltip = CONVERT_TO_UTF8(menu->strings[MENU_INDEX_TIP]);
     if (tooltip != NULL && utf_valid_string(tooltip, NULL))
     {
 	msg((char *)tooltip);
 	did_msg = TRUE;
+	setcursor();
+	out_flush_cursor(TRUE, FALSE);
     }
     else if (did_msg)
     {
 	msg("");
 	did_msg = FALSE;
+	setcursor();
+	out_flush_cursor(TRUE, FALSE);
     }
     CONVERT_TO_UTF8_FREE(tooltip);
 }
diff --git a/src/version.c b/src/version.c
index 76da319622..358ff07fe8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2720,
 /**/
     2719,
 /**/