diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2024-09-14 07:55:01 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2024-09-14 07:55:01 -0400 |
| commit | 0cf9886cdfb0dd3082d70cb08bd5845d8f42a813 (patch) | |
| tree | ba002ead8726c12678648475a9a0823a53cd84ba /lisp/emacs-lisp | |
| parent | 7eaa454283491f8397b29c9b208b1eee7706c3ea (diff) | |
| parent | d509a35699738519d42a35d72827b1111425669c (diff) | |
| download | emacs-0cf9886cdfb0dd3082d70cb08bd5845d8f42a813.tar.gz emacs-0cf9886cdfb0dd3082d70cb08bd5845d8f42a813.tar.bz2 emacs-0cf9886cdfb0dd3082d70cb08bd5845d8f42a813.zip | |
Merge from origin/emacs-30
d509a356997 Fix regression in widget-move (bug#72995)
ef0276de82b ; * lisp/cus-edit.el (setopt): Doc fix. (Bug#73098)
b115c2d5eba ; * lisp/minibuffer.el (completion-pcm--merge-completions...
3cda1fdc3b7 Correctly include fixed strings before a prefix wildcard ...
57d93d0259a ; * lisp/treesit.el (treesit-major-mode-setup): Doc fix.
ad289f364e5 ; Improve documentation of 'easy-menu-define'
3cad7cc8dc8 Set treesit-primary-parser for c and elixir ts mode
2f243fb91d6 ; Minor doc fix in treesit.el
6a6d7925c9d Fix range handling so it works for multibyte buffer (bug#...
76faf7e6091 Revert "Read more on each call to treesit's buffer reader"
c70bd0e3fe9 Fix tree-sitter indent preset prev-adaptive-prefix
272df33fb8b ; * CONTRIBUTE: Minor copyedits.
8e1187e336f Improve NEWS entries
ca3932121a8 Don't fail uniquify-tests in non-version-controlled sourc...
79f68597aba ; * etc/ORG-NEWS: Fix typo.
d66b70f3607 * doc/misc/auth.texi: Minor copy edits.
2c6b7b2da9f ; * admin/MAINTAINERS: Remove some entries for Artur Mala...
11e7ae3964e Fix bug#72254
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/easymenu.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index 6740c2af58d..0a273ef0f7c 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -38,7 +38,8 @@ (defmacro easy-menu-define (symbol maps doc menu) "Define a pop-up menu and/or menu bar menu specified by MENU. If SYMBOL is non-nil, define SYMBOL as a function to pop up the -submenu defined by MENU, with DOC as its doc string. +submenu defined by MENU, with DOC as its doc string. Also define +SYMBOL as a variable whose value is the menu. MAPS, if non-nil, should be a keymap or a list of keymaps; add the submenu defined by MENU to the keymap or each of the keymaps, |