comparison 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
comparison
equal deleted inserted replaced
74092:b4cb60fd110d 74093:bc5d69739d5e
2 2
3 ;; Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. 3 ;; Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
4 4
5 ;; Author: Mario Lang <mlang@delysid.org> 5 ;; Author: Mario Lang <mlang@delysid.org>
6 ;; Keywords: comm, processes, menu 6 ;; Keywords: comm, processes, menu
7 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcMenu
8 7
9 ;; This file is part of GNU Emacs. 8 ;; This file is part of GNU Emacs.
10 9
11 ;; GNU Emacs is free software; you can redistribute it and/or modify 10 ;; GNU Emacs is free software; you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by 11 ;; it under the terms of the GNU General Public License as published by
27 26
28 ;; Loading this file defines a menu for ERC. 27 ;; Loading this file defines a menu for ERC.
29 28
30 ;;; Code: 29 ;;; Code:
31 30
31 ;(require 'erc)
32 (require 'easymenu) 32 (require 'easymenu)
33 33
34 (defvar erc-menu-definition 34 (defvar erc-menu-definition
35 (list "IRC" 35 (list "ERC"
36 ["Connect to server..." erc-select t] 36 ["Connect to server..." erc t]
37 ["Disconnect from server..." erc-quit-server erc-server-connected] 37 ["Disconnect from server..." erc-quit-server erc-server-connected]
38 "-" 38 "-"
39 ["List channels..." erc-list-channels 39 ["List channels..." erc-list-channels
40 (and erc-server-connected (fboundp 'erc-list-channels))] 40 (and erc-server-connected (fboundp 'erc-list-channels))]
41 ["Join channel..." erc-join-channel erc-server-connected] 41 ["Join channel..." erc-join-channel erc-server-connected]