diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:08:12 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-04 21:08:12 -0800 |
| commit | ddce73d32fa3e62e022842e3bbdc0aa83bb358cc (patch) | |
| tree | 21dbcb8d40ff634b6f821de95af2b8e3deb0a8e3 /lisp/erc/erc-menu.el | |
| parent | 6a278b64f7356613c4a7709ed699655fa7415260 (diff) | |
| download | emacs-ddce73d32fa3e62e022842e3bbdc0aa83bb358cc.tar.gz | |
Revert previous accidental commit
Diffstat (limited to 'lisp/erc/erc-menu.el')
| -rw-r--r-- | lisp/erc/erc-menu.el | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el index 3c035e1e938..f54141287de 100644 --- a/lisp/erc/erc-menu.el +++ b/lisp/erc/erc-menu.el @@ -34,12 +34,8 @@ "ERC menu support." :group 'erc) -(defvar erc-menu-visible t - "Non-nil if the Erc menu is visible.") - (defvar erc-menu-definition (list "ERC" - :visible (lambda () erc-menu-visible) ["Connect to server..." erc t] ["Disconnect from server..." erc-quit-server erc-server-connected] "-" @@ -108,31 +104,33 @@ "ERC menu definition.") (defvar erc-menu-defined nil - "Internal ERC variable, non-nil if the ERC menu has been defined.") + "Internal variable used to keep track of whether we've defined the +ERC menu yet.") ;;;###autoload (autoload 'erc-menu-mode "erc-menu" nil t) (define-erc-module menu nil "Enable a menu in ERC buffers." ((unless erc-menu-defined - ;; Make sure the menu only gets defined once, since Emacs - ;; activates it immediately. + ;; make sure the menu only gets defined once, since Emacs 22 + ;; 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. + ;; 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)))) - (setq erc-menu-visible t) (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)))) - (setq erc-menu-visible nil) - (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")))) ;; silence byte-compiler warning (defvar erc-menu) @@ -147,10 +145,10 @@ (provide 'erc-menu) - +;;; erc-menu.el ends here +;; ;; Local Variables: ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: -;;; erc-menu.el ends here |