Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier@iro.umontreal.ca.

[bpt/emacs.git] / lisp / erc / erc-goodies.el

diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index ff06546..b2cf9e3 100644 (file)
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -1,7 +1,6 @@
 ;; erc-goodies.el --- Collection of ERC modules
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 
@@ -10,10 +9,10 @@
 
 ;; 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 3, 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
@@ -21,9 +20,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:
 
@@ -164,13 +161,13 @@ Put this function on `erc-insert-post-hook' and/or `erc-send-post-hook'."
                                erc-cmd-SM
                                erc-cmd-SMV
                                erc-cmd-LASTLOG)
-  "List of commands that are aliases for CTCP ACTION or for erc messages.
+  "List of commands that are aliases for CTCP ACTION or for ERC messages.
 
 If a command's function symbol is in this list, the typed command
 does not appear in the ERC buffer after the user presses ENTER.")
 
 (define-erc-module noncommands nil
-  "This mode distinguishies non-commands.
+  "This mode distinguishes non-commands.
 Commands listed in `erc-insert-this' know how to display
 themselves."
   ((add-hook 'erc-send-pre-hook 'erc-send-distinguish-noncommands))
@@ -188,11 +185,11 @@ themselves."
 
 ;;; IRC control character processing.
 (defgroup erc-control-characters nil
-  "Dealing with control characters"
+  "Dealing with control characters."
   :group 'erc)
 
 (defcustom erc-interpret-controls-p t
-  "*If non-nil, display IRC colours and other highlighting effects.
+  "*If non-nil, display IRC colors and other highlighting effects.
 
 If this is set to the symbol `remove', ERC removes all IRC colors and
 highlighting effects.  When this variable is non-nil, it can cause Emacs to run
@@ -205,7 +202,7 @@ emergency (message flood) it can be turned off to save processing time.  See
                  (const :tag "Display raw control characters" nil)))
 
 (defcustom erc-interpret-mirc-color nil
-  "*If non-nil, erc will interpret mIRC color codes."
+  "*If non-nil, ERC will interpret mIRC color codes."
   :group 'erc-control-characters
   :type 'boolean)
 
@@ -428,9 +425,8 @@ See `erc-interpret-controls-p' and `erc-interpret-mirc-color' for options."
 
 (defun erc-controls-highlight ()
   "Highlight IRC control chars in the buffer.
-This is useful for `erc-insert-modify-hook' and
-`erc-send-modify-hook'. Also see `erc-interpret-controls-p' and
-`erc-interpret-mirc-color'."
+This is useful for `erc-insert-modify-hook' and `erc-send-modify-hook'.
+Also see `erc-interpret-controls-p' and `erc-interpret-mirc-color'."
   (goto-char (point-min))
   (cond ((eq erc-interpret-controls-p 'remove)
          (while (re-search-forward erc-controls-remove-regexp nil t)
@@ -572,5 +568,4 @@ servers.  If called from a program, PROC specifies the server process."
 
 (provide 'erc-goodies)
 
-;; arch-tag: d987ae26-9e28-4c72-9596-e617309fb582
 ;;; erc-goodies.el ends here