[Emacs-diffs] master f600134: * src/keyboard.c (parse_tool_bar_item): Use CAPTION when HELP is unavailable

[Juri Linkov]

branch: master
commit f600134a24feab37f393e066e811f5c09ad48917
Author: Juri Linkov <address@hidden>
Commit: Juri Linkov <address@hidden>

    * 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 30686a2..1b9a603 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));
     }