1 files changed, 30 insertions, 0 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index c77b091bdb4..9646318e758 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,8 +1,38 @@
+2006-02-05  Michael Olson  <mwolson@gnu.org>
+
+        * erc-spelling.el (erc-spelling-init): If
+        `erc-spelling-dictionaries' is nil, do not set
+        ispell-local-dictionary.  Before, it was being set to nil, which
+        was causing a long delay while the ispell process restarted.
+        (erc-spelling-unhighlight-word): New function that removes
+        flyspell properties from a spell-checked word.
+        (erc-spelling-flyspell-verify): Don't spell-check nicks or words
+        that have '/' before them.
+
+2006-02-04  Michael Olson  <mwolson@gnu.org>
+
+        * erc-autojoin.el: Use (eval-when-compile (require 'cl)).
+
+        * erc-complete.el (erc-nick-completion-exclude-myself)
+        (erc-try-complete-nick): Use better function for getting list of
+        channel users.
+
+        * erc-goodies.el: Docfix.
+
+        * erc-stamp.el: Use new arch tagline, since the other one wasn't
+        being treated properly.
+
+        * erc.el (erc-version-string): Release ERC 5.1.1
+
 2006-02-03  Zhang Wei  <id.brep@gmail.com>  (tiny change)
 
         * erc.el (erc-version-string): Don't hard-code Emacs version.
         (erc-version): Use emacs-version.
 
+2006-01-31  Michael Olson  <mwolson@gnu.org>
+
+        * erc-stamp.el: Update copyright years.
+
 2006-01-30  Simon Josefsson  <jas@extundo.com>
 
         * erc.el (erc-open-ssl-stream): Use tls.el.