[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 b0ade0d: Clarify that easy-menu-add is a nop (Bug
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-25 b0ade0d: Clarify that easy-menu-add is a nop (Bug#25382) |
Date: |
Thu, 12 Jan 2017 15:29:19 +0000 (UTC) |
branch: emacs-25
commit b0ade0df21d4cde8537c29f81eb10bdcf1cdfbfc
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Clarify that easy-menu-add is a nop (Bug#25382)
* lisp/emacs-lisp/easymenu.el (easy-menu-add): Make it into an alias of
`ignore', like `easy-menu-remove'.
---
lisp/emacs-lisp/easymenu.el | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 603bbcd..4fc9a78 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 b0ade0d: Clarify that easy-menu-add is a nop (Bug#25382),
Noam Postavsky <=