From: Juri Linkov <juri@linkov.net>
Date: Mon, 26 Aug 2019 22:38:19 +0000 (+0300)
Subject: * src/keyboard.c (parse_tool_bar_item): Use CAPTION when HELP is unavailable
X-Git-Tag: emacs-27.0.90~1328^2~64
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f600134a24feab37f393e066e811f5c09ad48917;p=emacs.git

* src/keyboard.c (parse_tool_bar_item): Use CAPTION when HELP is unavailable

while adding equivalent key binding to the tooltip. (Bug#36156)
---

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));
     }