Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org

[gnu-emacs] / lisp / erc / erc-menu.el

diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index bc6afc9c766d1bf6e8e49feb1bf0c791d06fe816..ab11df920638df1311e541f9701aad42004e7581 100644 (file)
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -1,16 +1,17 @@
 ;; erc-menu.el -- Menu-bar definitions for ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2002, 2004-2013 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm, processes, menu
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -31,6 +30,10 @@
 (require 'erc)
 (require 'easymenu)
 
+(defgroup erc-menu nil
+  "ERC menu support."
+  :group 'erc)
+
 (defvar erc-menu-definition
   (list "ERC"
        ["Connect to server..." erc t]
@@ -75,8 +78,8 @@
                (erc-channel-user-op-p (erc-current-nick))]
               ["Set a key..." erc-set-channel-key
                (erc-channel-user-op-p (erc-current-nick))])
-        ["Leave this channel..." erc-part-from-channel erc-channel-users]
-        "-")
+        ["Leave this channel..." erc-part-from-channel erc-channel-users])
+       "-"
        (list "Pals, fools and other keywords"
              ["Add pal..." erc-add-pal]
              ["Delete pal..." erc-delete-pal]
@@ -130,8 +133,7 @@ ERC menu yet.")
      (message "You might have to restart Emacs to remove the ERC menu"))))
 
 ;; silence byte-compiler warning
-(eval-when-compile
-  (defvar erc-menu nil))
+(defvar erc-menu)
 
 (defun erc-menu-add ()
   "Add the ERC menu to the current buffer."
@@ -150,4 +152,3 @@ ERC menu yet.")
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 671219f2-b082-4753-a185-1d0c7e0c05bd