Merge from trunk

36 files changed, 95 insertions, 21 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 674a6c97eec..8b4df6099bc 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,7 +1,39 @@
-2012-09-17  Chong Yidong  <cyd@gnu.org>
+2012-10-07  Deniz Dogan  <deniz@dogan.se>
+
+        * erc-log.el (erc-generate-log-file-name-function):
+        Clarify tags for various choices.  (Bug#11186)
+
+2012-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * erc-button.el (erc-button-alist): Remove "finger".  (Bug#4443)
+
+2012-10-07  Antoine Levitt  <antoine.levitt@gmail.com>
+
+        * erc-stamp.el (erc-format-timestamp): Don't apply intangible
+        property to invisible stamps.  (Bug#11706)
+
+2012-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * erc-backend.el (NICK): Handle pre-existing buffers.  (Bug#12002)
 
-        * erc-page.el (erc-page-function): 
+2012-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * erc.el (erc-lurker):
+        * erc-desktop-notifications.el (erc-notifications):
+        Add missing group :version tags.
+
+2012-10-04  Julien Danjou  <julien@danjou.info>
+
+        * erc-desktop-notifications.el: Rename from erc-notifications to
+        avoid clash with 8+3 filename format and erc-notify.el.
+
+2012-09-25  Chong Yidong  <cyd@gnu.org>
+
+        * erc.el (erc-send-command): Use define-obsolete-function-alias.
+
+2012-09-17  Chong Yidong  <cyd@gnu.org>
 
+        * erc-page.el (erc-page-function):
         * erc-stamp.el (erc-stamp): Doc fix.
 
 2012-08-21  Josh Feinstein <jlf@foxtail.org>
@@ -94,7 +126,7 @@
         (erc-autojoin-after-ident): Ditto.
         (erc-autojoin-channels-alist): Mention auth-source.
 
-2012-04-10  Deniz Dogan  <deniz@dogan.se>  (tiny change)
+2012-04-10  Deniz Dogan  <deniz@dogan.se>
 
         * erc.el (erc-display-prompt): Adds the field text property to the
         ERC prompt.  This allows users to use `kill-whole-line' to kill
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index ab429a12589..fd9ac69aa3a 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2012  Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
+;; Maintainer: FSF
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 5da3009c854..20ccd071b95 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -4,6 +4,7 @@
 
 ;; Filename: erc-backend.el
 ;; Author: Lawrence Mitchell <wence@gmx.li>
+;; Maintainer: FSF
 ;; Created: 2004-05-7
 ;; Keywords: IRC chat client internet
 
@@ -1315,7 +1316,7 @@ add things to `%s' instead."
          (when (equal (erc-default-target) nick)
            (setq erc-default-recipients
                  (cons nn (cdr erc-default-recipients)))
-           (rename-buffer nn)
+           (rename-buffer nn t)         ; bug#12002
            (erc-update-mode-line)
            (add-to-list 'bufs (current-buffer)))))
       (erc-update-user-nick nick nn host nil nil login)
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index a0593dcb743..433ffc05340 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1996-2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; Keywords: irc, button, url, regexp
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcButton
 
@@ -134,7 +135,7 @@ longer than `erc-fill-column'."
   '(('nicknames 0 erc-button-buttonize-nicks erc-nick-popup 0)
     (erc-button-url-regexp 0 t browse-url 0)
     ("<URL: *\\([^<> ]+\\) *>" 0 t browse-url 1)
-    ("(\\(\\([^~\n \t@][^\n \t@]*\\)@\\([a-zA-Z0-9.:-]+\\)\\)" 1 t finger 2 3)
+;;; ("(\\(\\([^~\n \t@][^\n \t@]*\\)@\\([a-zA-Z0-9.:-]+\\)\\)" 1 t finger 2 3)
     ;; emacs internal
     ("[`]\\([a-zA-Z][-a-zA-Z_0-9]+\\)[']" 1 t erc-button-describe-symbol 1)
     ;; pseudo links
@@ -182,6 +183,7 @@ PAR is a number of a regexp grouping whose text will be passed to
   'nicknames, these are ignored, and CALLBACK will be called with
   the nickname matched as the argument."
   :group 'erc-button
+  :version "24.3"                       ; remove finger (bug#4443)
   :type '(repeat
           (list :tag "Button"
                 (choice :tag "Matches"
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
index c7103d6dc61..08b9c67f6c0 100644
--- a/lisp/erc/erc-capab.el
+++ b/lisp/erc/erc-capab.el
@@ -2,6 +2,10 @@
 
 ;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
+;; Maintainer: FSF
+
+; This file is part of GNU Emacs.
+
 ;; 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 of the License, or
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 1fb3930091e..1e299407fe9 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2003, 2005-2012 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: FSF
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 4d0534d3d5e..ed8440315eb 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -6,7 +6,7 @@
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
 ;;         Noah Friedman <friedman@prep.ai.mit.edu>
 ;;         Per Persson <pp@sno.pp.se>
-;; Maintainer: mlang@delysid.org
+;; Maintainer: FSF
 ;; Keywords: comm, processes
 ;; Created: 1994-01-23
 
diff --git a/lisp/erc/erc-notifications.el b/lisp/erc/erc-desktop-notifications.el
index 4faffc913c5..2cc3c80a8ea 100644
--- a/lisp/erc/erc-notifications.el
+++ b/lisp/erc/erc-desktop-notifications.el
@@ -1,4 +1,4 @@
-;; erc-notifications.el -- Send notification on PRIVMSG or mentions
+;; erc-desktop-notifications.el -- Send notification on PRIVMSG or mentions
 
 ;; Copyright (C) 2012 Free Software Foundation, Inc.
 
@@ -35,6 +35,7 @@
 
 (defgroup erc-notifications nil
   "Send notifications on PRIVMSG or mentions."
+  :version "24.3"
   :group 'erc)
 
 (defvar erc-notifications-last-notification nil
@@ -75,7 +76,7 @@ This will replace the last notification sent with this function."
                     (member nick erc-track-exclude)))
         (erc-notifications-notify nick msg)))))
 
-;;;###autoload(autoload 'erc-notifications-mode "erc-notifications" "" t)
+;;;###autoload(autoload 'erc-notifications-mode "erc-desktop-notifications" "" t)
 (define-erc-module notifications nil
   "Send notifications on private message reception and mentions."
   ;; Enable
@@ -85,6 +86,6 @@ This will replace the last notification sent with this function."
   ((remove-hook 'erc-server-PRIVMSG-functions 'erc-notifications-PRIVMSG)
    (remove-hook 'erc-text-matched-hook 'erc-notifications-notify-on-match)))
 
-(provide 'erc-notifications)
+(provide 'erc-desktop-notifications)
 
-;;; erc-notifications.el ends here
+;;; erc-desktop-notifications.el ends here
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index f40eaa8c549..5e5d6c2c188 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
+;; Maintainer: FSF
 ;; Keywords: comm
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index 2422ca10d0a..35e14eb0e29 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -4,6 +4,7 @@
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;;         Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcFilling
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 49820b78ff6..892f82e2eba 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2012  Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
+;; Maintainer: FSF
 
 ;; Most code is taken verbatim from erc.el, see there for the original
 ;; authors.
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index 1a713009c85..d1e74fd4c54 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2012  Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcIbuffer
 
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index aee808c0921..9586dd698a0 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: FSF
 ;; Keywords: comm, processes
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index 53dc9e7abf2..7346fca1b8a 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcImenu
 
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index ae7f90003a6..ac6b311a0c4 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: FSF
 ;; Keywords: irc
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoJoin
 
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index 11384a25885..2d7f555971e 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2002, 2004, 2006-2012  Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
-;; Maintainer: Alex Schroeder <alex@gnu.org>
+;; Maintainer: FSF
 ;; Version: 1.0.0
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcLang
 ;; Keywords: comm languages processes
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index f7d33ffbc28..19afe2e79ee 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
 ;; Author: Tom Tromey <tromey@redhat.com>
+;; Maintainer: FSF
 ;; Version: 0.1
 ;; Keywords: comm
 
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index eefe51ae706..b3f3f5865a1 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 ;; Author: Lawrence Mitchell <wence@gmx.li>
+;; Maintainer: FSF
 ;; Keywords: IRC, chat, client, Internet, logging
 
 ;; Created 2003-04-26
@@ -113,11 +114,13 @@ If you want to write logs into different directories, make a
 custom function which returns the directory part and set
 `erc-log-channels-directory' to its name."
   :group 'erc-log
-  :type '(choice (const :tag "Long style" erc-generate-log-file-name-long)
-                 (const :tag "Long, but with network name rather than server"
+  :type '(choice (const :tag "#channel!nick@server:port.txt"
+                        erc-generate-log-file-name-long)
+                 (const :tag "#channel!nick@network.txt"
                         erc-generate-log-file-name-network)
-                 (const :tag "Short" erc-generate-log-file-name-short)
-                 (const :tag "With date" erc-generate-log-file-name-with-date)
+                 (const :tag "#channel.txt" erc-generate-log-file-name-short)
+                 (const :tag "#channel@date.txt"
+                        erc-generate-log-file-name-with-date)
                  (function :tag "Other function")))
 
 (defcustom erc-truncate-buffer-on-save nil
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index de7f2137197..8dcdcb9e2e6 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
+;; Maintainer: FSF
 ;; Keywords: comm, faces
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcMatch
 
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index 5d96fc4d487..1aec2ad417f 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2002, 2004-2012  Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm, processes, menu
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 355b345492c..fc4aeb10c84 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index 9a3c562f0a6..89372555ccc 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 3bf82c13f19..0b5e99180d6 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index 51ddc33e1c0..8eae6c83d15 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -2,6 +2,8 @@
 
 ;; Copyright (C) 2002, 2004, 2006-2012 Free Software Foundation, Inc.
 
+;; Maintainer: FSF
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index d3cbe8a5804..bb30fd90066 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Sacha Chua <sacha@free.net.ph>
+;; Maintainer: FSF
 ;; Keywords: comm, convenience
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
 
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index 6c5804c62a4..3d4a5d311b1 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2001-2002, 2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
-;; Maintainer: Mario Lang (mlang@delysid.org)
+;; Maintainer: FSF
 ;; Keywords: IRC, client, Internet
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 94af8a09200..6b3f3e3c3aa 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
+;; Maintainer: FSF
 ;; Keywords: comm
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcHistory
 
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 5986d81efed..b3b80a5f851 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -2,6 +2,8 @@
 
 ;; Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc.
 
+;; Maintainer: FSF
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index 8b44cb5146c..55336a68cfe 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -2,6 +2,8 @@
 
 ;; Copyright (C) 2002-2003, 2006-2012 Free Software Foundation, Inc.
 
+;; Maintainer: FSF
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software: you can redistribute it and/or modify
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 1e028e22642..4b98cf173be 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -4,6 +4,7 @@
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Contributor: Eric M. Ludlam <eric@siege-engine.com>
+;; Maintainer: FSF
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 441e3536e19..5f40cc39e89 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
+;; Maintainer: FSF
 ;; Keywords: irc
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcSpelling
 
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 4ce2f18e041..4fa3f9f5915 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2004, 2006-2012  Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm, processes, timestamp
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcStamp
 
@@ -352,8 +353,9 @@ Return the empty string if FORMAT is nil."
                                'isearch-open-invisible 'timestamp ts)
         ;; N.B. Later use categories instead of this harmless, but
         ;; inelegant, hack. -- BPT
-        (when erc-timestamp-intangible
-          (erc-put-text-property 0 (length ts) 'intangible t ts))
+        (and erc-timestamp-intangible
+             (not erc-hide-timestamps)  ; bug#11706
+             (erc-put-text-property 0 (length ts) 'intangible t ts))
         ts)
     ""))
 
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 88a3285730d..a204584b400 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm, faces
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcChannelTracking
 
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index dd47c601ea8..8a219500ecb 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
+;; Maintainer: FSF
 ;; Keywords: IRC, chat, client, Internet, logging
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 0328c407aa0..85356b39033 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: FSF
 ;; Keywords: comm, processes
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index feef75940f3..bbd9dad4310 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -9,7 +9,7 @@
 ;;               Andreas Fuchs (afs@void.at)
 ;;               Gergely Nagy (algernon@midgard.debian.net)
 ;;               David Edmondson (dme@dme.org)
-;; Maintainer: Michael Olson (mwolson@gnu.org)
+;; Maintainer: FSF
 ;; Keywords: IRC, chat, client, Internet
 ;; Version: 5.3
 
@@ -102,6 +102,7 @@
 
 (defgroup erc-lurker nil
   "Hide specified message types sent by lurkers"
+  :version "24.3"
   :group 'erc-ignore)
 
 (defgroup erc-query nil
@@ -139,8 +140,8 @@
   (message (concat "ERC: The function `defvaralias' is not bound.  See the "
                    "NEWS file for variable name changes since ERC 5.0.4.")))
 
-(defalias 'erc-send-command 'erc-server-send)
-(erc-make-obsolete 'erc-send-command 'erc-server-send "ERC 5.1")
+(define-obsolete-function-alias 'erc-send-command
+  'erc-server-send "ERC 5.1")
 
 ;; tunable connection and authentication parameters