Anonymous avatar Anonymous committed ca3b15d

[PATCH] packages: Sync erc up to Version 5.1.1 Revision: 1.796.2.3 <8xs8ry5j.fsf@smtprelay.t-online.de>;

Comments (0)

Files changed (54)

-The following people contributed to Emacs IRC Client development:
+The following people contributed to ERC development:
 
 Alexander L. Belikoff <abel@bfr.co.il>:
   * Original author.
 Luigi Panzeri (matley AT muppetslab DOT org):
   * Provided an erc-nickserv-alist entry for Azzurra.
 
+Simon Josefsson  (jas AT extundo DOT com):
+  * Changed erc.el to use tls.el instead of ssl.el.
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
+2006-02-19  Adrian Aichner  <adrian@xemacs.org>
+
+	* Full sync with upstream Version 5.1.1 $Revision: 1.796.2.3
+	(current state of release_5_1_branch).
+	* CREDITS:
+	* ChangeLog.2001.upstream:
+	* ChangeLog.2002.upstream:
+	* ChangeLog.2003.upstream:
+	* ChangeLog.2004.upstream:
+	* ChangeLog.upstream:
+	* FOR-RELEASE.upstream:
+	* HISTORY:
+	* Makefile:
+	* Makefile (AUTHOR_VERSION): Update to Version 5.1.1 $Revision:
+	1.796.2.3
+	* Makefile.upstream:
+	* NEWS:
+	* README:
+	* erc-auto.in (generate-autoloads): Removed.
+	* erc-auto.in (erc-generate-autoloads): New.
+	* erc-autoaway.el:
+	* erc-autoaway.el (erc-autoaway-version):
+	* erc-autoaway.el (erc-autoaway-possibly-set-away):
+	* erc-autoaway.el (erc-autoaway-set-away):
+	* erc-autojoin.el:
+	* erc-autojoin.el (require):
+	* erc-autojoin.el (erc-autojoin-version):
+	* erc-backend.el:
+	* erc-backend.el (erc-compat):
+	* erc-backend.el (erc-backend-version):
+	* erc-backend.el (erc-server-version): New.
+	* erc-backend.el (erc-server-process-alive): New.
+	* erc-backend.el (erc-process-sentinel-1):
+	* erc-backend.el (erc-process-sentinel):
+	* erc-backend.el (erc-decode-string-from-target):
+	* erc-backend.el (erc-server-send):
+	* erc-backend.el (erc-server-send-queue):
+	* erc-backend.el (erc-decode-parsed-server-response):
+	* erc-backend.el (define-erc-response-handler):
+	* erc-backend.el (004):
+	* erc-bbdb.el:
+	* erc-bbdb.el (erc-bbdb-version):
+	* erc-bbdb.el (erc-bbdb-elide-display):
+	* erc-bbdb.el (erc-bbdb-whois):
+	* erc-button.el:
+	* erc-button.el (erc-fill):
+	* erc-button.el (erc-button-version):
+	* erc-button.el (erc-button): New.
+	* erc-button.el (erc-button-nickname-face): New.
+	* erc-button.el (erc-button-url-regexp):
+	* erc-button.el (erc-button-alist):
+	* erc-button.el (erc-button-add-nickname-buttons):
+	* erc-button.el (erc-button-add-buttons-1):
+	* erc-button.el (erc-button-add-button):
+	* erc-button.el (erc-button-describe-symbol): New.
+	* erc-button.el (erc-button-beats-to-time): New.
+	* erc-chess.el:
+	* erc-chess.el (erc-chess-version):
+	* erc-compat.el:
+	* erc-compat.el (erc-compat-version):
+	* erc-compat.el (not):
+	* erc-compat.el (erc-emacs-build-time): New.
+	* erc-compat.el (erc-const-expr-p): New.
+	* erc-compat.el (erc-list*): New.
+	* erc-compat.el (erc-assert): New.
+	* erc-compat.el (erc-member-if): New.
+	* erc-compat.el (erc-delete-if): New.
+	* erc-compat.el (erc-remove-if-not): New.
+	* erc-compat.el (*erc-sym-counter*): New.
+	* erc-compat.el (erc-gensym): New.
+	* erc-compat.el (erc-subseq): New.
+	* erc-complete.el:
+	* erc-complete.el (erc-complete-version):
+	* erc-complete.el (erc-nick-completion-exclude-myself):
+	* erc-complete.el (erc-try-complete-nick):
+	* erc-dcc.el:
+	* erc-dcc.el (require):
+	* erc-dcc.el (erc-dcc-version):
+	* erc-dcc.el (erc-unpack-int):
+	* erc-dcc.el (pcomplete/erc-mode/DCC):
+	* erc-dcc.el (erc-dcc-send-filter):
+	* erc-dcc.el (erc-dcc-get-filter):
+	* erc-dcc.el (erc-dcc-chat-parse-output):
+	* erc-ezbounce.el:
+	* erc-ezbounce.el (require):
+	* erc-ezbounce.el (erc-ezb-version):
+	* erc-fill.el:
+	* erc-fill.el (erc-fill-version):
+	* erc-fill.el (erc-fill-static):
+	* erc-fill.el (erc-restore-text-properties):
+	* erc-goodies.el:
+	* erc-ibuffer.el:
+	* erc-ibuffer.el (ibuf-ext):
+	* erc-ibuffer.el (erc-ibuffer-version):
+	* erc-ibuffer.el (erc-ibuffer-dangerous-host-char):
+	* erc-ibuffer.el (erc-server): New.
+	* erc-ibuffer.el (erc-modified): New.
+	* erc-ibuffer.el (erc-server-name): New.
+	* erc-ibuffer.el (erc-target): New.
+	* erc-ibuffer.el (erc-topic): New.
+	* erc-ibuffer.el (erc-members):
+	* erc-ibuffer.el (erc-away): New.
+	* erc-ibuffer.el (erc-op):
+	* erc-ibuffer.el (erc-voice): New.
+	* erc-ibuffer.el (erc-channel-modes): New.
+	* erc-ibuffer.el (erc-nick): New.
+	* erc-ibuffer.el (erc-ibuffer-formats):
+	* erc-identd.el:
+	* erc-identd.el (erc-identd-start):
+	* erc-imenu.el:
+	* erc-imenu.el (erc-imenu-version):
+	* erc-lang.el:
+	* erc-list.el:
+	* erc-list.el (require):
+	* erc-list.el (erc-list-version):
+	* erc-log.el:
+	* erc-log.el (require):
+	* erc-log.el (erc-log-version):
+	* erc-log.el (erc-log-setup-logging):
+	* erc-match.el:
+	* erc-match.el (require):
+	* erc-match.el (erc-match-version):
+	* erc-match.el (match):
+	* erc-match.el (erc-log-matches):
+	* erc-menu.el:
+	* erc-menu.el (erc-menu-version):
+	* erc-nets.el:
+	* erc-nets.el (require):
+	* erc-nets.el (erc-nets-version):
+	* erc-nets.el (erc-server-select):
+	* erc-netsplit.el:
+	* erc-netsplit.el (require):
+	* erc-netsplit.el (erc-netsplit-version):
+	* erc-nicklist.el:
+	* erc-nicklist.el (require):
+	* erc-nicklist.el (erc-nicklist-version):
+	* erc-nicklist.el (erc-nicklist-buffer-name):
+	* erc-nicklist.el (erc-nicklist-bitlbee-connected-p): Removed.
+	* erc-nicklist.el (erc-nicklist-insert-medium-name-or-icon):
+	* erc-nicklist.el (erc-nicklist-search-for-nick):
+	* erc-nicklist.el (erc-nicklist-insert-contents):
+	* erc-nicklist.el (erc-nicklist-menu):
+	* erc-nicklist.el (erc-nicklist-channel-users-info):
+	* erc-nickserv.el:
+	* erc-nickserv.el (require):
+	* erc-nickserv.el (erc-nickserv-version):
+	* erc-notify.el:
+	* erc-notify.el (require):
+	* erc-notify.el (erc-notify-QUIT):
+	* erc-page.el:
+	* erc-pcomplete.el:
+	* erc-pcomplete.el (require):
+	* erc-pcomplete.el (erc-pcomplete-version):
+	* erc-pcomplete.el (pcomplete-parse-erc-arguments):
+	* erc-replace.el:
+	* erc-replace.el (erc-replace-version):
+	* erc-ring.el:
+	* erc-ring.el (erc-ring-version):
+	* erc-ring.el (erc-previous-command):
+	* erc-sound.el:
+	* erc-speak.el:
+	* erc-speak.el (erc-speak-filter-timestamp):
+	* erc-speak.el (erc-speak-acronym-replace):
+	* erc-speak.el (erc-speak-smiley-replace):
+	* erc-speak.el (erc-speak-region):
+	* erc-speedbar.el:
+	* erc-speedbar.el (require):
+	* erc-speedbar.el (erc-speedbar-version):
+	* erc-speedbar.el (erc-speedbar-buttons):
+	* erc-speedbar.el (erc-speedbar-expand-channel):
+	* erc-speedbar.el (erc-speedbar-goto-buffer):
+	* erc-spelling.el:
+	* erc-spelling.el (erc-spelling-version):
+	* erc-spelling.el (spelling):
+	* erc-spelling.el (erc-spelling-dictionaries):
+	* erc-spelling.el (erc-spelling-init):
+	* erc-spelling.el (erc-spelling-unhighlight-word): New.
+	* erc-spelling.el (erc-spelling-flyspell-verify):
+	* erc-stamp.el:
+	* erc-stamp.el (erc-stamp-version):
+	* erc-stamp.el (erc-timestamp-last-inserted):
+	* erc-stamp.el (erc-insert-timestamp-left): Removed.
+	* erc-stamp.el (erc-timestamp-use-align-to): New.
+	* erc-stamp.el (erc-insert-aligned): New.
+	* erc-stamp.el (erc-insert-timestamp-right):
+	* erc-track.el:
+	* erc-track.el (require):
+	* erc-track.el (erc-track-version):
+	* erc-track.el (erc-track-use-faces):
+	* erc-track.el (erc-track-faces-priority-list):
+	* erc-track.el (erc-track-priority-faces-only):
+	* erc-track.el (erc-track-showcount): New.
+	* erc-track.el (erc-track-showcount-string): New.
+	* erc-track.el (erc-track-switch-from-erc): New.
+	* erc-track.el (erc-track-switch-direction): New.
+	* erc-track.el (erc-track-remove-from-mode-line):
+	* erc-track.el (and):
+	* erc-track.el (erc-track-modified-channels):
+	* erc-track.el (let):
+	* erc-track.el (erc-find-parsed-property):
+	* erc-track.el (erc-track-last-non-erc-buffer):
+	* erc-track.el (erc-track-sort-by-activest):
+	* erc-track.el (erc-track-get-active-buffer):
+	* erc-track.el (erc-track-switch-buffer):
+	* erc-truncate.el:
+	* erc-truncate.el (erc-max-buffer-size):
+	* erc-viper.el:
+	* erc-viper.el (assoc):
+	* erc-xdcc.el:
+	* erc.el:
+	* erc.el (erc-version-string):
+	* erc.el (require):
+	* erc.el (fboundp):
+	* erc.el (erc-remove-channel-users):
+	* erc.el (erc-get-server-nickname-list):
+	* erc.el (erc-get-server-nickname-alist):
+	* erc.el (erc-input-marker): New.
+	* erc.el (erc-flood-protect):
+	* erc.el (erc-mode-map):
+	* erc.el (erc-once-with-server-event):
+	* erc.el (erc-once-with-server-event-global):
+	* erc.el (erc-with-buffer):
+	* erc.el (erc-with-all-buffers-of-server):
+	* erc.el (erc-iswitchb):
+	* erc.el (erc-modules):
+	* erc.el (erc-update-modules):
+	* erc.el (erc):
+	* erc.el (erc-already-logged-in):
+	* erc.el (erc-get-arglist):
+	* erc.el (erc-cmd-SAY):
+	* erc.el (erc-cmd-QUIT):
+	* erc.el (erc-cmd-GQUIT):
+	* erc.el (erc-display-prompt):
+	* erc.el (erc-bol):
+	* erc.el (erc-banlist-update):
+	* erc.el (erc-group-list):
+	* erc.el (erc-user-input):
+	* erc.el (erc-command-symbol): New.
+	* erc.el (erc-toggle-flood-control):
+	* erc.el (erc-update-mode-line-buffer):
+	* erc.el (erc-format-message):
+	* erc.el (erc-kill-server):
+	* erc.el (erc-process-alive): Removed.
+	* erc.el (erc-kill-channel):
+
 2005-10-21  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 0.19 released.

ChangeLog.2001.upstream

 	* erc-speak.el 1.1.1.1, erc.el 1.1.1.1: Initial Import
 
 	* erc-speak.el 1.1, erc.el 1.1: New file.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;; arch-tag: 306c4b58-f9ae-4f3d-9fd9-db2d743f05a6

ChangeLog.2002.upstream

 	* This module allows a way of buttonizing text in IRC buffers.
 	  Default it is used for URLs, but other things could be added.
 	  see if you can find another use, erc-button-alist
+
+See ChangeLog.2001 for earlier changes.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;; arch-tag: a6779d5e-99fa-442b-98cf-90e73eb2c272

ChangeLog.2003.upstream

 	log file to a query from "User". Avoided adding an extra flag to control this
 	behavior - if you think this was the wrong decision, please correct it and
 	I'll remember it for next time.
+
+See ChangeLog.2002 for earlier changes.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;; arch-tag: 808865e1-3cce-4c5b-9997-95a8b7a9d384

ChangeLog.2004.upstream

 
 	* erc-stamp.el: Added local variables for file.
 	(erc-away-timestamp-format): Allow nil as a choice in `:type'.
-	(erc-timestamp-intangible):Changed `:type' to boolean.
+	(erc-timestamp-intangible): Changed `:type' to boolean.
 	(erc-timestamp-right-column): Added `:group' and `:type'.
 
 2004-04-28  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-network-name): Function definition moved to
 	erc-nets.el.  The functions `erc-determine-network' and
-	`rc-network' in erc-nets.el do what this did before.  Deprecated.
+	`erc-network' in erc-nets.el do what this did before.  Deprecated.
 	Use (erc-network) instead.
 
 2004-03-08  Diane Murray <disumu@x3y2z1.net>
 	(erc-networks): Removed.  Use `erc-networks-alist' as defined in
 	erc-nets.el.
 	(erc-current-network): Function definition moved to erc-nets.el.
-	The functions `erc-determine-network' and `rc-network' in
+	The functions `erc-determine-network' and `erc-network' in
 	erc-nets.el do what this did before.  Deprecated.  Use
 	(erc-network) instead.
 
 
 2004-01-20  Lawrence Mitchell <wence@gmx.li>
 
-	* erc.el: From Johan Bockgrd <bojohan+news@dd.chalmers.se>:
+	* erc.el: From Johan Bockgård <bojohan+news@dd.chalmers.se>:
 	(erc-update-undo-list): New function.  Update `buffer-undo-list'
 	so that calling `undo' in an ERC buffer doesn't mess up the
 	existing text.
 2004-01-02  Francis Litterio <franl@users.sourceforge.net>
 
 	* erc-list.el: Added variable erc-chanlist-mode-hook.
+
+See ChangeLog.2003 for earlier changes.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1

ChangeLog.upstream

-2005-10-20  Diane Murray  <disumu@x3y2z1.net>
+2006-02-15  Michael Olson  <mwolson@gnu.org>
 
-	* erc-match.el (erc-current-nick-highlight-type): Set to `keyword'
-	as default.
-	(erc-beep-match-types): New variable.
-	(erc-text-matched-hook): Doc fix.  Added `erc-beep-on-match' to
-	customization options.
-	(erc-beep-on-match): New function.  If the MATCH-TYPE is found in
-	`erc-beep-match-types', beep.
+	* erc.el (erc): Move to the end of the buffer when a continued
+	session is detected.  Thanks to e1f and indio for the report and
+	testing a potential fix.
 
-	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
-	New functions to deal with the difference in the number of
-	arguments accepted by `make-obsolete' and `make-obsolete-variable'
-	in Emacs and XEmacs.
-	
-	* erc.el, erc-nets.el: Use `erc-make-obsolete' and
-	`erc-make-obsolete-variable'.
+2006-02-14  Michael Olson  <mwolson@gnu.org>
 
-	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
-	Handle `wrong-number-of-arguments' error instead of checking for
-	xemacs feature as future versions of XEmacs might accept three
-	arguments.
+	* debian/changelog: Prepare a new Debian package.
 
-2005-10-18  Edward O'Connor  <ted@oconnor.cx>
-	
-	* erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module
-	docstrings.
-	
-2005-10-08  Diane Murray  <disumu@x3y2z1.net>
+	* Makefile (debprepare): New rule that creates an ERC snapshot
+	directory for use in both new Debian releases and revisions for
+	Debian packages.
+	(debrelease, debrevision-mwolson): Use debprepare.
 
-	* AUTHORS, CREDITS, ChangeLog, ChangeLog.2002, ChangeLog.2004:
-	Updated my email address.
+	* NEWS: Bring up-to-date.
 
-2005-10-06  Michael Olson  <mwolson@gnu.org>
+	* erc-stamp.el (erc-insert-timestamp-right): For now, put
+	timestamps before rather than after erc-fill-column when
+	erc-timestamp-right-column is nil.  This way we won't surprise
+	anyone unpleasantly, or so it is hoped.
 
-	* erc.el (erc-send-input-line, erc-cmd-KICK, erc-cmd-PART)
-	(erc-cmd-QUIT, erc-cmd-TOPIC, erc-kill-server, erc-kill-channel):
-	Adapt to new TARGET parameter of erc-server-send.
+2006-02-13  Michael Olson  <mwolson@gnu.org>
 
-	* erc-backend.el (erc-server-connect): Don't specify encoding for
-	erc-server-process, since we set this each time we send a line to
-	the server.
-	(erc-encode-string-for-target): Remove.
-	(erc-server-send): Allow TARGET to be specified.  This was how it
-	used to be before my more-backend work.  Set encoding of server
-	process just before sending text to it.  Associate encoding with
-	text if we are using the queue.
-	(erc-server-send-queue): Pull encoding from queue.
-	(erc-message, erc-send-ctcp-message, erc-send-ctcp-notice): Adapt
-	to new TARGET parameter of erc-server-send.
+	* erc-dcc.el: Use (eval-when-compile (require 'cl)).
 
-2005-10-05  Michael Olson  <mwolson@gnu.org>
+2006-02-11  Michael Olson  <mwolson@gnu.org>
 
-	* erc.el (erc-toggle-debug-irc-protocol): Use erc-view-mode-enter
-	rather than view-mode.
+	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
+	`erc-timestamp-right-align-by-pixel'.  Set the default based on
+	whether we are in Emacs 22, and using X.  Improve documentation.
+	(erc-insert-aligned): Remove calculation of offset, since
+	:align-to pos works after all.  Unlike the previous solution, this
+	one works when erc-stamp.el is compiled.
+	(erc-insert-timestamp-right): Don't add length of string, and then
+	later remove its displayed width.  This puts timestamps after
+	erc-fill-column when erc-timestamp-right-column is nil, rather
+	than before it.  It also fixes a subtle bug.  Remove use of
+	`current-window', since there is no variable by that name in
+	Emacs21, Emacs22, or XEmacs21 beta.  Check to see whether
+	`erc-fill-column' is non-nil before using it.
 
-	* erc-backend.el (erc-encode-string-for-target): If given a nil or
-	empty string, return "".
-	(erc-server-send-queue): XEmacs fix: Use erc-cancel-timer rather
-	than cancel-timer.
+2006-02-11  Diane Murray  <disumu@x3y2z1.net>
 
-	* erc-compat.el (erc-view-mode-enter): New function that is
-	aliased to the correct way of entering view-mode.
+	* erc-spelling.el (define-erc-module): Make sure there's a buffer
+	before calling `with-current-buffer'.
 
-	* erc-match.el (erc-log-matches-make-buffer): Use
-	erc-view-mode-enter rather than view-mode-enter.
+2006-02-10  Michael Olson  <mwolson@gnu.org>
 
-2005-10-05  Edward O'Connor  <ted@oconnor.cx>
+	* Makefile (debbuild): Split from debrelease.
+	(debrevision-mwolson): New rule that causes a Debian revision to
+	be built.
 
-	* erc-backend.el (erc-encode-string-for-target): If str is nil,
-	pass the empty string to erc-encode-coding-string instead, which
-	allows one to /part and /quit without providing a reason again.
+2006-02-08  Diane Murray  <disumu@x3y2z1.net>
 
-2005-10-03  Michael Olson  <mwolson@gnu.org>
+	* erc.el (erc-version-string): Remove "(CVS)".
+	(erc-open-ssl-stream): Go back to using ssl.el so that SSL
+	connections work as expected.  Connecting with `open-tls-stream'
+	only seems to work (if at all?) when using the tls.el located in
+	lisp/net/ in Emacs22.
 
-	* erc-backend.el (erc-message, erc-send-ctcp-message)
-	(erc-send-ctcp-notice): Encode string for target before sending.
+	* NEWS: Added tls.el -> ssl.el change.
 
-	* erc.el (erc-cmd-KICK, erc-cmd-PART, erc-cmd-QUIT, erc-cmd-TOPIC)
-	(erc-kill-server, erc-kill-channel): Ditto.
+2006-02-07  Michael Olson  <mwolson@gnu.org>
 
-2005-09-05  Johan Bockg�rd  <bojohan@users.sourceforge.net>
+	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
+	the simpler `indent-to' function when
+	`erc-timestamp-right-align-by-pixel' is nil.
+	(erc-insert-timestamp-right): If the timestamp goes on the
+	following line, don't add timestamp properties to the spaces in
+	front of it.
 
-	* erc-page.el (erc-ctcp-query-PAGE): (message text) -> (message
-	"%s" text).
-	(erc-cmd-PAGE): Simplify regexp. Put `do-not-parse-args' t.
+2006-02-05  Michael Olson  <mwolson@gnu.org>
 
-2005-09-05  Michael Olson  <mwolson@gnu.org>
+	* Makefile (debrelease): Remove images/.arch-ids or images/CVS
+	directory correctly.
 
-	* erc.el (erc-flood-limit, erc-flood-limit2): Remove since they
-	are no longer needed.
-	(erc-send-input): Detect whether we want flood control to be
-	active.  The previous behavior was to always force the message.
-	(erc-toggle-flood-control): Adapt to new flood control method.  No
-	more 'strict.
-	(erc-cmd-SV): Use concat rather than
-	format-time-string.
-	(erc-format-target, erc-format-target-and/or-server): Shorten
-	logic statements.
+	* debian/changelog: Update for 5.1.1 release.
 
-	* erc-compat.el (erc-emacs-build-time): Use a string
-	representation rather than trying to coerce a time out of a string
-	on XEmacs.
+	* debian/control (Suggests): Suggest emacs-chess instead of
+	Recommending it.  Thanks to Era Eriksson for the report.
 
-	* erc-identd.el (erc-identd-start): Use make-network-process
-	instead of open-network-stream.  Error out if this is not defined.
+	* debian/maint/postinst: Install the Info documentation.
 
-	* erc-backend.el (erc-send-line): New command that sends a line
-	using flood control, using a callback for display.  It isn't used
-	yet.
+	* debian/maint/prerm: Handle removing of Info documentation.
 
-2005-09-04  Michael Olson  <mwolson@gnu.org>
+	* debian/rules (configure, configure-stamp, build, build-stamp):
+	Generate HTML and Info documentation.
+	(binary-erc): Install HTML and Info documentation.
 
-	* erc.el: Add defvaralias and make-obsolete-variable for
-	erc-default-coding-system.
-	(channel-topic, channel-modes, channel-user-limit, channel-key,
-	invitation, away, channel-list, bad-nick): Rename globally to
-	erc-{name-of-variable}.
+	* 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.
 
-2005-09-03  Johan Bockg�rd  <bojohan@users.sourceforge.net>
+2006-02-04  Michael Olson  <mwolson@gnu.org>
 
-	* erc.el (erc-message): Simplify regexp.
-	(erc-cmd-DEOP, erc-cmd-OP): Simplify.
+	* Makefile (VERSION): Update to 5.1.1.
 
-2005-08-29  Michael Olson  <mwolson@gnu.org>
+	* NEWS: Update for ERC 5.1.1.  Use the same wording for headings
+	that Emacs does in its NEWS file.
 
-	* erc.el: Alias erc-send-command to erc-server-send.  ErBot needs
-	this to work without modification.  Add defvaralias for
-	erc-process.  Make this and the other backwards-compatibility
-	functions and variables be marked obsolete as of ERC 5.1.
+	* erc-autojoin.el: Use (eval-when-compile (require 'cl)).
 
-	* erc-backend.el: Add autoload for erc-log macro.
-	(erc-server-connect): Set some variables before defining process
-	handlers.  It probably doesn't make any difference.
+	* erc-complete.el (erc-nick-completion-exclude-myself)
+	(erc-try-complete-nick): Use better function for getting list of
+	channel users.
 
-2005-08-26  Michael Olson  <mwolson@gnu.org>
+	* erc-goodies.el: Docfix.
 
-	* erc.el: Add defvaralias for erc-announced-server-name, since
-	this seems to be widely used.
+	* erc-stamp.el: Use new arch tagline, since the other one wasn't
+	being treated properly.
 
-2005-08-17  Michael Olson  <mwolson@gnu.org>
+	* erc.texi (History): Note that ERC is now included with Emacs.
 
-	* erc.el (erc): Remove unnecessary boundp check.
+	* erc.el (erc-version-string): Release ERC 5.1.1
 
-	* erc-autoaway.el: Fix compiler warning.
+2006-01-31  Michael Olson  <mwolson@gnu.org>
 
-	* erc-backend.el (erc-server-version): Since this isn't used by
-	any code, and isn't generally useful, remove it.
-	(erc-server-send-queue): Use erc-current-time rather than
-	float-time.
-	(004): Don't set erc-server-version.
+	* erc-stamp.el: Update copyright years.
 
-	* erc-dcc.el (erc-dcc-chat-request, erc-dcc-get-parent): Move to
-	fix a compiler warning.
+2006-01-30  Simon Josefsson  <jas@extundo.com>
 
-	* erc-ibuffer.el (erc-server): Remove unnecessary boundp check.
+	* erc.el (erc-open-ssl-stream): Use tls.el.
 
-	* erc-identd.el (erc-identd-start): Use read-string instead of
-	read-input.
+2006-01-30  Michael Olson  <mwolson@gnu.org>
 
-	* erc-imenu.el (erc-unfill-notice): Use a while loop instead of
-	replace-regexp.
+	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
+	that determines whether to use pixel values to align right
+	timestamps.  The default is not to do so, since it only works with
+	Emacs22 on X, and even then some people have trouble.
+	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
 
-	* erc-nicklist.el: Add conditional dependency on erc-bbdb.
-	(erc-nicklist-insert-contents): Tighten some regexps.
+2006-01-29  Edward O'Connor  <ted@oconnor.cx>
 
-	* erc-notify.el (erc-notify-list): Docfix.
+	* erc-viper.el: Ensure we only alter Viper's configuration when
+	necessary, as Viper may already take ERC into account.
 
-	* erc-spelling.el (erc-spelling-dictionaries): Add :type and
-	:group to silence a compiler warning.
+2006-01-29  Michael Olson  <mwolson@gnu.org>
 
-2005-08-14  Michael Olson  <mwolson@gnu.org>
+	* ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003,
+	ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for
+	earlier changes.  Use utf-8 encoding.  Fix some accent typos.
 
-	* erc-backend.el (erc-session-server, erc-session-port)
-	(erc-announced-server-name, erc-server-version)
-	(erc-server-parameters): Moved here from erc.el.
-	(erc-server-last-peers): Moved, renamed from last-peers.
-	(erc-server-lag): Moved, renamed from erc-lag.
-	(erc-server-duplicates): Moved, renamed from erc-duplicates.
-	(erc-server-duplicate-timeout): Moved, renamed from
-	erc-duplicate-timeout.
-	(erc-server): New customization group hosting all options from
-	this file.
-	(erc-server-prevent-duplicates): Moved, renamed from
-	erc-prevent-duplicates.
-	(erc-server-duplicate-timeout): Moved, renamed from
-	erc-duplicate-timeout.
-	(erc-server-auto-reconnect, erc-split-line-length)
-	(erc-server-coding-system, erc-encoding-coding-alist)
-	(erc-server-connect-function, erc-server-flood-margin)
-	(erc-server-flood-penalty): Change group to 'erc-server.
-	(erc-server-send-ping-interval): Moved, renamed from
-	erc-ping-interval.
-	(erc-server-ping-handler): Moved, renamed from erc-ping-handler.
-	(erc-server-setup-periodical-server-ping): Moved, renamed from
-	erc-setup-periodical-server-ping.
-	(erc-server-connect): Add to docstring.  Move more initialization
-	here.
-	(erc-server-processing-p): Docfix.
-	(erc-server-connect): Use 'raw-text like in the original version.
-	(erc-server-filter-function): Don't reset process coding system.
+	* erc-speedbar.el (erc-speedbar-buttons): Fix reference to free
+	variable.
+	(erc-speedbar-goto-buffer): Fix compiler warning.
 
-	* erc-stamp.el (erc-add-timestamp): If the text at point is
-	invisible, don't insert a timestamp.  Thanks to Pascal
-	J. Bourguignon for the suggestion.
+	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
+	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
+	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
+	work without compiler warnings.
 
-	* erc-match.el (erc-text-matched-hook): Don't hide fools by
-	default, but include it in the available options.
+	* man/erc.texi (Obtaining ERC, Installation): Note that these
+	sections may be skipped if using the version of ERC that comes
+	with Emacs.
 
-2005-08-13  Michael Olson  <mwolson@gnu.org>
+2006-01-28  Michael Olson  <mwolson@gnu.org>
 
-	* erc-*.el: s/erc-send-command/erc-server-send/g.
-	s/erc-process/erc-server-process/g (sort of).  Occasional
-	whitespace and indentation fixes.
+	* erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs
+	guidelines.
 
-	* erc-backend.el: Specify a few local variables for indentation.
-	Take one item off of the TODO list.
-	(erc-server-filter-data): Renamed from erc-previous-read.  From
-	circe.
-	(erc-server-processing-p): New variable that indicates when we're
-	currently processing a message.  From circe.
-	(erc-split-line-length): New option that gives the maximum line
-	length of a single message.  From circe.
-	(erc-default-coding-system): Moved here from erc.el.
-	(erc-split-line): Renamed from erc-split-command and taken from
-	circe.
-	(erc-connect-function, erc-connect, erc-process-sentinel-1)
-	(erc-process-sentinel, erc-flood-exceeded-p, erc-send-command)
-	(erc-message, erc-upcase-first-word, erc-send-ctcp-message)
-	(erc-send-ctcp-notice): Moved here from erc.el.
-	(erc-server-filter-function): Renamed from erc-process-filter.
-	From circe.
-	(erc-server-process): Renamed from `erc-process' and moved here
-	from erc.el.
-	(erc-server-coding-system): Renamed from
-	`erc-default-coding-system'.
-	(erc-encoding-coding-alist): Moved here from erc.el.
-	(erc-server-flood-margin, erc-server-flood-penalty):
-	(erc-server-flood-last-message, erc-server-flood-queue):
-	(erc-server-flood-timer): New options from circe that allow
-	tweaking of flood control.
-	(erc-server-connect-function): Renamed from erc-connect-function.
-	(erc-flood-exceeded-p): Removed.
-	(erc-coding-system-for-target)
-	(erc-encode-string-for-target, erc-decode-string-from-target):
-	Moved here from erc.el
-	(erc-server-send): Renamed from erc-send-command.  Adapted from
-	the circe function by the same name.
-	(erc-server-send-queue): New function from circe that implements
-	handling of a flood queue.
-	(erc-server-current-nick): Renamed from current-nick.
-	(erc-server-quitting): Renamed from `quitting'.
-	(erc-server-last-sent-time): Renamed from `last-sent-time'.
-	(erc-server-last-ping-time): Renamed from `last-ping-time'.
-	(erc-server-lines-sent): Renamed from `lines-sent'.
-	(erc-server-auto-reconnect): Renamed from `erc-auto-reconnect'.
-	(erc-server-coding-system): Docfix.
-	(erc-server-connect): Renamed from `erc-connect'.  Require SERVER
-	and PORT parameters.  Initialize several variables here.  Don't
-	set `erc-insert-marker'.  Use a per-server coding system via
-	erc-server-default-encoding.
+	* erc-*.el: Space out copyright years like the rest of Emacs.  Use
+	the Emacs copyright statement.  Refer to ourselves as ERC rather
+	than "Emacs IRC Client", since there are now several IRC clients
+	for Emacs.
 
-	* erc.el (erc-version-string): Changed to indicate we are running
-	the `more-backend' branch.
-	(erc-kill-queries-on-quit): Removed, since this is unused.
-	(erc-send-single-line): Implement flood control using
-	erc-split-line.
-	(erc-send-input): Move functionality of erc-send-single-line in
-	here.
-	(erc-send-single-line): Assimilated!
-	(erc-display-command, erc-display-msg): Handle display hooks.
-	(erc-auto-reconnect, current-nick, last-sent-time)
-	(last-ping-time, last-ctcp-time, erc-lines-sent, erc-bytes-sent)
-	(quitting): Moved to erc-backend.el.
-	(erc): Docfix.  Don't initialize quite so many things here.
+	* erc-compat.el (erc-emacs-build-time): Define as a variable.
 
-2005-08-10  Michael Olson  <mwolson@gnu.org>
+	* erc-ibuffer.el: Require 'erc.
 
-	* debian/copyright (Copyright): Remove notices for 4 people, since
-	they didn't contribute legally-significant changes, or have had
-	these changes overwritten.
+	* erc-log.el (erc-log-setup-logging): Use write-file-functions if
+	it exists.
 
-	* erc-log.el: Remove copyright notice.
+	* erc-stamp.el (erc-insert-aligned): Only use the special text
+	property when window-system is X.
 
-	* erc.el: Remove 3 copyright notices.
+	* erc.texi (History): Note that ERC 5.1 is released.
 
-2005-08-09  Michael Olson  <mwolson@gnu.org>
+2006-01-28  Johan Bockgård  <bojohan@users.sourceforge.net>
 
-	* debian/changelog: Create 5.0.4-3 package.  This doesn't serve
-	any purpose other than to thank Romain Francoise for some advice.
+	* erc.el (erc-format-message): More `cl' breakage; don't use
+	`oddp'.
 
-	* Makefile (debrelease): Allow last upload and extra build options
-	to be specified.
+2006-01-27  Michael Olson  <mwolson@gnu.org>
 
-2005-08-08  Michael Olson  <mwolson@gnu.org>
+	* debian/changelog: Update for new release.
 
-	* debian/changelog: Create 5.0.4-2 package.
+	* debian/control (Description): Update.
 
-	* debian/control (Uploaders): Add Romain Francoise.
-	(Standards-Version): Update to 3.6.2.
-	(Depends): Add `emacsen'.
+	* debian/rules: Concatenate ChangeLog for 2005.
 
-	* debian/scripts/startup.erc (load-path): Minor whitespace fixup.
+	* Makefile (MISC): Include ChangeLog.2005 and erc.texi.
+	(debrelease, release): Copy images directory.
 
-	* Makefile (clean): Split target from realclean and make it remove
-	files that aren't packaged in releases.
-	(clean, release): Minor cleanups.
-	(debrelease): Use debuild rather than dpkg-buildpackage since the
-	former calls lintian.  Minor cleanups.
-	(debrelease-mwolson): New target that removes old Debian packages,
-	calls debrelease, and copies the resulting package to my dist dir.
-	(upload): New target that automates the process of uploading an
-	ERC release to sourceforge.
+	* NEWS: Spelling fixes.  Add items for recent changes.
 
-	* erc.el (erc-mode): Use `make-local-variable' instead of
-	`make-variable-buffer-local'.
+	* erc.el (erc): Move call to erc-update-modules before the call to
+	erc-mode.  This should fix a timestamp display issue.
+	(erc-version-string): Release ERC 5.1.
 
-2005-07-12  Michael Olson  <mwolson@gnu.org>
+2006-01-26  Michael Olson  <mwolson@gnu.org>
 
-	* debian/changelog: Build 5.0.4-1.
+	* erc-stamp.el (erc-insert-aligned): New function that inserts
+	text in an perfectly-aligned way relative to the right margin.  It
+	only works well with Emacs22.  A sane fallback is provided for
+	other versions of Emacs.
+	(erc-insert-timestamp-right): Use the new function.
 
-	* Makefile (release): Prepare zip file in addition to tarball.
+2006-01-25  Edward O'Connor  <ted@oconnor.cx>
 
-	* NEWS: Add item for the undo fix.
+	* erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled
+	before `erc-match-mode'.
 
-2005-07-09  Michael Olson  <mwolson@gnu.org>
+	* erc-match.el (match): Append `erc-match-message' to
+	`erc-insert-modify-hook'.
 
-	* erc-nicklist.el (erc-nicklist-insert-contents): Check
-	erc-announced-name before erc-session-server.  Make sure that we
-	can never get a stringp (nil) error.
-	(erc-nicklist-call-erc-command): If given no command, do nothing.
-	This fixes an error that used to occur when a stray mouse click
-	was made outside of the popup window, but on the erc-nicklist
-	menu.
+2006-01-25  Michael Olson  <mwolson@gnu.org>
 
-	* erc-bbdb.el (erc-bbdb-search-name-and-create): Get rid of the
-	infinite input loop when you want to create a new record.  Replace
-	most of that with a completing read of existing nicks.  If no nick
-	is chosen, create a new John Doe record.  The net effect of this
-	is that the old behavior is re-instated, with the addition of one
-	completing read that happens when you do a /whois.
+	* FOR-RELEASE: Mark last release requirement as done.
 
-2005-07-09  Johan Bockg�rd  <bojohan@users.sourceforge.net>
+	* Makefile (realclean, distclean): Remove docs.
 
-	* erc.el (erc-process-input-line): Docfix.
-	(erc-update-mode-line-buffer): Use `erc-propertize' instead of
-	`propertize'.
-	(erc-propertize): Move to erc-compat.el.
+	* erc.texi: Take care of all pre-5.1 items.
 
-	* erc-compat.el (erc-propertize): Move here from erc.el. Always
-	return a copy of the string (like `propertize' in GNU Emacs).
+	* erc-backend.el (erc-server-send, erc-server-send-queue): Wrap
+	`process-send-string' in `condition-case' to avoid an error when
+	quitting ERC.
 
-	* erc-nicklist.el (erc-nicklist-icons-directory)
-	(erc-nicklist-voiced-position)
-	(erc-nicklist-insert-medium-name-or-icon): Docfix.
-	(erc-nicklist-insert-contents): Simplify.
-	(erc-nicklist-mode-map): Bind RET instead of `return'. Bind
-	`down-mouse-3' instead of `mouse-3'.
-	(erc-nicklist-kbd-cmd-QUERY): Cleanup regexp.
-	(erc-nicklist-channel-users-info): Docfix. Simplify.
+	* erc-stamp.el (erc-insert-timestamp-right): Try to deal with
+	variable-width characters in the timestamp and on the same line.
+	The latter is a kludge, but it seems to work with most of the
+	input I've thrown at it so far.  It's certainly better than going
+	past the end of line consistently when we have variable-width
+	characters on the same line.  When `erc-timestamp-intangible' is
+	non-nil, add intangible properties to the whitespace as well, so
+	that hitting <end> does what you'd expect.
 
-2005-07-02  Michael Olson  <mwolson@gnu.org>
+	* erc.el (erc-flood-protect, erc-toggle-flood-control): Update
+	this to only use boolean values for `erc-flood-protect'.  Update
+	documentation.
+	(erc-cmd-QUIT): Set the active buffer to be the server buffer, so
+	that any QUIT-related messages go there.
+	(erc): Try to be more clever about re-using channel buffers when
+	automatically re-connecting.  Thanks to e1f for noticing.
 
-	* images: New directory containing the images that are used by
-	erc-nicklist.el.  These are from Gaim, and are thought to be
-	available under the terms of the GPL.
+2006-01-23  Michael Olson  <mwolson@gnu.org>
 
-	* erc-bbdb.el: Add local variables section to preserve tabs, since
-	that is the style used throughout this file.  Apply patch from
-	Edgar Gon�alves as follows.
-	(erc-bbdb-bitlbee-name-field): New variable that indicates the
-	field name to use for annotating the "displayed name" of a bitlbee
-	contact.
-	(erc-bbdb-irc-highlight-field): Docfix.
-	(erc-bbdb-search-name-and-create): Prompt the user for the name of
-	a contact if none was found.  Merge the new entries into the
-	specified contact.  If new arg SILENT is non-nil, do not prompt
-	the user for a name or offer to merge the new entry.
-	(erc-bbdb-insinuate-and-show-entry): New arg SILENT is accepted,
-	which is passed on to erc-bbdb-search-name-and-create.
-	(erc-bbdb-whois): Tell erc-bbdb-search-name-and-create to prompt
-	for name if necessary.
-	(erc-bbdb-JOIN, erb-bbdb-NICK): Forbid
-	erc-bbdb-search-name-and-create from prompting for a name.
+	* ChangeLog.2005: Remove erroneous line.
 
-	* erc-nicklist.el: Add local variables section to preserve tabs,
-	since that is the style used throughout this file.  Apply patch
-	from Edgar Gon�alves as follows.
-	(erc-nicklist-use-icons): New option; if non-nil, display an icon
-	instead of the name of the chat medium.
-	(erc-nicklist-icons-directory): New option indicating the path to
-	the PNG files that are used for chat icons.
-	(erc-nicklist-use-icons): New option indicating whether to put
-	voiced nicks on top, bottom, or not to differentiate them.  The
-	default is to put them on the bottom.
-	(erc-nicklist-bitlbee-connected-p): New variable that indicates
-	whether or not we are currently using bitlbee.  An attempt will be
-	made to auto-detect the proper value.  This is bound in the
-	`erc-nicklist-insert-contents' function.
-	(erc-nicklist-nicklist-images-alist): New variable that maps a
-	host type to its icon.  This is set by `erc-nicklist'.
-	(erc-nicklist-insert-medium-name-or-icon): New function that
-	inserts an icon or string that identifies the current host type.
-	(erc-nicklist-search-for-nick): New function that attempts to find
-	a BBDB record that corresponds with this contact given its
-	finger-host.  If found, return its bitlbee-nick field.
-	(erc-nicklist-insert-contents): New function that inserts the
-	contents of the nick list, including text properties and images.
-	(erc-nicklist): Populate `erc-nicklist-images-alist'.  Move
-	nicklist content generation code to
-	`erc-nicklist-insert-contents'.
-	(erc-nicklist-mode-map): Map C-j to erc-nicklist-kbd-menu and RET
-	to erc-nicklist-kbd-cmd-QUERY.
-	(erc-nicklist-call-erc-command): Make use of
-	`switch-to-buffer-other-window'.
-	(erc-nicklist-cmd-QUERY): New function that opens a query buffer
-	for the given contact.
-	(erc-nicklist-kbd-cmd-QUERY): Ditto; contains most of the code.
-	(erc-nicklist-kbd-menu): New function that shows the nicklist
-	action menu.
-	(erc-nicklist-channel-users-info): Renamed from
-	`erc-nicklist-channel-nicks'.  Implement sorting voiced users.
+	* FOR-RELEASE: Make that the Makefile tweaking is complete.
+	(NEWS): Mark as done.
 
-2005-06-29  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
+	* Makefile (MANUAL): New option indicating the name of the manual.
+	(PREFIX, ELISPDIR, INFODIR): New options that specify the
+	directories to install lisp code and info manuals to.  PREFIX is
+	used only by ELISPDIR and INFODIR.
+	(all): Call `lisp' and create the manual.
+	(lisp): Compile lisp code.
+	(%.info, %.html): New rules that make Info files and HTML files,
+	respectively, from a TexInfo source.
+	(doc): Create both the Info and HTML versions of the manual.  This
+	is for the user -- we never call it automatically.
+	(install-info): Install Info files.
+	(install-bin): Install compiled and source Lisp files.
+	(todo): Remove, since it seems pointless.
 
-	* erc-nickserv.el (erc-nickserv-alist): Fix regexp for Azzurra.
+	* NEWS: Update.
 
-2005-06-26  Michael Olson  <mwolson@gnu.org>
+	* README: Add Installation instructions.  Tweak layout.
 
-	* erc-autojoin.el (erc-autojoin-add, erc-autojoin-remove): Use
-	`erc-session-server' if `erc-announced-server-name' is nil.  This
-	happens when servers don't send a 004 message.
+	* erc.texi: Work on some pre-5.1 items.
 
-	* erc.el (erc-quit-server): Ditto.
+	* erc-stamp.el, erc-track.el: Move some functions and options in
+	order to get rid of a few compiler warnings.
 
-	* erc-ibuffer.el (erc-server, erc-server-name): Ditto.
+	* erc.el (erc-modules): Enable readonly by default.  This will
+	prevent new users from accidentally removing old messages, which
+	could be disconcerting.  Also enable stamp by default, since
+	timestamps are a fairly standard feature among IRC clients.
 
-	* erc-notify.el (erc-notify-JOIN, erc-notify-NICK)
-	(erc-notify-QUIT): Ditto.
+	* erc-button.el: Munge whitespace.
 
-2005-06-24  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
+	* erc-identd.el (erc-identd-start): Instead of throwing an error,
+	just try to use the obsolete function.
 
-	* erc.el (erc-default-coding-system)
-	(erc-handle-user-status-change): Docstring fix.
-	(with-erc-channel-buffer): Removed.
-	(erc-ignored-reply-p): Replace `with-erc-channel-buffer' with
-	`erc-with-buffer'.
-	(erc-display-line-1): Revision 1.730 broke undo. Fix it.
+2006-01-22  Michael Olson  <mwolson@gnu.org>
 
-2005-06-23  Michael Olson  <mwolson@gnu.org>
+	* erc-backend.el (erc-decode-string-from-target): Make sure that
+	we have a string as an argument.  If not, coerce it to the empty
+	string.  Hopefully, this will work painlessly around an edge case
+	related to quitting ERC around the same time a message comes in.
 
-	* CREDITS: Add entries for Luigi Panzeri and Andreas Schwab.
+2006-01-22  Johan Bockgård  <bojohan@users.sourceforge.net>
 
-	* erc-nickserv.el (erc-nickserv-alist): Add entries for Azzurra
-	and OFTC.  Thanks to Luigi Panzeri and Andreas Schwab for
-	providing these.
+	* erc-track.el: Use `(eval-when-compile (require 'cl))' (for
+	`case'). Doc fixes.
+	(erc-find-parsed-property): Simplify.
+	(erc-track-get-active-buffer): Fix logic. Simplify.
+	(erc-track-switch-buffer): Remove unused variable `dir'. Simplify.
 
-2005-06-16  Michael Olson  <mwolson@gnu.org>
+	* erc-speak.el: Doc fixes.
+	(erc-speak-region): `propertize' --> `erc-propertize'.
 
-	* CREDITS: Add John Paul Wallington.
+	* erc-dcc.el (erc-dcc-chat-parse-output): `propertize' -->
+	`erc-propertize'.
 
-	* erc.el: Thanks to John Paul Wallington for the following.
-	(erc-nickname-in-use): Use `string-to-number' instead of
-	`string-to-int'.
+	* erc-button.el (erc-button-add-button): Take erc-fill-prefix into
+	account when wrapping URLs.
 
-	* erc-dcc.el (erc-dcc-handle-ctcp-send)
-	(erc-dcc-handle-ctcp-chat, erc-dcc-get-file)
-	(erc-dcc-chat-accept): Ditto.
+	* erc-bbdb.el (erc-bbdb-elide-display): Doc fix.
 
-	* erc-identd.el (erc-identd-start): Ditto.
+	* erc-backend.el (define-erc-response-handler): Doc fix.
 
-2005-06-16  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
+2006-01-22  Michael Olson  <mwolson@gnu.org>
 
-	* erc.el (erc-mode-map): Suppress `font-lock-fontify-block' key
-	binding since it destroys face properties.
+	* erc.el (erc-update-modules): Use `require' instead of `load',
+	but prevent it from causing errors, in order to preserve the
+	previous behavior.
 
-2005-06-08  Michael Olson  <mwolson@gnu.org>
+2006-01-21  Michael Olson  <mwolson@gnu.org>
 
-	* erc.el (erc-cmd-UNIGNORE): Use `erc-member-ignore-case' instead
-	of `member-ignore-case'.  Thanks to bpalmer for the heads up.
+	* FOR-RELEASE (Source): Mark cl task as done.
 
-2005-06-06  Michael Olson  <mwolson@gnu.org>
+	* Makefile (erc-auto.el): Call erc-generate-autoloads rather than
+	generate-autoloads.
+	(erc-auto.el, %.elc): Don't show command, just its output.
 
-	* erc.el (erc-modules): Fix a mistake I made when editing this a
-	few days ago.  Modes should now be disabled properly.
-	(erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Remove unnecessary call to
-	`format'.  Thanks to Andreas Schwab for reporting this.
+	* NEWS: Add items from 2005-01-01 to 2005-08-13.
 
-	* debian/changelog: Close "README file missing" bug.
+	* debian/copyright (Copyright): Update.
 
-	* debian/rules (binary-erc): Install README file.
+	* erc-auto.in (erc-generate-autoloads): Rename from
+	generate-autoloads.
 
-2005-06-03  Michael Olson  <mwolson@gnu.org>
+	* erc.el, erc-autoaway.el, erc-backend.el: Use
+	erc-server-process-alive instead of erc-process-alive.
 
-	* erc.el (erc-with-buffer): Set `lisp-indent-function' so Emacs
-	Lisp mode knows how to indent erc-with-buffer blocks.
-	(with-erc-channel-buffer): Ditto.
-	(erc-with-all-buffers-of-server): Ditto.
-	(erc-modules): Use pcomplete by default, not completion, since
-	erc-complete.el is deprecated.  Use `fboundp' instead of
-	`symbol-value' to check for existence of a function before calling
-	it.  This was causing an error when untoggling the `completion'
-	option and trying to save via the customize interface.
+	* erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el,
+	erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el,
+	erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el:
+	Use (eval-when-compile (require 'cl)), so that compilation doesn't
+	fail.
 
-	* erc-track.el (erc-modified-channels-update): If a buffer is not
-	currently connected, remove it from the modified channels list.
-	This should fix the problem where residue was left on the mode
-	line after quitting ERC.
+	* erc-fill.el, erc-truncate.el: Whitespace munging.
 
-	* erc-list.el (erc-prettify-channel-list): Docfix; thanks to John
-	Paul Wallington for reporting this.
+	* erc.el: Update copyright notice.  Remove eval-after-load code.
+	(erc-with-buffer): Docfix.
+	(erc-once-with-server-event, erc-once-with-server-event-global)
+	(erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym
+	instead of gensym.
+	(erc-banlist-update): Use erc-delete-if instead of delete-if.
+	(erc): Call `erc-update-modules' here.
 
-2005-05-31  Michael Olson  <mwolson@gnu.org>
+	* erc-backend.el: Require 'erc-compat to minimize compiler
+	warnings.
+	(erc-decode-parsed-server-response): Docfix.
+	(erc-server-process-alive): Move here from erc.el and rename from
+	`erc-process-alive'.
+	(erc-server-send, erc-remove-channel-users): Make sure process is
+	alive before sending data to it.
 
-	* debian/changelog: First draft of entries for the 5.0.3 release.
+	* erc-bbdb.el: Update copyright years.
+	(erc-bbdb-whois): Remove overexuberant comment.
 
-	* debian/README.Debian: Note that ERC will now install correctly
-	on versions of Emacs or XEmacs that do not have the `format-spec'
-	library.  Correct some grammar and prune the content a bit.
+	* erc-button.el: Require erc-fill, since we make liberal use of
+	`erc-fill-column'.
 
-	* debian/scripts/install (emacs20): Remove line since we no longer
-	need to deal with format-spec.el.
+	* erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New
+	functions, the latter of which provides an `assert' equivalent.
+	(erc-remove-if-not): New function that provides a simple
+	implementation of `remove-if-not'.
+	(erc-gensym): New function that provides a simple implementation
+	of `gensym'.
+	(erc-delete-if): New function that provides a simple
+	implementation of `delete-if'.
+	(erc-member-if): New function that provides a simple
+	implementation of `member-if'.
+	(field-end): Remove this, since it is unused, and later versions
+	of XEmacs have this function already.
+	(erc-function-arglist): Moved here from erc.el.
+	(erc-delete-dups): New compatibility function for dealing with
+	XEmacs.
+	(erc-subseq): New function copied from cl-extra.el.
 
-	* NEWS: Add entries for the upcoming 5.0.3 release.
+	* erc-dcc.el: Require pcomplete during compilation to avoid
+	compiler warnings.
+	(erc-unpack-int, erc-dcc-send-filter)
+	(erc-dcc-get-filter): Use erc-assert instead of assert.
+	(pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of
+	remove-if-not.
 
-	* erc.el: Don't require format-spec since this is provided in
-	erc-compat.el now.
-	(erc-process-sentinel, erc-setup-periodical-server-ping): Use
-	`erc-cancel-timer' instead of `cancel-timer'.
-	(erc-version-string): Update to 5.0.3.
+	* erc-match.el (erc-log-matches): Fix compiler warning.
 
-	* erc-autoaway.el (autoaway, erc-autoaway-reestablish-idletimer):
-	Use `erc-cancel-timer' instead of `cancel-timer'.
+	* erc-nicklist.el: Update copyright notice.
+	(erc-nicklist-menu): Change use of caadr to (car (cadr ...)).
+	(erc-nicklist-bitlbee-connected-p): Remove.
+	(erc-nicklist-insert-medium-name-or-icon): Accept channel
+	argument.  Use it to determine whether we are on bitlbee.  Now
+	that bitlbee names its channel "&bitlbee", this is trivial.
+	(erc-nicklist-insert-contents): Pass channel as specified above.
+	Don't try to determine whether we are on bitlbee here.
+	(erc-nicklist-channel-users-info): Use erc-remove-if-not instead
+	of remove-if-not.
+	(erc-nicklist-search-for-nick): Use erc-member-if instead of
+	member-if.
 
-	* erc-compat.el (format-spec, format-spec-make): If we cannot load
-	the `format-spec' library, provide versions of these functions.
-	This should keep problems from surfacing with Emacs21 Debian
-	builds.
-	(erc-cancel-timer): New function created to take the place of
-	`cancel-timer' since XEmacs calls it something else.
+	* erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a
+	partially-evaluated lambda expression instead of `delete' and
+	`find'.
 
-	* erc-track.el (erc-modified-channels-update): Accept any number
-	of arguments, which are ignored.  This allows it to be run from
-	`erc-disconnected-hook' without extra bother.
-	(track): Add `erc-modified-channels-update' to
-	`erc-disconnected-hook' so that the indicators are removed
-	correctly in some edge cases.
-	(erc-modified-channels-display): Make sure that we never pass nil
-	to the function in `erc-track-shorten-function'.  This happens
-	when we have deleted buffers in `erc-modified-channels-alist'.
-	Also, make sure that the buffer has a non-nil short-name before
-	adding it to the string list.  This should fix some XEmacs
-	warnings when running /quit with unchecked buffers, as well as get
-	rid of a stray buffer problem (or so it is hoped).
+	* erc-track.el: Use erc-assert.
+	(erc-track-modified-channels): Remove use of `return'.
+	(erc-track-modified-channels): Use `cadr' instead of `second',
+	since otherwise we would need yet another eval-when-compile line.
 
-2005-05-31  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
+2006-01-19  Michael Olson  <mwolson@gnu.org>
 
-	* erc-replace.el, erc-speak.el: Clean up comment formatting.
+	* erc-backend.el (erc-process-sentinel-1): Remove attempt to
+	detect SIGPIPE, since it doesn't work.
 
-	* erc-ring.el (ring, erc-input-ring-index, erc-clear-input-ring):
-	Clean up docstring formatting.
+2006-01-10  Diane Murray  <disumu@x3y2z1.net>
 
-2005-05-30  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
+	* erc-spelling.el: Updated copyright years.
+	(define-erc-module): Enable/disable `flyspell-mode' for all open
+	ERC buffers as well.
+	(erc-spelling-dictionaries): Reworded customize description.
 
-	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Delete superfluous
-	arg to `format'.
-	(erc-load-irc-script): Use `insert-file-contents' instead of
-	`insert-file'. Simplify.
+	* erc.el (erc-command-symbol): New function.
+	(erc-extract-command-from-line): Use `erc-command-symbol'.  This
+	fixes a bug where "Symbol's function definition is void:
+	erc-cmd-LIST" would be shown after typing /list at the prompt (the
+	command was interned because erc-menu.el uses it and is enabled by
+	default whereas erc-list.el is not).
 
-2005-05-29  Michael Olson  <mwolson@gnu.org>
+	* NEWS: Started a list of renamed variables.
 
-	* erc.el (erc-version-string): Move this up so that it is
-	evaluated before the `require' statements.  Not a major change.
+	* erc.el: Reworded the message sent when defining variable
+	aliases.
+	(erc-command-indicator-face): Doc fix.
+	(erc-modules): Enable the match module by default which makes
+	current nickname highlighting on as the default.
 
-2005-04-27  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
+	* erc-button.el: Updated copyright years.
+	(erc-button): New face.
+	(erc-button-face): Use `erc-button'.
+	(erc-button-nickname-face): New customizable variable.
+	(erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send
+	new argument to `erc-button-add-button'.
+	(erc-button-add-button): Doc fix.  Added new argument to function
+	definition, NICK-P.  If it's a nickname, use
+	`erc-button-nickname-face', otherwise use `erc-button-face'.  This
+	makes channel tracking and buttons work better together when
+	`erc-button-buttonize-nicks' is enabled, since there is a nickname
+	on just about every line.
 
-	* erc.el (erc-complete-word): Simplify.
+	* erc-track.el (erc-track-use-faces): Doc fix.
+	(erc-track-faces-priority-list): Added `erc-button' to list.
+	(erc-track-priority-faces-only): Doc fix.
 
-2005-04-27  Michael Olson  <mwolson@gnu.org>
+2006-01-09  Diane Murray  <disumu@x3y2z1.net>
 
-	* Makefile (debrelease): Use a slightly different approach when
-	removing CVS and Arch cruft.
+	* erc-button.el (erc-button-url-regexp): Use `concat' so the
+	regexp is not one long line.
+	(erc-button-alist): Fixed so that customizing works correctly.
+	Reorganized.  Removed lambda functions with more than two lines.
+	Doc fix.
+	(erc-button-describe-symbol, erc-button-beats-to-time): New
+	functions.  Moved from `erc-button-alist'.
 
-	* debian/changelog: Update for 5.0.2-1 package.
+2006-01-07  Michael Olson  <mwolson@gnu.org>
 
-2005-04-25  Michael Olson  <mwolson@gnu.org>
+	* erc-backend.el (erc-process-sentinel-1): Don't try to re-open a
+	process if a SIGPIPE occurs.  This happens when a new message
+	comes in at the same time a /quit is requested.
+	(erc-process-sentinel): Use string-match rather than string= to do
+	these comparisons.  Matching literal newlines makes me nervous.
 
-	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move code
-	block higher in file to fix a load failure when using Emacs21.
-	Thanks to Daniel Brockman for the report and fix.
+	* erc-track.el (erc-track-remove-from-mode-line): Handle case
+	where global-mode-string is not a list.  Emacs22 permits this.
 
-2005-04-24  Adrian Aichner  <adrian@xemacs.org>
+See ChangeLog.2005 for earlier changes.
 
-	* erc-backend.el (JOIN): save-excursion so that
-	`erc-current-logfile' inserts into the correct channel buffers
-	when using erc-log-insert-log-on-open in combination with autojoin
-	to multiple channels.
+;; Local Variables:
+;; coding: utf-8
+;; End:
 
-2005-04-17  Adrian Aichner  <adrian@xemacs.org>
+;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
 
-	* erc-log.el: Remove stray whitespace.
-	* erc.el: Ditto.
-
-2005-04-09  Aidan Kehoe  <kehoea@parhasard.net>
-
-	* erc.el: autoload erc-select-read-args, which, because it parses
-	erc-select's args, can be called before erc.el is loaded. 
-
-2005-04-07  Edward O'Connor  <ted@oconnor.cx>
-	
-	* erc-viper.el: Remove final newlines from previously-existing ERC
-	buffers. (Minor bug fix.)
-
-2005-04-06  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (debrelease): Ignore errors from deleting Arch and CVS
-	metadata.
-
-2005-04-05  Michael Olson  <mwolson@gnu.org>
-
-	* ChangeLog, CREDITS, AUTHORS: Correct name and email address of
-	Marcelo Toledo.
-
-2005-04-04  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-modules): Add entry for spelling module.
-
-	* erc-spelling.el: Add autoload line.
-
-	* erc-backend.el: Apply latest non-ascii patch from Kai Fan.
-	(erc-decode-parsed-server-response): Search
-	erc-response.command-args for channel name.  Decode the
-	erc-response struct using this channel name as key according to
-	the `erc-encoding-coding-alist'.
-
-	* erc-track.el: Apply patch from Henrik Enberg.
-	(erc-modified-channels-object): Use optimal amount of whitespace
-	around modified channels indicator.
-
-2005-04-02  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
-
-	* erc.el (define-erc-module, erc-with-buffer)
-	(erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
-	edebug-form-spec.
-
-	* erc-compat (erc-define-minor-mode): Ditto.
-
-2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
-
-	* erc-spelling.el: New file.
-
-2005-03-24  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
-
-	* erc-backend.el (define-erc-response-handler): Add
-	`definition-name' property to constructed symbols so that
-	find-function and find-variable will find them.
-
-2005-03-21  Michael Olson  <mwolson@gnu.org>
-
-	* erc-dcc.el, erc-goodies.el, erc-list.el, erc-notify.el,
-	erc-ring.el, erc.el: Copyright assignment occurred.
-
-	* debian/scripts/install: Make a shell wrapper around the original
-	Makefile and inline the Makefile.  The problem is that Debian
-	passes all the Emacs variants at once, rotating them at every
-	invocation of the install script, which happens once per variant.
-	This caused each installation to happen N-1 times more often than
-	it should have.  As a result, we need to only deal with the first
-	argument.
-	(ELFILES): Only add format-spec.el if we are compiling for
-	emacs21.  Don't filter out erc-compat.el.
-	(SITEFLAG): New variable that indicates that the "nosite" option
-	should look like.
-	(.DEFAULT): Use $(FLAVOUR) instead of $@ for clarity.
-
-	* debian/rules: Install NEWS file and compress it.
-
-	* debian/maint/postinst: Be more cautious about configuration
-	step.
-
-	* debian/copyright (Copyright): Another assignment came in.
-
-	* debian/control (Standards-Version): Update to a newer version as
-	recommended by lintian.
-
-	* debian/changelog: Changes made for the Debian package.
-
-	* debian/README.Debian: Keep only the General Notes section.
-
-	* NEWS: Move old history items here from debian/README.Debian.
-
-	* Makefile (SNAPSHOTDATE): Deprecate this option since we hope to
-	release more often.
-
-2005-03-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el (erc-define-catalog, `ctcp-request-to'): Fix typo (%: ->
-	%t:).
-
-2005-03-01  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el (erc-save-buffer-in-logs): Replace tabs with spaces
-	in code indentation.
-
-2005-02-28  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-display-message): Apply corrected patch from Henrik
-	Enberg.
-
-2005-02-27  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-display-message): Apply patch from Henrik Enberg.
-	Check here to see if a message should be hidden, rather than
-	relying on code in each individual command.
-	(erc-version-string): Add "(CVS)" to the version string for
-	clarity.
-
-	* erc-backend.el (JOIN, KICK, MODE, NICK, PART, QUIT, TOPIC):
-	Don't check `erc-hide-list' here.
-
-	* erc-list.el, erc-match.el, erc.el, debian/copyright: Update
-	copyright information as a few more people have assignments
-	registered.
-
-2005-02-06  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el: Apply patch from Kai Fan for non-ASCII character
-	support.
-	(erc-parse-server-response): Add call to
-	`erc-decode-parsed-server-response'.
-	(erc-decode-parsed-server-response): New function that decodes a
-	pre-parsed server response before it can be handled.
-	(PRIVMSG): Comment out call to `erc-decode-string-from-target'.
-	(TOPIC): Ditto.
-
-2005-02-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el (erc-process-sentinel-1): Don't reconnect on connection
-	refused. This error is reported differently when using
-	open-network-stream-nowait.
-
-2005-01-26  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc-cmd-APPENDTOPIC, erc-set-topic): The control
-	character in `channel-topic' was changed to \C-o - replaced \C-c
-	with \C-o so that these functions work as expected again.
-	(erc-get-channel-mode-from-keypress): Doc fix.
-
-2005-01-25  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el, erc-button.el, erc-compat.el, erc-goodies.el,
-	erc-match.el, erc-nets.el, ChangeLog, NEWS: Merged bug fixes made
-	on release_5_0_branch since 5.0.1 release.
-
-2005-01-24  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
-
-	* erc.el (erc-input-action): Quote `erc-action-history-list' so
-	that input history actually works.
-	(erc-process-ctcp-query): Fix and simplify logic.
-	(erc-get-channel-mode-from-keypress): Use `C-' string syntax.
-	(erc-load-irc-script-lines): Use `erc-command-indicator' instead
-	of `erc-prompt'.
-
-2005-01-23  Edward O'Connor  <ted@oconnor.cx>
-	
-	* erc-viper.el: Ensure that `viper-comint-mode-hook' runs in
-	buffers whose `erc-mode-hook' has already run when this file is
-	loaded.
-	Explicitly `require' erc.el.
-
-2005-01-22  Edward O'Connor  <ted@oconnor.cx>
-	
-	* erc.el (erc-mode): Remove frobbing of `require-final-newline'.
-
-	* erc-log.el (erc-save-buffer-in-logs): Remove frobbing of
-	`require-final-newline'.
-
-	* erc-viper.el: New file. This is where all ERC/Viper
-	compatiibilty code should live. When and if ERC is bundled with
-	Emacs, some of the hacks in this file should be merged into Viper
-	itself.
-
-2005-01-21  Edward O'Connor  <ted@oconnor.cx>
-	
-	* erc.el (erc-mode): Set `require-final-newline' to nil in ERC
-	buffers. This prevents a Viper misfeature whereby extraneous
-	newlines are inserted into the ERC buffer when switching between
-	viper states.
-
-	* erc-log.el (erc-save-buffer-in-logs): Bind `require-final-newline'
-	to t when calling `write-region' to ensure that further log
-	entries start on fresh lines.
-	
-2005-01-21  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-button.el (erc-button-add-face): Reverted my change to the
-	order faces since it had the unwanted effect of putting the button
-	face after all others.
-	(erc-button-face-has-priority): Removed this variable as it is not
-	necessary anymore - it was used to compensate for the above
-	mentioned change.
-
-	* NEWS: Added the latest fixes.
-
-2005-01-20  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-button.el, erc-match.el:
-	(erc-button-syntax-table, erc-match-syntax-table): Added \ as a
-	legal character for nicknames.
-
-	* erc-nets.el (erc-server-select): Fixed so that only networks
-	with servers found in `erc-server-alist' are available as choices.
-
-	* erc.el, erc-compat.el, erc-goodies.el:
-	(erc-replace-match-subexpression-in-string): New function.  Needed
-	because `replace-match' in XEmacs doesn't replace regular
-	expression subexpressions in strings, only in buffers.
-	(erc-seconds-to-string, erc-controls-interpret): Use the new
-	function.
-
-	* erc-button.el (erc-button-add-button): Use the `:button-face'
-	key combined with an `erc-mode' local `widget-button-face' set to
-	nil to get the widget overlay face suppressed in XEmacs.
-
-2005-01-19  Francis Litterio  <franl@world.std.com>
-
-	* erc-button.el (erc-button-add-face): The face added by this
-	function is more important than the existing text's face, so we
-	now prepend erc-button-face to the list of existing faces when
-	adding a button.  To instead append erc-button-face to existing
-	faces, set variable `erc-button-face-has-priority' to nil.
-	(erc-button-face-has-priority): New variable to control how
-	erc-button-add-face adds erc-button-face to existing faces.
-	(erc-button-press-button): Silenced a byte-compiler warning about
-	too few arguments in a call to `error'.
-
-2005-01-19  Diane Murray  <disumu@x3y2z1.net>
-
-	* NEWS: Added list of 5.0.1 fixes.
-
-2005-01-19  Michael Olson  <mwolson@gnu.org>
-
-	* AUTHORS: Move to format that cscvs can understand.  As an added
-	perk, entries line up nicer.
-
-	* erc.el, erc-fill.el, erc-pcomplete.el, debian/copyright: Merge a
-	few more copyright lines thanks to Alex Schroeder's BBDB file.
-
-	* Makefile: Change version to correspond with our new scheme.
-
-2005-01-18  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-list.el (erc-chanlist-channel-line-regexp): Now matches
-	private channels, the channels `#' and `&', and channels with
-	names including non-ascii characters.
-	(erc-chanlist-join-channel): Don't attempt to join private
-	channels since the channel name is unknown.
-
-	* erc-goodies.el (erc-make-read-only): Add `rear-nonsticky'
-	property to avoid `Text is read-only' errors during connection.
-	`front-nonsticky' does not exist, changed to `front-sticky'.
-	(erc-controls-interpret, erc-controls-strip): Just work on the
-	string, don't open a temporary buffer.
-	(erc-controls-propertize): Now accepts optional argument STR.
-
-2005-01-17  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile: Version is 5.01, but only in the Makefile.  It has not
-	been released yet.
-
-	* erc-auto.in, erc-autojoin.el, erc-bbdb.el, erc-button.el,
-	erc-chess.el, erc-complete.el, erc-dcc.el, erc-fill.el,
-	erc-goodies.el, erc-ibuffer.el, erc-identd.el, erc-imenu.el,
-	erc-list.el, erc-match.el, erc-menu.el, erc-nets.el,
-	erc-netsplit.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el,
-	erc-ring.el, erc-speak.el, erc-speedbar.el, erc-stamp.el,
-	erc-track.el, erc-xdcc.el, erc.el, debian/copyright: Update
-	copyright notices.  If anyone has signed papers for Emacs in
-	general, merge them with the FSF's entry.
-
-2005-01-16  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc): `erc-set-active-buffer' was being called before
-	`erc-process' was set, so that channels weren't being marked
-	active correctly upon join; fixed.
-
-2005-01-15  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
-
-	* erc-backend.el (def-edebug-spec): This macro caused problems (in
-	XEmacs). Use its expansion directly.
-
-2005-01-15  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-button.el (erc-button-add-button): Reverted previous change
-	since `:suppress-face' doesn't seem to be checked for a certain
-	face.
-	(erc-button-add-face): FACE is now appended to the `old' face.
-	This should fix the problem of faces being "covered" by
-	`erc-button-face'.
-
-2005-01-14  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el, erc-backend.el (erc-cmd-OPS, erc-cmd-COUNTRY,
-	erc-cmd-NICK, erc-process-ctcp-query, ERROR, PONG, 311, 312, 313,
-	314, 317, 319, 320, 321, 322, 330, 352): Use catalog entries
-	instead of hard-coded text messages.
-	(english): Added new catalog entries `country', `country-unknown',
-	`ctcp-empty', `ctcp-request-to', `ctcp-too-many', `nick-too-long',
-	`ops', `ops-none', `ERROR', `PONG', `s311', `s312', `s313',
-	`s314', `s317', `s317-on-since', `s319', `s320', `s321', `s322',
-	`s330', and `s352'.
-	(erc-send-current-line): Use `erc-set-active-buffer' (change was
-	lost in previous bug fix).
-
-2005-01-14  Francis Litterio  <franl@world.std.com>
-
-	* erc-button.el (erc-button-add-button): Fixed a bug where the
-	overlay created by widget-convert-button has a `face' property
-	that hides the `face' property set on the underlying button text.
-
-	* erc-goodies.el: Docstring fix.
-
-	* erc-button.el: Improved docstring for variable erc-button-face.
-
-2005-01-13  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-menu.el (erc-menu-definition): "Topic set by channel
-	operator": Small word change.  "Identify to NickServ...": Check
-	that we're connected to the server.  Added "Save buffer in log"
-	and "Truncate buffer".
-
-2005-01-13  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc.el (erc-display-line-1): Widen before we try to insert
-	anything, this makes sure input isn't broken when the buffer is
-	narrowed by the user.
-	(erc-beg-of-input-line): Simplify, just return the position of
-	`erc-insert-marker' or error if does not exist.
-	(erc-send-current-line): Widen before trying to send anything.
-
-2005-01-13  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el, erc-backend.el, erc-list.el:
-	(erc-update-mode-line-buffer): Strip controls characters from
-	`channel-topic' since we add our own control character to it.
-	(TOPIC, 332): Use \C-o instead of \C-c to force an end of IRC
-	control characters as it also ends bold, underline, and inverse -
-	\C-c only ends colors.
-	(erc-chanlist-322): Strip control characters from channel and
-	topic.  No need to interpret controls when we're applying overlays
-	to the lines.
-
-	* erc.el, erc-backend.el, erc-button.el, erc-netsplit.el,
-	erc-nicklist.el: Fixed so that each server has an active buffer.
-	(erc-active-buffer): Now a buffer-local variable.
-	(erc-active-buffer, erc-set-active-buffer): New functions.
-	(erc-display-line, erc-echo-notice-in-active-non-server-buffer,
-	erc-process-away, MODE): Call `erc-active-buffer' to get the
-	active buffer for the current server.
-	(erc, erc-process-sentinel-1, erc-grab-region, erc-input-action,
-	erc-send-current-line, erc-invite-only-mode,
-	erc-toggle-channel-mode, erc-channel-names, MODE, erc-nick-popup,
-	erc-nicklist-call-erc-command): Use `erc-set-active-buffer' to set
-	the active buffer for the current server.
-	(erc-cmd-WHOLEFT): Use 'active as BUFFER in `erc-display-message'.
-
-	* erc-track.el (erc-track-modified-channels): Server buffers are
-	now treated the same as channels and queries.  This means that
-	`erc-track-priority-faces-only', `erc-track-exclude', and
-	`erc-track-exclude-types' now work with server buffers.
-
-2005-01-12  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-backend.el (475): Prompt for the channel's key if
-	`erc-prompt-for-channel-key' is non-nil.  Send a new JOIN message
-	with the key if a key is provided.
-
-	* erc.el (erc-command-indicator): Fixed customization choices so
-	that there's no `mismatch' message when nil is the value.
-
-2005-01-11  Michael Olson  <mwolson@gnu.org>
-
-	* erc-bbdb.el (bbdb): Lowercase the name of the module.  This
-	fixes a bug which caused an error to occur when trying to enable
-	the module using the customization interface.
-
-2005-01-08  Edward O'Connor  <ted@oconnor.cx>
-
-	* erc-track.el: Support using faces to indicate channel activity
-	in the modeline under XEmacs.
-	(erc-modified-channels-object): New function.
-	(erc-modified-channels-display): Use it.
-	`erc-modified-channels-string' renamed to
-	`erc-modified-channels-object' (because it's no longer a string on
-	XEmacs). The new function `erc-modified-channels-object' is used
-	to generate updated values for the same-named variable.
-
-2005-01-08  Diane Murray <disumu@x3y2z1.net>
-
-	* ChangeLog.2002: Changed instances of my sourceforge username and
-	email address to real name and email.
-
-	* erc.el (erc-modules): Changed customization tag descriptions, so
-	that they all start with a verb; added new modules to choices.
-
-2005-01-08  Mario Lang  <mlang@delysid.org>
-
-	* debian/rules: Introduce new variable DOCDIR to simplify stuff a
-	bit.
-
-2005-01-08  Michael Olson  <mwolson@gnu.org>
-
-	* AUTHORS, ChangeLog.2004: Change bpalmer's email address as
-	requested.
-
-	* CREDITS: Add everyone who is mentioned in the ChangeLogs.
-
-	* debian/copyright (Copyright): Add last few people.  This can now
-	be considered a complete list, as far as CVS entries are
-	concerned.  If people have assigned copyright to the FSF, merge
-	them with the entry for the FSF.
-
-	* debian/README.Debian: Add entry for XEmacs-related change in
-	`erc-track.el'.
-
-	* erc.el (erc-cmd-MODE): New command that changes or displays the
-	mode for a channel or user.  The functionality was present before
-	this change, but there was no documentation for it.
-
-	* erc-auto.in, erc-*.el: Fully investigate copyright headers and
-	change them appropriately.  If a file has been pulled off of
-	erc.el at one time, keep track of copyright from the time of
-	separation, but not before.  If a file has been derived from a
-	work outside of erc, keep copyright statements in place.
-
-	* Makefile (VERSION): Change to 5.0! :^) Congrats on all the great
-	work.  I'll wait until hober commits his XEmacs compatibility
-	patch to erc-track.el, and then release.
-	(distclean): Alias for `realclean' target.
-
-2005-01-07  Michael Olson  <mwolson@gnu.org>
-
-	* AUTHORS: Add Marcelo Toledo, who has CVS access to this project.
-
-	* ChangeLog.2004: Add my name to my one contribution to erc last
-	year.
-
-	* CREDITS: Add people that were discovered while scouring
-	ChangeLogs.
-
-	* debian/copyright: Add everyone from `AUTHORS' to Upstream
-	Authors.  Anyone who has contributed 15 or more lines of
-	code (according to ChangeLogs) is listed in Copyright section.
-	Accurate years are included.
-
-	* debian/README.Debian: Paste content of NEWS and reformat
-	slightly.
-
-	* debian/rules: Concatenate the ChangeLogs during the Debian
-	install process and then gzip them.
-
-	* Makefile (MISC): Add ChangeLog.yyyy files to list.
-	(ChangeLog): Remove rule since we do not dynamically generate the
-	ChangeLog anymore.
-
-	* MkChangeLog: Removed since we do not use it to generate the
-	ChangeLog anymore.  cvs2cl does a much better job anyway.
-
-	* NEWS: Use 3rd level heading instead of bullets for lists that
-	contain descriptions.
-
-2005-01-07  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-list.el: Require 'sort.
-	(erc-chanlist): Disable undo in the channel list buffer.
-
-	* erc.el, erc-menu.el: The `IRC' menu is now automatically added
-	to the menu-bar.  Add the call to `easy-menu-add' to
-	`erc-mode-hook' when running in XEmacs (without this the menu
-	doesn't appear).
-
-	* NEWS: Added the information from
-	http://emacswiki.org/cgi-bin/wiki/ErcCvsFeatures and the newer
-	changes which weren't yet documented on that page.
-
-2005-01-06  Hoan Ton-That  <hoan@ton-that.org>
-
-	* erc-log.el (erc-current-logfile): Only downcase the logfile
-	name, not the whole filename.  Also expand relative to
-	`erc-log-channels-directory'.
-	(erc-generate-log-file-name-with-date)
-	(erc-generate-log-file-name-short)
-	(erc-generate-log-file-name-long): Don't expand filename, done in
-	`erc-current-logfile'.
-
-2005-01-06  Lawrence Mitchell  <wence@gmx.li>
-
-	* NEWS: New file, details user visible changes from version to
-	version.
-
-	* HACKING (NEWS entries): Mention NEWS file, and what its purpose
-	is.
-
-2005-01-05  Michael Olson  <mwolson@gnu.org>
-
-	* FOR-RELEASE: New file containing the list of release-critical
-	tasks.  Feel free to add to it.
-
-	* debian/rules (binary-erc): Add ChangeLog files.
-
-2005-01-04  Michael Olson  <mwolson@gnu.org>
-
-	* ChangeLog.2001, ChangeLog.2002, ChangeLog.2003, ChangeLog.2004:
-	ChangeLog entries from previous years.
-
-	* ChangeLog: New file containing ChangeLog entries for the current
-	year.  Please update this file manually whenever a change is
-	committed.  This is a new policy.
-
-	* AUTHORS: Add myself to list.  Some entries were space-delimited
-	instead of TAB-delimited, and since the latter seemed to be the
-	default, make the other entries conform.
-
-	* HACKING (ChangeLog Entries): Update section to reflect new
-	policy toward ChangeLog entries, which is that they should be
-	manually updated whenever a change is committed.
-
-2005-01-04  Diane Murray <disumu@x3y2z1.net>
-
-	* erc.el (erc-connection-established, erc-login): Update the
-	mode-line.
-	(erc-update-mode-line-buffer): If `erc-current-nick' returns nil,
-	use an empty string for ?n character in format spec.  Set
-	`mode-line-process' to ":connecting" while the connection is being
-	established.
-
-2005-01-04  Lawrence Mitchell <wence@gmx.li>
-
-	* AUTHORS: Update list of authors.
-
-2005-01-02  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-goodies.el (erc-control-characters): New customization
-	group.
-	(erc-interpret-controls-p): Small fix, addition to
-	documentation. Updated customization to allow 'remove as a value.
-	Use 'erc-control-characters as `:group'.
-	(erc-interpret-mirc-color): Use 'erc-control-characters as
-	`:group'.
-	(erc-beep-p): Updated documentation.  Use 'erc-control-characters
-	as `:group'.
-	(define-erc-module irccontrols): Add `erc-controls-highlight' to
-	`erc-insert-modify-hook' and `erc-send-modify-hook' since it
-	changes the text's appearance.
-	(erc-controls-remove-regexp, erc-controls-interpret-regexp): New
-	variables.
-	(erc-controls-highlight): Fixed so that highlighting works even if
-	there is no following control character.  Fixed mirc color
-	highlighting; now respecting `erc-interpret-mirc-color'.  Fixed a
-	bug where emacs would get stuck in a loop when \C-g was in a
-	message and `erc-beep-p' was set to nil (default setting).
+;; arch-tag: cceaf370-9880-4031-842b-223ab2bb597d

FOR-RELEASE.upstream

 Tasks that need to be accomplished in order for a release to happen.
 
-* Stability
+* 5.1 release
 
+** [DONE] Documentation
 
-* Debian
+*** ERC's manual needs collaborative effort.
+Some conditions follow.
 
-** Copyright
+Manual text can be based off of pages from EmacsWiki.org, but must be
+rewritten.  As long as they're not too close to being word-for-word,
+you should be okay.
 
-Which authors should be included in `debian/copyright' as upstream
-authors?  Which should be given copyright notices?
+Contributors to the documentation must have assigned future copyright
+for ERC or Emacs.  No separate manual assignment is needed in this
+case.  If you haven't assigned future changes and would like to work
+on the manual, contact mwolson@gnu.org.
 
-** News
+*** Search for "@c PRE5_1" to see what needs to be done before the
+5.1 release.
 
-What are the most important user-visible changes since 2004-09-13?
-These should be added to `debian/README.debian'.
+Please add your name in brackets after "PRE5_1" in the comment if you
+wish to work an item in the short term.
+
+** [DONE] Makefile
+
+*** install target needed.
+This could look at the following new variables.  ELISPDIR determines
+where to install ERC.  INFODIR is where manual will be installed.
+
+PREFIX   = /usr/local
+ELISPDIR = $(PREFIX)/share/emacs/site-lisp/erc
+INFODIR  = $(PREFIX)/info
+
+*** install-info target needed.
+Something like the following would work.
+
+%.info: %.texi
+	makeinfo $<
+
+install-info: muse.info
+	[ -d $(INFODIR) ] || install -d $(INFODIR)
+	install -m 0644 muse.info $(INFODIR)/muse
+	$(INSTALLINFO) $(INFODIR)/muse
+
+** [DONE] NEWS: Update for changes since 5.0.4.
+
+** [DONE] Source
+
+*** Remove dependency on cl package.
+(eval-when-compile (require 'cl)) is acceptable.
+
+* 5.2 release (future)
+
+** Documentation
+
+*** Items with "@c PRE5_2" won't block the 5.1 release, but may block
+the release of 5.2.
+
+** Source
+
+*** Make erc-backend not need to (require) any other part of ERC.
+This will hopefully increase the chance that it will be useful for
+other IRC clients, like Circe.
+
+*** Add binding for S-TAB (backtab) that moves backwards by link.
 
 
 Local variables:
-History of Emacs IRC Client development:
-----------------------------------------
+History of ERC development:
+---------------------------
 
 ERC was originally written by Alexander L. Belikoff (abel@bfr.co.il) and
 Sergey Berezin (sergey.berezin@cs.cmu.edu).  They stopped development
 
 
 VERSION = 0.19
-AUTHOR_VERSION = Version 5.0 Revision: 1.776
+AUTHOR_VERSION = Version 5.1.1 Revision: 1.796.2.3
 MAINTAINER = Adrian Aichner <adrian@xemacs.org>
 PACKAGE = erc
 PKG_TYPE = regular
 DATA_FILES = AUTHORS CREDITS HISTORY NEWS README servers.pl
 DATA_DEST = $(PACKAGE)
 
+# As of upstream -r release_5_1_branch
+STANDARD_DOCS = t
+
 include ../../XEmacs.rules

Makefile.upstream

-VERSION=5.1
+VERSION=5.1.1
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.0.4-2
+LASTUPLOAD = 5.1.1-2
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
 ALLSOURCE = $(wildcard *.el)
 SOURCE	= $(filter-out $(SPECIAL) $(UNCOMPILED) $(TESTING),$(ALLSOURCE))
 TARGET	= $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
+MANUAL  = erc
 MISC	= AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
-		ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
-		ChangeLog.2001 servers.pl erc-auto.in
-EMACS   = emacs
+		ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
+		ChangeLog.2001 servers.pl erc-auto.in erc.texi
 
-all: $(TARGET)
+EMACS       = emacs
+SITEFLAG    = --no-site-file
+
+PREFIX   = /usr/local
+ELISPDIR = $(PREFIX)/share/emacs/site-lisp/erc
+INFODIR  = $(PREFIX)/info
+
+# XEmacs users will probably want the following settings.
+#EMACS    = xemacs
+#SITEFLAG = -no-site-file
+
+INSTALLINFO = install-info --info-dir=$(INFODIR)
+
+# If you're using Debian, uncomment the following line and comment out
+#the above line.
+#INSTALLINFO = install-info --section "Emacs" "emacs" --info-dir=$(INFODIR)
+
+all: lisp $(MANUAL).info
+
+lisp: $(TARGET) 
 
 autoloads: erc-auto.el
 
 erc-auto.el: erc-auto.in $(SOURCE)
 	cp erc-auto.in erc-auto.el
 	rm -f erc-auto.elc
-	$(EMACS) --no-init-file --no-site-file -batch \
+	@$(EMACS) -q $(SITEFLAG) -batch \
 		-l $(shell pwd | sed -e 's|^/cygdrive/\([a-z]\)|\1:|')/erc-auto \
-		-f generate-autoloads \
+		-f erc-generate-autoloads \
 		$(shell pwd | sed -e 's|^/cygdrive/\([a-z]\)|\1:|')/erc-auto.el .
 
 %.elc: %.el
-	$(EMACS) --no-init-file --no-site-file -batch \
+	@$(EMACS) -q $(SITEFLAG) -batch \
 		-l $(shell pwd | sed -e 's|^/cygdrive/\([a-z]\)|\1:|')/erc-maint \
 		-f batch-byte-compile $<
 
+%.info: %.texi
+	makeinfo $<
+
+%.html: %.texi
+	makeinfo --html --no-split $<
+
+doc: $(MANUAL).info $(MANUAL).html
+
 clean:
 	-rm -f *~ *.elc
 
 realclean: clean
-	-rm -f $(TARGET) $(SPECIAL)
+	-rm -f $(MANUAL).info $(MANUAL).html $(TARGET) $(SPECIAL)
+
+install-info: $(MANUAL).info
+	[ -d $(INFODIR) ] || install -d $(INFODIR)
+	install -m 0644 $(MANUAL).info $(INFODIR)/$(MANUAL)
+	$(INSTALLINFO) $(INFODIR)/$(MANUAL)
+
+install-bin: lisp
+	install -d $(ELISPDIR)
+	install -m 0644 $(ALLSOURCE) $(TARGET) $(ELISPDIR)
+
+install: install-bin install-info
 
 distclean:
-	-rm -f $(TARGET)
+	-rm -f $(MANUAL).info $(MANUAL).html $(TARGET)
 	-rm -Rf ../$(SNAPDIR)
 
-debrelease: $(ALLSOURCE) $(SPECIAL) distclean
+debprepare: $(ALLSOURCE) $(SPECIAL) distclean
 	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
 	cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
+	cp -r images ../$(SNAPDIR)
+	test -d ../$(SNAPDIR)/images/.arch-ids && rm -R \
+	  ../$(SNAPDIR)/images/.arch-ids || :
+	test -d ../$(SNAPDIR)/images/CVS && rm -R \
+	  ../$(SNAPDIR)/images/.arch-ids || :
+
+debbuild:
+	(cd ../$(SNAPDIR) && \
+	  dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
+	    -us -uc -rfakeroot && \
+	  echo "Running lintian ..." && \
+	  lintian -i ../erc_$(VERSION)*.deb || : && \
+	  echo "Done running lintian." && \
+	  debsign)
+
+debrelease: debprepare
 	(cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
 	cp -R debian ../$(SNAPDIR)
 	test -d ../$(SNAPDIR)/debian/CVS && rm -R \
 	  ../$(SNAPDIR)/debian/.arch-ids \
 	  ../$(SNAPDIR)/debian/maint/.arch-ids \
 	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
-	(cd ../$(SNAPDIR) && \
-	  dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
-	    -us -uc -rfakeroot && \
-	  echo "Running lintian ..." && \
-	  lintian -i ../erc_$(VERSION)*.deb || : && \
-	  echo "Done running lintian." && \
-	  debsign)
+	$(MAKE) debbuild
+
+debrevision-mwolson:
+	-rm -f ../../dist/erc_*
+	-rm -f ../erc_$(VERSION)-*
+	-rm -fr ../erc-$(VERSION)
+	$(MAKE) debprepare
+	cp -R debian ../$(SNAPDIR)
+	test -d ../$(SNAPDIR)/debian/CVS && rm -R \
+	  ../$(SNAPDIR)/debian/CVS \
+	  ../$(SNAPDIR)/debian/maint/CVS \
+	  ../$(SNAPDIR)/debian/scripts/CVS || :
+	test -d ../$(SNAPDIR)/debian/.arch-ids && rm -R \
+	  ../$(SNAPDIR)/debian/.arch-ids \
+	  ../$(SNAPDIR)/debian/maint/.arch-ids \
+	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
+	$(MAKE) debbuild
+	cp ../erc_$(VERSION)* ../../dist
 
 debrelease-mwolson:
 	-rm -f ../../dist/erc_*
 release: autoloads distclean
 	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
 	cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../erc-$(VERSION)
+	cp -r images ../erc-$(VERSION)
+	test -d ../$(SNAPDIR)/images/CVS && \
+	  rm -R ../$(SNAPDIR)/images/CVS || :
+	test -d ../$(SNAPDIR)/images/.arch-ids && \
+	  rm -R ../$(SNAPDIR)/images/.arch-ids || :
 	(cd .. && tar czf erc-$(VERSION).tar.gz erc-$(VERSION)/*; \
 	  zip -r erc-$(VERSION).zip erc-$(VERSION))
 
-todo:	erc.elc
-
 upload:
 	(cd .. && echo open ftp://upload.sourceforge.net > upload.lftp ; \
 	  echo cd /incoming >> upload.lftp ; \
 ERC NEWS                                                       -*- outline -*-
 
-* Fixes since ERC 5.0.3
+* Changes in ERC 5.1.2
+
+** Go back to using ssl.el so that SSL connections work as expected.
+Connecting with `open-tls-stream' only seems to work (if at all?) when
+using the tls.el located in lisp/net/ in Emacs22.
+
+** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
+
+** Move to end of prompt when ERC reconnects to a server.
+
+** Changes and additions to modules
+
+*** Spell-checking (erc-spelling.el)
+
+**** Don't spell-check nicks or words that are prefixed with '/'.
+
+**** Remove flyspell properties from words we shouldn't spell-check.
+
+**** Fix an issue that caused the ispell process to reload every time
+we switch to an ERC buffer.
+
+*** Timestamps (erc-stamp.el)
+
+**** Fix an inconsistency in calculating width of right timestamps.
+
+**** Rename option `erc-timestamp-right-align-by-pixel' to
+`erc-timestamp-use-align-to'.  This controls whether to use the more
+fail-proof method of aligning right timestamps, as mentioned below.
+
+**** Fix a right timestamp spacing problem that used to occur when
+erc-stamp.el was byte-compiled.  Now that this is fixed, it is safe to
+use the method that aligns right timestamps perfectly in Emacs22 with
+X.  If the current version of Emacs doesn't support this method, use
+the simpler method, which is prone to alignment issues for math
+symbols and other variable-width text.
+
+A side effect of using this new method is that there will only be one
+space before a right timestamp in any saved logs.  If this is
+unacceptable, set `erc-timestamp-use-align-to' to nil.
+
+* Changes in ERC 5.1.1
+
+** Fix a requirement on cl.el.
+
+** Use tls.el for SSL connections, rather than ssl.el.
+
+** Changes and additions to modules
+
+*** ibuffer integration (erc-ibuffer.el)
+
+**** Update this to work with the version of ibuffer.el that comes with
+recent Emacs variants.
+
+*** Old completion (erc-complete.el)
+
+**** Fix a few errors.
+
+*** Speedbar (erc-speedbar.el)
+
+**** Make this work with the version of speedbar.el that comes with
+recent Emacs variants.
+
+*** Timestamps (erc-stamp.el)
+