From: Po Lu <luangruo@yahoo.com>
Date: Wed, 2 Mar 2022 03:12:09 +0000 (+0800)
Subject: Fix persistent help text on disabled menu items
X-Git-Tag: emacs-29.0.90~2055
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae00f07d88ced80ef8433594eb376858bb197782;p=emacs.git

Fix persistent help text on disabled menu items

* oldXMenu/Activate.c (XMenuActivate): Always deactivate help
echo upon leaving a menu item.
---

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 2d1d5068328..781c05bd026 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -456,10 +456,10 @@ XMenuActivate(
 	     * If the current selection was activated then
 	     * deactivate it.
 	     */
+	    /* Emacs specific, HELP_STRING cannot be validly NULL
+	     * in the real XMenu library.  */
+	    help_callback (NULL, cur_p->serial, cur_s->serial);
 	    if (cur_s->activated) {
-		/* Emacs specific, HELP_STRING cannot be validly NULL
-		 * in the real XMenu library.  */
-		help_callback (NULL, cur_p->serial, cur_s->serial);
 		cur_s->activated = False;
 		_XMRefreshSelection(display, menu, cur_s);
 	    }