[Erc-commit] [commit][emacs22] Sync with 5.2 release branch

[mwolson]

commit 15137134246791069c725acc3be7ce2f359713d0
Author: Michael Olson <address@hidden>
Date:   Mon Sep 11 03:36:35 2006 +0000

    Sync with 5.2 release branch
    
     * Add copyright notices to the ChangeLog files, as in erc--emacs--22.
    
     * Add "2006" to all copyright years, since the new rules say that we
       have to include every year that we have a release, starting with 2006.
    git-archimport-id: address@hidden/erc--main--0--patch-52

diff --git a/ChangeLog b/ChangeLog
index da17a54..52b2316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -464,7 +464,9 @@
 
 2006-07-05  Michael Olson  <address@hidden>
 
-       * erc.el (erc-modules): Add the `page' module to the list.
+       * erc.el (erc-modules): Use `set' instead of `set-default', since
+       this setting should never be buffer-local.  Add the `list' and
+       `page' modules to the list.
 
        * erc.texi (Modules): Add entries for `list' and `page' modules.
        Change "spell" to "spelling".
@@ -753,6 +755,17 @@
 
        * erc-dcc.el: Use (eval-when-compile (require 'cl)).
 
+2006-02-12  Michael Olson  <address@hidden>
+
+       * erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el,
+       erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el,
+       erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el,
+       erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el,
+       erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el,
+       erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el,
+       erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el: Add
+       2006 to copyright years, to comply with the changed guidelines.
+
 2006-02-11  Michael Olson  <address@hidden>
 
        * erc.el (erc-update-modules): Handle erc-capab-identify
@@ -1305,8 +1318,13 @@
        * erc-track.el (erc-track-remove-from-mode-line): Handle case
        where global-mode-string is not a list.  Emacs22 permits this.
 
+
 See ChangeLog.05 for earlier changes.
 
+    Copyright (C) 2006 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.01 b/ChangeLog.01
index 3029e5e..5d6bdf8 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -1035,6 +1035,10 @@
 
        * erc-speak.el 1.1, erc.el 1.1: New file.
 
+    Copyright (C) 2001 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.02 b/ChangeLog.02
index 297681e..297b9d3 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -2596,6 +2596,10 @@
 
 See ChangeLog.01 for earlier changes.
 
+    Copyright (C) 2002 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.03 b/ChangeLog.03
index bc3b1b7..707ceb3 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -2140,6 +2140,10 @@
 
 See ChangeLog.02 for earlier changes.
 
+    Copyright (C) 2003 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.04 b/ChangeLog.04
index 82ee3f7..77cf045 100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@ -2069,6 +2069,10 @@
 
 See ChangeLog.03 for earlier changes.
 
+    Copyright (C) 2004 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/ChangeLog.05 b/ChangeLog.05
index 5a3f69d..b91395b 100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@ -1217,6 +1217,10 @@
 
 See ChangeLog.04 for earlier changes.
 
+    Copyright (C) 2005 Free Software Foundation, Inc.
+  Copying and distribution of this file, with or without modification,
+  are permitted provided the copyright notice and this notice are preserved.
+
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
diff --git a/erc-ezbounce.el b/erc-ezbounce.el
index ff9bbd9..d04fe78 100644
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@ -1,6 +1,6 @@
 ;;; erc-ezbounce.el ---  Handle EZBounce bouncer commands
 
-;; Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <address@hidden>
 ;; Keywords: comm
diff --git a/erc-fill.el b/erc-fill.el
index d318864..9552ce8 100644
--- a/erc-fill.el
+++ b/erc-fill.el
@@ -1,6 +1,6 @@
 ;;; erc-fill.el --- Filling IRC messages in various ways
 
-;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <address@hidden>
 ;;         Mario Lang <address@hidden>
diff --git a/erc-goodies.el b/erc-goodies.el
index c844af5..f6d32ee 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -1,6 +1,7 @@
 ;; erc-goodies.el --- Collection of ERC modules
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;;   Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <address@hidden>
 
diff --git a/erc-hecomplete.el b/erc-hecomplete.el
index 763d75c..85a8156 100644
--- a/erc-hecomplete.el
+++ b/erc-hecomplete.el
@@ -1,6 +1,6 @@
 ;;; erc-hecomplete.el --- Provides Nick name completion for ERC
 
-;; Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <address@hidden>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index 792a595..108ed71 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -1,6 +1,6 @@
 ;;; erc-ibuffer.el --- ibuffer integration with ERC
 
-;; Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <address@hidden>
 ;; Keywords: comm
diff --git a/erc-imenu.el b/erc-imenu.el
index bf2d5ef..e897a9d 100644
--- a/erc-imenu.el
+++ b/erc-imenu.el
@@ -1,6 +1,6 @@
 ;;; erc-imenu.el -- Imenu support for ERC
 
-;; Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <address@hidden>
 ;; Keywords: comm
diff --git a/erc-join.el b/erc-join.el
index 3da50a5..86b79c5 100644
--- a/erc-join.el
+++ b/erc-join.el
@@ -1,6 +1,6 @@
 ;;; erc-join.el --- autojoin channels on connect and reconnects
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <address@hidden>
 ;; Keywords: irc
diff --git a/erc-lang.el b/erc-lang.el
index 20c89a8..04cfbe9 100644
--- a/erc-lang.el
+++ b/erc-lang.el
@@ -1,6 +1,6 @@
 ;;; erc-lang.el --- provide the LANG command to ERC
 
-;; Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <address@hidden>
 ;; Maintainer: Alex Schroeder <address@hidden>
diff --git a/erc-list.el b/erc-list.el
index fe83967..38ea0ec 100644
--- a/erc-list.el
+++ b/erc-list.el
@@ -1,6 +1,6 @@
 ;;; erc-list.el --- Provide a faster channel listing mechanism
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 ;; Copyright (C) 2004 Brian Palmer
 
 ;; Author: Mario Lang <address@hidden>
diff --git a/erc-match.el b/erc-match.el
index 5cc8eca..db3e770 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -1,6 +1,6 @@
 ;;; erc-match.el --- Highlight messages matching certain regexps
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <address@hidden>
 ;; Keywords: comm, faces
diff --git a/erc-netsplit.el b/erc-netsplit.el
index 4e30df9..59dd489 100644
--- a/erc-netsplit.el
+++ b/erc-netsplit.el
@@ -1,6 +1,6 @@
 ;;; erc-netsplit.el --- Reduce JOIN/QUIT messages on netsplits
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <address@hidden>
 ;; Keywords: comm
diff --git a/erc-notify.el b/erc-notify.el
index 1c9fc99..f21090d 100644
--- a/erc-notify.el
+++ b/erc-notify.el
@@ -1,6 +1,6 @@
 ;;; erc-notify.el --- Online status change notification
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <address@hidden>
 ;; Keywords: comm
diff --git a/erc-page.el b/erc-page.el
index d8e6770..4c6b86b 100644
--- a/erc-page.el
+++ b/erc-page.el
@@ -1,6 +1,6 @@
 ;; erc-page.el - CTCP PAGE support for ERC
 
-;; Copyright (C) 2002, 2004 Free Software Foundation
+;; Copyright (C) 2002, 2004, 2006 Free Software Foundation
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-pcomplete.el b/erc-pcomplete.el
index 31de8a4..49b929d 100644
--- a/erc-pcomplete.el
+++ b/erc-pcomplete.el
@@ -1,6 +1,6 @@
 ;;; erc-pcomplete.el --- Provides programmable completion for ERC
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Sacha Chua <address@hidden>
 ;; Keywords: comm, convenience
diff --git a/erc-replace.el b/erc-replace.el
index 3e60d7a..7a22954 100644
--- a/erc-replace.el
+++ b/erc-replace.el
@@ -1,6 +1,6 @@
 ;; erc-replace.el -- wash and massage messages inserted into the buffer
 
-;; Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <address@hidden>
 ;; Maintainer: Mario Lang (address@hidden)
diff --git a/erc-ring.el b/erc-ring.el
index cabb8e2..87707e6 100644
--- a/erc-ring.el
+++ b/erc-ring.el
@@ -1,6 +1,6 @@
 ;; erc-ring.el -- Command history handling for erc using ring.el
 
-;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <address@hidden>
 ;; Keywords: comm
diff --git a/erc-services.el b/erc-services.el
index 6769487..c8bac7f 100644
--- a/erc-services.el
+++ b/erc-services.el
@@ -1,6 +1,6 @@
 ;;; erc-services.el --- Identify to NickServ
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/erc-speedbar.el b/erc-speedbar.el
index 2de2c57..7bc8546 100644
--- a/erc-speedbar.el
+++ b/erc-speedbar.el
@@ -1,6 +1,6 @@
 ;;; erc-speedbar.el --- Speedbar support for ERC
 
-;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <address@hidden>
 ;; Contributor: Eric M. Ludlam <address@hidden>
diff --git a/erc-spelling.el b/erc-spelling.el
index a7a8535..612675f 100644
--- a/erc-spelling.el
+++ b/erc-spelling.el
@@ -1,6 +1,6 @@
 ;;; erc-spelling.el --- use flyspell in ERC
 
-;; Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <address@hidden>
 ;; Keywords: irc
diff --git a/erc-track.el b/erc-track.el
index 209d54a..3c8f93a 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -1,6 +1,6 @@
 ;;; erc-track.el --- Track modified channel buffers
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <address@hidden>
 ;; Keywords: comm, faces
diff --git a/erc-truncate.el b/erc-truncate.el
index 49cd20d..7a1feaa 100644
--- a/erc-truncate.el
+++ b/erc-truncate.el
@@ -1,6 +1,6 @@
 ;;; erc-truncate.el --- Functions for truncating ERC buffers
 
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <address@hidden>
 ;; Keywords: IRC, chat, client, Internet, logging
diff --git a/erc-xdcc.el b/erc-xdcc.el
index 84562e7..d00dfc5 100644
--- a/erc-xdcc.el
+++ b/erc-xdcc.el
@@ -1,6 +1,6 @@
 ;;; erc-xdcc.el --- XDCC file-server support for ERC
 
-;; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <address@hidden>
 ;; Keywords: comm, processes
diff --git a/erc.el b/erc.el
index bfafba3..0297dd7 100644
--- a/erc.el
+++ b/erc.el
@@ -1807,6 +1807,9 @@ removed from the list will be disabled."
      :tag
      "Mark unidentified users on freenode and other servers supporting CAPAB"
      capab-identify)
+    (const :tag "Complete nicknames and commands (programmable)"
+          completion)
+    (const :tag "Complete nicknames and commands (old)" hecomplete)
     (const :tag "Wrap long lines" fill)
     (const :tag "Launch an identd server on port 8113" identd)
     (const :tag "Highlight or remove IRC control characters"
@@ -1817,12 +1820,8 @@ removed from the list will be disabled."
     (const :tag "Detect netsplits" netsplit)
     (const :tag "Don't display non-IRC commands after evaluation"
           noncommands)
-    (const :tag
-          "Notify when the online status of certain users changes"
+    (const :tag "Notify when the online status of certain users changes"
           notify)
-    (const :tag "Complete nicknames and commands (programmable)"
-          completion)
-    (const :tag "Complete nicknames and commands (old)" hecomplete)
     (const :tag "Process CTCP PAGE requests from IRC" page)
     (const :tag "Make displayed lines read-only" readonly)
     (const :tag "Replace text in messages" replace)