mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-10 16:20:17 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-25

Browse source 
5569e64 ; Spelling fixes
24a5f57 * lisp/net/eww.el (eww-tag-meta): Handle single quoted URLs (...
9b89896 * lisp/progmodes/sql.el (sql-product-alist): Doc tweak
69b50f5 * lisp/progmodes/sql.el (sql-product-alist): Doc fix.  (Bug#2...
42eae54 Improve documentation of dabbrevs
b0ade0d Clarify that easy-menu-add is a nop (Bug#25382)
3c69f2c * lisp/textmodes/rst.el (rst-package-emacs-version-alist): Fi...

# Conflicts:
#	lisp/textmodes/rst.el
This commit is contained in:
Paul Eggert 2017-03-19 12:27:55 -07:00
commit 59ced4521e
6 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/emacs-lisp/easymenu.el
View file

@ -489,7 +489,7 @@ To implement dynamic menus, either call this from
;; XEmacs needs the following two functions to add and remove menus.
;; In Emacs this is done automatically when switching keymaps, so
;; here easy-menu-remove is a noop.
;; here easy-menu-remove and easy-menu-add are a noops.
(defalias 'easy-menu-remove 'ignore
"Remove MENU from the current menu bar.
Contrary to XEmacs, this is a nop on Emacs since menus are automatically
@ -497,15 +497,16 @@ Contrary to XEmacs, this is a nop on Emacs since menus are automatically
\(fn MENU)")
(defun easy-menu-add (_menu &optional _map)
(defalias 'easy-menu-add #'ignore
"Add the menu to the menubar.
On Emacs, menus are already automatically activated when the
corresponding keymap is activated. On XEmacs this is needed to
actually add the menu to the current menubar.
On Emacs this is a nop, because menus are already automatically
activated when the corresponding keymap is activated. On XEmacs
this is needed to actually add the menu to the current menubar.
You should call this once the menu and keybindings are set up
completely and menu filter functions can be expected to work."
)
completely and menu filter functions can be expected to work.
\(fn MENU &optional MAP)")
(defun add-submenu (menu-path submenu &optional before in-menu)
"Add submenu SUBMENU in the menu at MENU-PATH.