diff options
| author | Juri Linkov <juri@linkov.net> | 2019-08-27 01:38:19 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2019-08-27 01:38:19 +0300 |
| commit | f600134a24feab37f393e066e811f5c09ad48917 (patch) | |
| tree | eac89163b80338d58e95aca67e54d640fda9df7f /src/keyboard.c | |
| parent | 1071a4fac6f2e70572a1259e073124cbb723e90d (diff) | |
| download | emacs-f600134a24feab37f393e066e811f5c09ad48917.tar.gz emacs-f600134a24feab37f393e066e811f5c09ad48917.tar.bz2 emacs-f600134a24feab37f393e066e811f5c09ad48917.zip | |
* src/keyboard.c (parse_tool_bar_item): Use CAPTION when HELP is unavailable
while adding equivalent key binding to the tooltip. (Bug#36156)
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 4 |
1 files changed, 4 insertions, 0 deletions
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)); } |