diff options
| author | Miles Bader <[email protected]> | 2006-11-20 06:50:29 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2006-11-20 06:50:29 +0000 |
| commit | 83dc6995148085966eddca749228a6338b7e6b0e (patch) | |
| tree | 0fbf7066385873a51749737e5ac0d9c57b8a3d28 /lisp/erc/erc-menu.el | |
| parent | e15a04955b0c59069aa870d7d5040bc2e795b2eb (diff) | |
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: [email protected]/emacs--devo--0--patch-520
Creator: Michael Olson <[email protected]>
Diffstat (limited to 'lisp/erc/erc-menu.el')
| -rw-r--r-- | lisp/erc/erc-menu.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el index 7040a7baee..a2dc7a1b2f 100644 --- a/lisp/erc/erc-menu.el +++ b/lisp/erc/erc-menu.el @@ -4,7 +4,6 @@ ;; Author: Mario Lang <[email protected]> ;; 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 |