Update copyright year to 2015

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

diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index dd01280b3aa8ff2228a48d77a29c3e8f1c3d4856..d8af692470e449b2bdc7ac4034d2a8f656b1704d 100644 (file)
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -1,16 +1,17 @@
 ;;; erc-compat.el --- ERC compatibility code for XEmacs
 
-;; Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
 
 ;; 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
@@ -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:
 
@@ -46,6 +45,7 @@ See `erc-encoding-coding-alist'."
 
 (defalias 'erc-propertize 'propertize)
 (defalias 'erc-view-mode-enter 'view-mode-enter)
+(autoload 'help-function-arglist "help-fns")
 (defalias 'erc-function-arglist 'help-function-arglist)
 (defalias 'erc-delete-dups 'delete-dups)
 (defalias 'erc-replace-regexp-in-string 'replace-regexp-in-string)
@@ -71,7 +71,7 @@ See `erc-encoding-coding-alist'."
 are placed.
 Note that this should end with a directory separator.")
 
-;; XEmacs' `replace-match' does not replace matching subexpressions in strings.
+;; XEmacs's `replace-match' does not replace matching subexpressions in strings.
 (defun erc-replace-match-subexpression-in-string
   (newtext string match subexp start &optional fixedcase literal)
   "Replace the subexpression SUBEXP of the last match in STRING with NEWTEXT.
@@ -165,4 +165,3 @@ If START or END is negative, it counts from the end."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: 8948ffe0-aff8-4ad8-a196-368ebbfd58ff