aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/erc
parentaca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff)
parentd8fb8cce84b923a3289b69549e30958710ac3ebb (diff)
downloademacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz
emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog2
-rw-r--r--lisp/erc/ChangeLog.012
-rw-r--r--lisp/erc/ChangeLog.022
-rw-r--r--lisp/erc/ChangeLog.032
-rw-r--r--lisp/erc/ChangeLog.042
-rw-r--r--lisp/erc/ChangeLog.052
-rw-r--r--lisp/erc/ChangeLog.062
-rw-r--r--lisp/erc/ChangeLog.072
-rw-r--r--lisp/erc/ChangeLog.082
-rw-r--r--lisp/erc/erc-autoaway.el2
-rw-r--r--lisp/erc/erc-backend.el2
-rw-r--r--lisp/erc/erc-button.el2
-rw-r--r--lisp/erc/erc-capab.el2
-rw-r--r--lisp/erc/erc-compat.el2
-rw-r--r--lisp/erc/erc-dcc.el4
-rw-r--r--lisp/erc/erc-desktop-notifications.el2
-rw-r--r--lisp/erc/erc-ezbounce.el2
-rw-r--r--lisp/erc/erc-fill.el2
-rw-r--r--lisp/erc/erc-goodies.el2
-rw-r--r--lisp/erc/erc-ibuffer.el2
-rw-r--r--lisp/erc/erc-identd.el2
-rw-r--r--lisp/erc/erc-imenu.el3
-rw-r--r--lisp/erc/erc-join.el2
-rw-r--r--lisp/erc/erc-lang.el2
-rw-r--r--lisp/erc/erc-list.el2
-rw-r--r--lisp/erc/erc-log.el2
-rw-r--r--lisp/erc/erc-match.el2
-rw-r--r--lisp/erc/erc-menu.el2
-rw-r--r--lisp/erc/erc-netsplit.el2
-rw-r--r--lisp/erc/erc-networks.el2
-rw-r--r--lisp/erc/erc-notify.el2
-rw-r--r--lisp/erc/erc-page.el2
-rw-r--r--lisp/erc/erc-pcomplete.el2
-rw-r--r--lisp/erc/erc-replace.el3
-rw-r--r--lisp/erc/erc-ring.el2
-rw-r--r--lisp/erc/erc-services.el2
-rw-r--r--lisp/erc/erc-sound.el2
-rw-r--r--lisp/erc/erc-speedbar.el2
-rw-r--r--lisp/erc/erc-spelling.el2
-rw-r--r--lisp/erc/erc-stamp.el2
-rw-r--r--lisp/erc/erc-track.el2
-rw-r--r--lisp/erc/erc-truncate.el2
-rw-r--r--lisp/erc/erc-xdcc.el2
-rw-r--r--lisp/erc/erc.el2
44 files changed, 47 insertions, 45 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 847b995997c..0366addacfc 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -449,7 +449,7 @@
449 449
450See ChangeLog.08 for earlier changes. 450See ChangeLog.08 for earlier changes.
451 451
452 Copyright (C) 2009-2012 Free Software Foundation, Inc. 452 Copyright (C) 2009-2013 Free Software Foundation, Inc.
453 453
454 This file is part of GNU Emacs. 454 This file is part of GNU Emacs.
455 455
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index da7d0ae52d0..16ccd68043e 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -1034,7 +1034,7 @@
1034 1034
1035 * erc-speak.el, erc.el: New file. 1035 * erc-speak.el, erc.el: New file.
1036 1036
1037 Copyright (C) 2001, 2006-2012 Free Software Foundation, Inc. 1037 Copyright (C) 2001, 2006-2013 Free Software Foundation, Inc.
1038 1038
1039 This file is part of GNU Emacs. 1039 This file is part of GNU Emacs.
1040 1040
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index de76c113320..ae70a1b6a4f 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -2596,7 +2596,7 @@
2596 2596
2597See ChangeLog.01 for earlier changes. 2597See ChangeLog.01 for earlier changes.
2598 2598
2599 Copyright (C) 2002, 2006-2012 Free Software Foundation, Inc. 2599 Copyright (C) 2002, 2006-2013 Free Software Foundation, Inc.
2600 2600
2601 This file is part of GNU Emacs. 2601 This file is part of GNU Emacs.
2602 2602
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index f9b4506b784..c8dd1a3811c 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -2141,7 +2141,7 @@
2141 2141
2142See ChangeLog.02 for earlier changes. 2142See ChangeLog.02 for earlier changes.
2143 2143
2144 Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc. 2144 Copyright (C) 2003, 2006-2013 Free Software Foundation, Inc.
2145 2145
2146 This file is part of GNU Emacs. 2146 This file is part of GNU Emacs.
2147 2147
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index 922fb0c90dd..0d0e17f5d4f 100644
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -2072,7 +2072,7 @@
2072 2072
2073See ChangeLog.03 for earlier changes. 2073See ChangeLog.03 for earlier changes.
2074 2074
2075 Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc. 2075 Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc.
2076 2076
2077 This file is part of GNU Emacs. 2077 This file is part of GNU Emacs.
2078 2078
diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index 584d9829ee7..f5f6f616f0c 100644
--- a/lisp/erc/ChangeLog.05
+++ b/lisp/erc/ChangeLog.05
@@ -1217,7 +1217,7 @@
1217 1217
1218See ChangeLog.04 for earlier changes. 1218See ChangeLog.04 for earlier changes.
1219 1219
1220 Copyright (C) 2005-2012 Free Software Foundation, Inc. 1220 Copyright (C) 2005-2013 Free Software Foundation, Inc.
1221 1221
1222 This file is part of GNU Emacs. 1222 This file is part of GNU Emacs.
1223 1223
diff --git a/lisp/erc/ChangeLog.06 b/lisp/erc/ChangeLog.06
index 5dd77d5dfd8..a9261303702 100644
--- a/lisp/erc/ChangeLog.06
+++ b/lisp/erc/ChangeLog.06
@@ -1430,7 +1430,7 @@
1430 1430
1431See ChangeLog.05 for earlier changes. 1431See ChangeLog.05 for earlier changes.
1432 1432
1433 Copyright (C) 2006-2012 Free Software Foundation, Inc. 1433 Copyright (C) 2006-2013 Free Software Foundation, Inc.
1434 1434
1435 This file is part of GNU Emacs. 1435 This file is part of GNU Emacs.
1436 1436
diff --git a/lisp/erc/ChangeLog.07 b/lisp/erc/ChangeLog.07
index 09886ad4a72..ab080420dd7 100644
--- a/lisp/erc/ChangeLog.07
+++ b/lisp/erc/ChangeLog.07
@@ -812,7 +812,7 @@
812 812
813See ChangeLog.06 for earlier changes. 813See ChangeLog.06 for earlier changes.
814 814
815 Copyright (C) 2007-2012 Free Software Foundation, Inc. 815 Copyright (C) 2007-2013 Free Software Foundation, Inc.
816 816
817 This file is part of GNU Emacs. 817 This file is part of GNU Emacs.
818 818
diff --git a/lisp/erc/ChangeLog.08 b/lisp/erc/ChangeLog.08
index d0a30163aa3..3c847acd60a 100644
--- a/lisp/erc/ChangeLog.08
+++ b/lisp/erc/ChangeLog.08
@@ -405,7 +405,7 @@
405 405
406See ChangeLog.07 for earlier changes. 406See ChangeLog.07 for earlier changes.
407 407
408 Copyright (C) 2008-2012 Free Software Foundation, Inc. 408 Copyright (C) 2008-2013 Free Software Foundation, Inc.
409 409
410 This file is part of GNU Emacs. 410 This file is part of GNU Emacs.
411 411
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index fd9ac69aa3a..cc908577781 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -1,6 +1,6 @@
1;;; erc-autoaway.el --- Provides autoaway for ERC 1;;; erc-autoaway.el --- Provides autoaway for ERC
2 2
3;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Jorgen Schaefer <forcer@forcix.cx> 5;; Author: Jorgen Schaefer <forcer@forcix.cx>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 9b28916623b..c8b7286c7dd 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1,6 +1,6 @@
1;;; erc-backend.el --- Backend network communication for ERC 1;;; erc-backend.el --- Backend network communication for ERC
2 2
3;; Copyright (C) 2004-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
4 4
5;; Filename: erc-backend.el 5;; Filename: erc-backend.el
6;; Author: Lawrence Mitchell <wence@gmx.li> 6;; Author: Lawrence Mitchell <wence@gmx.li>
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 433ffc05340..24150138e12 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -1,6 +1,6 @@
1;; erc-button.el --- A way of buttonizing certain things in ERC buffers 1;; erc-button.el --- A way of buttonizing certain things in ERC buffers
2 2
3;; Copyright (C) 1996-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 1996-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@delysid.org> 5;; Author: Mario Lang <mlang@delysid.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index e8201f2ea43..4d22b2c5f50 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -1,6 +1,6 @@
1;;; erc-capab.el --- support for dancer-ircd and hyperion's CAPAB 1;;; erc-capab.el --- support for dancer-ircd and hyperion's CAPAB
2 2
3;; Copyright (C) 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2006-2013 Free Software Foundation, Inc.
4 4
5;; Maintainer: FSF 5;; Maintainer: FSF
6 6
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 1e299407fe9..b949f9a22cc 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -1,6 +1,6 @@
1;;; erc-compat.el --- ERC compatibility code for XEmacs 1;;; erc-compat.el --- ERC compatibility code for XEmacs
2 2
3;; Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
4 4
5;; Author: Alex Schroeder <alex@gnu.org> 5;; Author: Alex Schroeder <alex@gnu.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index e31416f0e1a..dc67d3b01df 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1,7 +1,7 @@
1;;; erc-dcc.el --- CTCP DCC module for ERC 1;;; erc-dcc.el --- CTCP DCC module for ERC
2 2
3;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2012 3;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2013 Free Software
4;; Free Software Foundation, Inc. 4;; Foundation, Inc.
5 5
6;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu> 6;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
7;; Noah Friedman <friedman@prep.ai.mit.edu> 7;; Noah Friedman <friedman@prep.ai.mit.edu>
diff --git a/lisp/erc/erc-desktop-notifications.el b/lisp/erc/erc-desktop-notifications.el
index 2cc3c80a8ea..2cff817b34c 100644
--- a/lisp/erc/erc-desktop-notifications.el
+++ b/lisp/erc/erc-desktop-notifications.el
@@ -1,6 +1,6 @@
1;; erc-desktop-notifications.el -- Send notification on PRIVMSG or mentions 1;; erc-desktop-notifications.el -- Send notification on PRIVMSG or mentions
2 2
3;; Copyright (C) 2012 Free Software Foundation, Inc. 3;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
4 4
5;; Author: Julien Danjou <julien@danjou.info> 5;; Author: Julien Danjou <julien@danjou.info>
6;; Keywords: comm 6;; Keywords: comm
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index 6bcc17e4bc0..32a4f39305a 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -1,6 +1,6 @@
1;;; erc-ezbounce.el --- Handle EZBounce bouncer commands 1;;; erc-ezbounce.el --- Handle EZBounce bouncer commands
2 2
3;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002, 2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Andreas Fuchs <asf@void.at> 5;; Author: Andreas Fuchs <asf@void.at>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index 35e14eb0e29..343143dc7b4 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -1,6 +1,6 @@
1;;; erc-fill.el --- Filling IRC messages in various ways 1;;; erc-fill.el --- Filling IRC messages in various ways
2 2
3;; Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Andreas Fuchs <asf@void.at> 5;; Author: Andreas Fuchs <asf@void.at>
6;; Mario Lang <mlang@delysid.org> 6;; Mario Lang <mlang@delysid.org>
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 892f82e2eba..e259c70b162 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -1,6 +1,6 @@
1;; erc-goodies.el --- Collection of ERC modules 1;; erc-goodies.el --- Collection of ERC modules
2 2
3;; Copyright (C) 2001-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
4 4
5;; Author: Jorgen Schaefer <forcer@forcix.cx> 5;; Author: Jorgen Schaefer <forcer@forcix.cx>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index d1e74fd4c54..6810ab20b77 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -1,6 +1,6 @@
1;;; erc-ibuffer.el --- ibuffer integration with ERC 1;;; erc-ibuffer.el --- ibuffer integration with ERC
2 2
3;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002, 2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@delysid.org> 5;; Author: Mario Lang <mlang@delysid.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index 9586dd698a0..4d624554a93 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -1,6 +1,6 @@
1;;; erc-identd.el --- RFC1413 (identd authentication protocol) server 1;;; erc-identd.el --- RFC1413 (identd authentication protocol) server
2 2
3;; Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2003, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: John Wiegley <johnw@gnu.org> 5;; Author: John Wiegley <johnw@gnu.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 7346fca1b8a..5e678b8bdd2 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -1,6 +1,7 @@
1;;; erc-imenu.el -- Imenu support for ERC 1;;; erc-imenu.el -- Imenu support for ERC
2 2
3;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2001-2002, 2004, 2006-2013 Free Software Foundation,
4;; Inc.
4 5
5;; Author: Mario Lang <mlang@delysid.org> 6;; Author: Mario Lang <mlang@delysid.org>
6;; Maintainer: FSF 7;; Maintainer: FSF
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index e285cfb4ec5..b6e6dfc5253 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -1,6 +1,6 @@
1;;; erc-join.el --- autojoin channels on connect and reconnects 1;;; erc-join.el --- autojoin channels on connect and reconnects
2 2
3;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Alex Schroeder <alex@gnu.org> 5;; Author: Alex Schroeder <alex@gnu.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index 2d7f555971e..b6876da0ba8 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -1,6 +1,6 @@
1;;; erc-lang.el --- provide the LANG command to ERC 1;;; erc-lang.el --- provide the LANG command to ERC
2 2
3;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002, 2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Alex Schroeder <alex@gnu.org> 5;; Author: Alex Schroeder <alex@gnu.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index 19afe2e79ee..3d78c1b7b9f 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -1,6 +1,6 @@
1;;; erc-list.el --- /list support for ERC 1;;; erc-list.el --- /list support for ERC
2 2
3;; Copyright (C) 2008-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
4 4
5;; Author: Tom Tromey <tromey@redhat.com> 5;; Author: Tom Tromey <tromey@redhat.com>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 1ff2951e09e..465babc74f7 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -1,6 +1,6 @@
1;;; erc-log.el --- Logging facilities for ERC. 1;;; erc-log.el --- Logging facilities for ERC.
2 2
3;; Copyright (C) 2003-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2003-2013 Free Software Foundation, Inc.
4 4
5;; Author: Lawrence Mitchell <wence@gmx.li> 5;; Author: Lawrence Mitchell <wence@gmx.li>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index f1219427360..7ca86b5ac95 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -1,6 +1,6 @@
1;;; erc-match.el --- Highlight messages matching certain regexps 1;;; erc-match.el --- Highlight messages matching certain regexps
2 2
3;; Copyright (C) 2002-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
4 4
5;; Author: Andreas Fuchs <asf@void.at> 5;; Author: Andreas Fuchs <asf@void.at>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index 1aec2ad417f..70c9ae65427 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -1,6 +1,6 @@
1;; erc-menu.el -- Menu-bar definitions for ERC 1;; erc-menu.el -- Menu-bar definitions for ERC
2 2
3;; Copyright (C) 2001-2002, 2004-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2001-2002, 2004-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@delysid.org> 5;; Author: Mario Lang <mlang@delysid.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index cbaf62b1a61..7afbcd94273 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -1,6 +1,6 @@
1;;; erc-netsplit.el --- Reduce JOIN/QUIT messages on netsplits 1;;; erc-netsplit.el --- Reduce JOIN/QUIT messages on netsplits
2 2
3;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@delysid.org> 5;; Author: Mario Lang <mlang@delysid.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index 5089ff6b4ba..177f3714ae2 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -1,6 +1,6 @@
1;;; erc-networks.el --- IRC networks 1;;; erc-networks.el --- IRC networks
2 2
3;; Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@lexx.delysid.org> 5;; Author: Mario Lang <mlang@lexx.delysid.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index b9d7ff78cd8..7061b035e54 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -1,6 +1,6 @@
1;;; erc-notify.el --- Online status change notification 1;;; erc-notify.el --- Online status change notification
2 2
3;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@lexx.delysid.org> 5;; Author: Mario Lang <mlang@lexx.delysid.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index 8eae6c83d15..e667627cb01 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -1,6 +1,6 @@
1;; erc-page.el - CTCP PAGE support for ERC 1;; erc-page.el - CTCP PAGE support for ERC
2 2
3;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002, 2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Maintainer: FSF 5;; Maintainer: FSF
6 6
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index d6bb8019b15..410a3c6d04c 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -1,6 +1,6 @@
1;;; erc-pcomplete.el --- Provides programmable completion for ERC 1;;; erc-pcomplete.el --- Provides programmable completion for ERC
2 2
3;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Sacha Chua <sacha@free.net.ph> 5;; Author: Sacha Chua <sacha@free.net.ph>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index 3d4a5d311b1..c64fe479581 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -1,6 +1,7 @@
1;; erc-replace.el -- wash and massage messages inserted into the buffer 1;; erc-replace.el -- wash and massage messages inserted into the buffer
2 2
3;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2001-2002, 2004, 2006-2013 Free Software Foundation,
4;; Inc.
4 5
5;; Author: Andreas Fuchs <asf@void.at> 6;; Author: Andreas Fuchs <asf@void.at>
6;; Maintainer: FSF 7;; Maintainer: FSF
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 6b3f3e3c3aa..ac5aaf23bc3 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -1,6 +1,6 @@
1;; erc-ring.el -- Command history handling for erc using ring.el 1;; erc-ring.el -- Command history handling for erc using ring.el
2 2
3;; Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Alex Schroeder <alex@gnu.org> 5;; Author: Alex Schroeder <alex@gnu.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index b75ad8e9517..1e3c3b17a23 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -1,6 +1,6 @@
1;;; erc-services.el --- Identify to NickServ 1;;; erc-services.el --- Identify to NickServ
2 2
3;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Maintainer: FSF 5;; Maintainer: FSF
6 6
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 55336a68cfe..b0dd99955c4 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -1,6 +1,6 @@
1;;; erc-sound.el --- CTCP SOUND support for ERC 1;;; erc-sound.el --- CTCP SOUND support for ERC
2 2
3;; Copyright (C) 2002-2003, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2003, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Maintainer: FSF 5;; Maintainer: FSF
6 6
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 22053945159..af043bdb2c1 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -1,6 +1,6 @@
1;;; erc-speedbar.el --- Speedbar support for ERC 1;;; erc-speedbar.el --- Speedbar support for ERC
2 2
3;; Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@delysid.org> 5;; Author: Mario Lang <mlang@delysid.org>
6;; Contributor: Eric M. Ludlam <eric@siege-engine.com> 6;; Contributor: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 5f40cc39e89..4866cacb99f 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -1,6 +1,6 @@
1;;; erc-spelling.el --- use flyspell in ERC 1;;; erc-spelling.el --- use flyspell in ERC
2 2
3;; Copyright (C) 2005-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2005-2013 Free Software Foundation, Inc.
4 4
5;; Author: Jorgen Schaefer <forcer@forcix.cx> 5;; Author: Jorgen Schaefer <forcer@forcix.cx>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 4fa3f9f5915..b7306f9bcb3 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -1,6 +1,6 @@
1;;; erc-stamp.el --- Timestamping for ERC messages 1;;; erc-stamp.el --- Timestamping for ERC messages
2 2
3;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@delysid.org> 5;; Author: Mario Lang <mlang@delysid.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 976d2a21030..054c135fa67 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -1,6 +1,6 @@
1;;; erc-track.el --- Track modified channel buffers 1;;; erc-track.el --- Track modified channel buffers
2 2
3;; Copyright (C) 2002-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@delysid.org> 5;; Author: Mario Lang <mlang@delysid.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 8a219500ecb..f17968fc59d 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -1,6 +1,6 @@
1;;; erc-truncate.el --- Functions for truncating ERC buffers 1;;; erc-truncate.el --- Functions for truncating ERC buffers
2 2
3;; Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2003-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Andreas Fuchs <asf@void.at> 5;; Author: Andreas Fuchs <asf@void.at>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 85356b39033..74a6943023f 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -1,6 +1,6 @@
1;;; erc-xdcc.el --- XDCC file-server support for ERC 1;;; erc-xdcc.el --- XDCC file-server support for ERC
2 2
3;; Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2003-2004, 2006-2013 Free Software Foundation, Inc.
4 4
5;; Author: Mario Lang <mlang@delysid.org> 5;; Author: Mario Lang <mlang@delysid.org>
6;; Maintainer: FSF 6;; Maintainer: FSF
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index bead7759e13..042ad09decf 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1,6 +1,6 @@
1;; erc.el --- An Emacs Internet Relay Chat client 1;; erc.el --- An Emacs Internet Relay Chat client
2 2
3;; Copyright (C) 1997-2012 Free Software Foundation, Inc. 3;; Copyright (C) 1997-2013 Free Software Foundation, Inc.
4 4
5;; Author: Alexander L. Belikoff (alexander@belikoff.net) 5;; Author: Alexander L. Belikoff (alexander@belikoff.net)
6;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu), 6;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),