From f600134a24feab37f393e066e811f5c09ad48917 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 27 Aug 2019 01:38:19 +0300 Subject: [PATCH] * src/keyboard.c (parse_tool_bar_item): Use CAPTION when HELP is unavailable while adding equivalent key binding to the tooltip. (Bug#36156) --- src/keyboard.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/keyboard.c b/src/keyboard.c index 30686a25898..1b9a603ca17 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8304,6 +8304,10 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item) AUTO_STRING (end, ")"); Lisp_Object orig = PROP (TOOL_BAR_ITEM_HELP); Lisp_Object desc = Fkey_description (keys, Qnil); + + if (NILP (orig)) + orig = PROP (TOOL_BAR_ITEM_CAPTION); + set_prop (TOOL_BAR_ITEM_HELP, CALLN (Fconcat, orig, beg, desc, end)); } -- 2.39.2