1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Make menu bar help text work on macOS as well

* lisp/tooltip.el (tooltip-show-help): Resort to displaying
messages in the echo area on NS.

* src/nsmenu.m ([EmacsMenu menu:willHighlightItem:]): Call
`show_help_echo' instead of storing an event into the keyboard
buffer.
This commit is contained in:
Po Lu 2022-05-03 16:12:24 +08:00
parent f9dea5b4c5
commit 5adc84a27b
2 changed files with 8 additions and 11 deletions

View file

@ -377,7 +377,11 @@ It is also called if Tooltip mode is on, for text-only displays."
(defun tooltip-show-help (msg)
"Function installed as `show-help-function'.
MSG is either a help string to display, or nil to cancel the display."
(if (and (display-graphic-p))
(if (and (display-graphic-p)
;; Tooltips can't be displayed on top of the global menu
;; bar on NS.
(or (not (eq window-system 'ns))
(menu-or-popup-active-p)))
(let ((previous-help tooltip-help-message))
(setq tooltip-help-message msg)
(cond ((null msg)