Make XEmacs compat aliases easy-menu-{add,remove} obsolete

* lisp/emacs-lisp/easymenu.el (easy-menu-remove, easy-menu-add):
Make XEmacs compat aliases obsolete.
* lisp/allout.el (allout-setup-menubar):
* lisp/cus-edit.el (Custom-mode):
* lisp/gnus/gnus-art.el (gnus-article-edit-mode):
* lisp/gnus/message.el (message-mode):
* lisp/net/sieve.el (sieve-manage-mode):
* lisp/org/org-agenda.el (org-agenda-mode):
* lisp/org/org-table.el (org-table-edit-formulas, orgtbl-mode):
* lisp/org/org.el:
* lisp/progmodes/cperl-mode.el (cperl-mode):
* lisp/progmodes/hideshow.el (hs-minor-mode):
* lisp/progmodes/idlw-help.el (idlwave-help-mode):
* lisp/progmodes/idlw-shell.el (idlwave-shell-mode):
* lisp/progmodes/idlwave.el (idlwave-mode):
* lisp/progmodes/meta-mode.el (meta-common-mode):
* lisp/progmodes/octave.el (octave-mode):
* lisp/progmodes/prolog.el (prolog-menu):
* lisp/progmodes/tcl.el (tcl-mode):
* lisp/speedbar.el (speedbar-reconfigure-keymaps):
* lisp/term.el (term-mode, term-char-mode, term-process-pager):
* lisp/textmodes/dns-mode.el (dns-mode):
* lisp/wid-browse.el (widget-browse-mode): Don't call above
obsolete aliases.
* lisp/cedet/semantic/grammar.el (semantic-grammar-setup-menu-xemacs):
* lisp/mh-e/mh-folder.el (mh-folder-mode):
* lisp/mh-e/mh-identity.el (mh-identity-add-menu):
* lisp/mh-e/mh-letter.el (mh-letter-mode):
* lisp/mh-e/mh-search.el (mh-search-mode):
* lisp/mh-e/mh-show.el (mh-show-mode):
* lisp/obsolete/otodo-mode.el (todo-mode):
* lisp/progmodes/antlr-mode.el (antlr-mode):
* lisp/progmodes/cc-mode.el (c-mode, c++-mode, objc-mode)
(java-mode, idl-mode, pike-mode):
* lisp/progmodes/sql.el (sql-mode, sql-interactive-mode):
* lisp/progmodes/vhdl-mode.el (vhdl-update-mode-menu)
(vhdl-add-source-files-menu, vhdl-mode):
* lisp/textmodes/reftex-index.el (reftex-index-mode)
(reftex-index-phrases-mode):
* lisp/textmodes/reftex-toc.el (reftex-toc-mode):
* lisp/textmodes/reftex.el (reftex-mode): Only call above obsolete
aliases in XEmacs.

* lisp/progmodes/prolog.el (prolog-inferior-menu):
* lisp/erc/erc-menu.el (erc-menu-add, erc-menu-remove): Don't call
above obsolete aliases.  Make obsolete.
* lisp/erc/erc-menu.el (menu, erc-menu-add, erc-menu-remove):
* lisp/progmodes/prolog.el (prolog-inferior-mode): Adjust callers.
* lisp/speedbar.el (speedbar-previous-menu): Make obsolete.
(Bug#44731)

1 files changed, 12 insertions, 6 deletions

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index c5201d1af54..5e8cf6161ef 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -2597,7 +2597,8 @@ Key bindings:
   (setq abbrev-mode t)
   (c-init-language-vars-for 'c-mode)
   (c-common-init 'c-mode)
-  (easy-menu-add c-c-menu)
+  (when (featurep 'xemacs)
+    (easy-menu-add c-c-menu))
   (cc-imenu-init cc-imenu-c-generic-expression)
   (add-hook 'flymake-diagnostic-functions 'flymake-cc nil t)
   (c-run-mode-hooks 'c-mode-common-hook))
@@ -2688,7 +2689,8 @@ Key bindings:
   (setq abbrev-mode t)
   (c-init-language-vars-for 'c++-mode)
   (c-common-init 'c++-mode)
-  (easy-menu-add c-c++-menu)
+  (when (featurep 'xemacs)
+    (easy-menu-add c-c++-menu))
   (cc-imenu-init cc-imenu-c++-generic-expression)
   (add-hook 'flymake-diagnostic-functions 'flymake-cc nil t)
   (c-run-mode-hooks 'c-mode-common-hook))
@@ -2735,7 +2737,8 @@ Key bindings:
   (setq abbrev-mode t)
   (c-init-language-vars-for 'objc-mode)
   (c-common-init 'objc-mode)
-  (easy-menu-add c-objc-menu)
+  (when (featurep 'xemacs)
+    (easy-menu-add c-objc-menu))
   (cc-imenu-init nil 'cc-imenu-objc-function)
   (c-run-mode-hooks 'c-mode-common-hook))
 
@@ -2785,7 +2788,8 @@ Key bindings:
   (setq abbrev-mode t)
   (c-init-language-vars-for 'java-mode)
   (c-common-init 'java-mode)
-  (easy-menu-add c-java-menu)
+  (when (featurep 'xemacs)
+    (easy-menu-add c-java-menu))
   (cc-imenu-init cc-imenu-java-generic-expression)
   (c-run-mode-hooks 'c-mode-common-hook))
 
@@ -2827,7 +2831,8 @@ Key bindings:
   (c-initialize-cc-mode t)
   (c-init-language-vars-for 'idl-mode)
   (c-common-init 'idl-mode)
-  (easy-menu-add c-idl-menu)
+  (when (featurep 'xemacs)
+    (easy-menu-add c-idl-menu))
   ;;(cc-imenu-init cc-imenu-idl-generic-expression) ;TODO
   (c-run-mode-hooks 'c-mode-common-hook))
 
@@ -2872,7 +2877,8 @@ Key bindings:
   (setq	abbrev-mode t)
   (c-init-language-vars-for 'pike-mode)
   (c-common-init 'pike-mode)
-  (easy-menu-add c-pike-menu)
+  (when (featurep 'xemacs)
+    (easy-menu-add c-pike-menu))
   ;;(cc-imenu-init cc-imenu-pike-generic-expression) ;TODO
   (c-run-mode-hooks 'c-mode-common-hook))