Mercurial > emacs
diff lisp/erc/erc-menu.el @ 74093:bc5d69739d5e
Merge from erc--emacs--22
Merge from my ERC Emacs 22 integration branch. The version is now "5.2
stable pre-release". This will probably be the last change to the
version of ERC in Emacs 22 before the release, pending any bugfixes. For
details on the changes, see the lisp/erc/ChangeLog file.
Note that ERC is now invoked with M-x erc, not M-x erc-select. If you
were using the old `erc' function programmatically, use `erc-open'
instead.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-520
Creator: Michael Olson <mwolson@gnu.org>
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 20 Nov 2006 06:50:29 +0000 |
| parents | 7010bb070445 |
| children | f45c5edf0be4 |
line wrap: on
line diff
--- a/lisp/erc/erc-menu.el Mon Nov 20 02:48:15 2006 +0000 +++ b/lisp/erc/erc-menu.el Mon Nov 20 06:50:29 2006 +0000 @@ -4,7 +4,6 @@ ;; Author: Mario Lang <mlang@delysid.org> ;; Keywords: comm, processes, menu -;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcMenu ;; This file is part of GNU Emacs. @@ -29,11 +28,12 @@ ;;; Code: +;(require 'erc) (require 'easymenu) (defvar erc-menu-definition - (list "IRC" - ["Connect to server..." erc-select t] + (list "ERC" + ["Connect to server..." erc t] ["Disconnect from server..." erc-quit-server erc-server-connected] "-" ["List channels..." erc-list-channels