diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2020-11-29 02:12:15 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2020-11-29 02:12:15 +0900 |
| commit | d46a223d8595e8edb67c6361033625797503cacf (patch) | |
| tree | cf7e27daa93bfd05663dbbb2555b4682843ed40f /lisp/emacs-lisp/easymenu.el | |
| parent | 62abc054041a592ca617ab228d61469dd7923a3f (diff) | |
| parent | 769dc33df7ec9ac81aa52c336d2a61c32ddbd50f (diff) | |
| download | emacs-d46a223d8595e8edb67c6361033625797503cacf.tar.gz emacs-d46a223d8595e8edb67c6361033625797503cacf.tar.bz2 emacs-d46a223d8595e8edb67c6361033625797503cacf.zip | |
Merge branch 'master' into feature/pgtk
Diffstat (limited to 'lisp/emacs-lisp/easymenu.el')
| -rw-r--r-- | lisp/emacs-lisp/easymenu.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index b0198dbf8d5..7a24af7963f 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -488,17 +488,14 @@ To implement dynamic menus, either call this from `menu-bar-update-hook' or use a menu filter." (easy-menu-add-item map path (easy-menu-create-menu name items) before)) -;; 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 and easy-menu-add are a noops. -(defalias 'easy-menu-remove 'ignore +(define-obsolete-function-alias 'easy-menu-remove #'ignore "28.1" "Remove MENU from the current menu bar. Contrary to XEmacs, this is a nop on Emacs since menus are automatically \(de)activated when the corresponding keymap is (de)activated. \(fn MENU)") -(defalias 'easy-menu-add #'ignore +(define-obsolete-function-alias 'easy-menu-add #'ignore "28.1" "Add the menu to the menubar. On Emacs this is a nop, because menus are already automatically activated when the corresponding keymap is activated. On XEmacs |