diff options
Diffstat (limited to 'lisp/erc/erc-menu.el')
| -rw-r--r-- | lisp/erc/erc-menu.el | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el index 8173829797b..17e36984ea6 100644 --- a/lisp/erc/erc-menu.el +++ b/lisp/erc/erc-menu.el @@ -115,22 +115,10 @@ ERC menu yet.") ;; activates it immediately (easy-menu-define erc-menu erc-mode-map "ERC menu" erc-menu-definition) (setq erc-menu-defined t)) - (if (featurep 'xemacs) - (progn - ;; the menu isn't automatically added to the menu bar in - ;; XEmacs - (add-hook 'erc-mode-hook 'erc-menu-add) - (dolist (buffer (erc-buffer-list)) - (with-current-buffer buffer (erc-menu-add)))) - (erc-menu-add))) - ((if (featurep 'xemacs) - (progn - (remove-hook 'erc-mode-hook 'erc-menu-add) - (dolist (buffer (erc-buffer-list)) - (with-current-buffer buffer (erc-menu-remove)))) - (erc-menu-remove) - ;; `easy-menu-remove' is a no-op in Emacs 22 - (message "You might have to restart Emacs to remove the ERC menu")))) + (erc-menu-add)) + ((erc-menu-remove) + ;; `easy-menu-remove' is a no-op in Emacs 22 + (message "You might have to restart Emacs to remove the ERC menu"))) ;; silence byte-compiler warning (defvar erc-menu) |