From MAILER-DAEMON Wed Oct 01 02:31:25 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1KkvF6-0005TG-T1
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KkvF5-0005Sv-IF
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KkvF4-0005SV-HS
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:23 -0400
Received: from [199.232.76.173] (port=44433 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KkvF4-0005SP-8N
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:22 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:44802)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1KkvF3-0003bh-Ia
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:21 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1KkvF2-0000Bz-9A
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:20 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1KkvEy-0008Pz-AU
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:17 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 30 Sep 2008 20:50:56 -0700
To: erc-commit@gnu.org
Message-Id: <E1KkvEy-0008Pz-AU@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] Spelling fixes from Emacs 23.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 06:31:23 -0000

---
 ChangeLog.01 |   34 +++++++++++++++++-----------------
 ChangeLog.02 |   34 +++++++++++++++++-----------------
 ChangeLog.03 |   32 ++++++++++++++++----------------
 ChangeLog.04 |   10 +++++-----
 ChangeLog.05 |    2 +-
 5 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/ChangeLog.01 b/ChangeLog.01
index 0b31478..2e8a0b0 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -129,7 +129,7 @@
 	  It uses a list as internal representation now, so all silly string-parsing
 	  related bugs should be gone.
 	  Use (erc-track-modified-channels-minor-mode t) now to toggle this functionality.
-	  Dont set the erc-track-modified-channels-minor-mode variable yourself, use the toggle function
+	  Don't set the erc-track-modified-channels-minor-mode variable yourself, use the toggle function
 
 2001-11-29  Gergely Nagy  <algernon@debian.org>
 
@@ -226,7 +226,7 @@
 2001-11-23  Mario Lang  <mlang@delysid.org>
 
 	* erc-bbdb.el 1.6:
-	* new function erc-BBDB-NICK to handle nickname anotation on a nick-change event of a known record
+	* new function erc-BBDB-NICK to handle nickname annotation on a nick-change event of a known record
 
 	* erc.el 1.148: * Remove erc-rename-buffer, its no longer necessary
 	* Remove erc-autoop-*. it was broken, and needed rewrite anyway
@@ -337,7 +337,7 @@
 	* erc.el 1.129: fixed it
 
 	* erc.el 1.128:
-	*** We switched over. New server message parsing/handling is running now. Thansk to the zenirc developers for the great ideas I got from the code!!!!! Go and test it, poke at it, bug me on irc about problems
+	*** We switched over. New server message parsing/handling is running now. Thanks to the zenirc developers for the great ideas I got from the code!!!!! Go and test it, poke at it, bug me on irc about problems
 
 	* erc.el 1.127: *** empty log message ***
 
@@ -367,7 +367,7 @@
 	  Now, all the server word replies are finished. Going to numreplies now
 
 	* erc.el 1.119:
-	* debugging fascilities for the transition. C-x 2 C-x o M-x ielm RET erc-server-vectors RET ; to get a list of all server messages currently not handled in the new code. Feel free to pick one and implement it
+	* debugging facilities for the transition. C-x 2 C-x o M-x ielm RET erc-server-vectors RET ; to get a list of all server messages currently not handled in the new code. Feel free to pick one and implement it
 
 	* erc.el 1.118: * erc-server-KICK and erc-server-TOPIC. new functions
 	* erc-server-305-or-306 and erc-server-311-or-314
@@ -431,10 +431,10 @@
 	* erc.el 1.100:
 	* added second timestamp-format (erc-away-timestamp-format) for marking msgs when being away
 
-	* erc-complete.el 1.2: fixed silly deffun
+	* erc-complete.el 1.2: fixed silly defun
 
 	* erc.el 1.99: * Rewrote erc-load-irc-script (simplified)
-	* Removed depricated code
+	* Removed deprecated code
 
 	* erc-speak.el 1.15: * reflect changes in erc.el
 
@@ -457,14 +457,14 @@
 	* erc.el 1.95: * Reduction patch 2
 	  This time, we move the input ring handling into erc-ring.el
 	  Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
-	  And remeber, that you dont need it if you dont use input ring :-)
+	  And remeber, that you don't need it if you don't use input ring :-)
 
 	* erc-ring.el 1.1: * Initial checkin
 
 	* erc.el 1.94: * The great reduction patch :-)
 	  moved relevant function from erc.el to new file erc-menu.el and erc-imenu.el
 
-	* erc-imenu.el 1.1: nitial version
+	* erc-imenu.el 1.1: Initial version
 
 	* erc-menu.el 1.1: * Initial version
 
@@ -495,7 +495,7 @@
 
 	* erc.el 1.88:
 	* Changed timestamping when away to use erc-timestamp-format and append the timestamp instead of prepending it..
-	* minor cleanup, s/(if (not /(unless/ and thelike
+	* minor cleanup, s/(if (not /(unless/ and the like
 
 2001-11-06  Tijs van Bakel  <smoke@wanadoo.nl>
 
@@ -521,7 +521,7 @@
 	Renamed erc-message-notices to erc-minibuffer-notice, and renamed erc-prevent-minibuffer-privmsg to erc-minibuffer-privmsg, inverting its functionality
 
 	* erc.el 1.81: Added support for channel names starting with & + and !.
-	Also, many changes partially discussed on the mailinglist:
+	Also, many changes partially discussed on the mailing list:
 
 		* erc.el (cl): Add requirement for cl package.
 		(erc-buffer-list): Make this variable global again.
@@ -626,7 +626,7 @@
 
 	* erc-speak.el 1.14:
 	* Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, 
-	  especially if you are on more than one channel simultaniously.
+	  especially if you are on more than one channel simultaneously.
 
 	* erc.el 1.75:
 	* Made the completion postfix customizable through erc-nick-completion-postfix
@@ -643,7 +643,7 @@
 	* Removed now really obsolete code. Package size reduced by 50%
 
 	* erc-speak.el 1.10:
-	* Very important fix! Now erc-speak is really complete. Messages dont get cut anymore. Be sure to use auditory icons, 
+	* Very important fix! Now erc-speak is really complete. Messages don't get cut anymore. Be sure to use auditory icons, 
 	  it's reallllly cool now!!!
 
 	* erc-speak.el 1.9: *** empty log message ***
@@ -795,7 +795,7 @@
 2001-09-26  Mario Lang  <mlang@delysid.org>
 
 	* erc.el 1.54: * Fixed completion (alex)
-	  * Now popup buffer doesnt destroy your window configuration.
+	  * Now popup buffer doesn't destroy your window configuration.
 	* Fixed away handling (incomplete)
 
 2001-09-24  Mario Lang  <mlang@delysid.org>
@@ -816,7 +816,7 @@
 2001-09-20  Mario Lang  <mlang@delysid.org>
 
 	* erc.el 1.50:
-	* Fix (erc-cmd-names): This should fix C-c C-n too, hoepfully it was the right fix and doesnt break anything else.
+	* Fix (erc-cmd-names): This should fix C-c C-n too, hopefully it was the right fix and doesn't break anything else.
 
 	* erc.el 1.49: * Fixes XEmacs easymenu usage (2nd time).
 
@@ -859,7 +859,7 @@
 2001-08-07  Mario Lang  <mlang@delysid.org>
 
 	* erc.el 1.41:
-	Checked in lathis code and modified it slightly. Still unsure about set-window-buffer advice, current attempt doesnt seem to work.
+	Checked in lathis code and modified it slightly. Still unsure about set-window-buffer advice, current attempt doesn't seem to work.
 	Removed (nick -> #channel) from mode-line. (CLOSED) and (AWAY...) should still be displayed when appropriate
 
 2001-08-06  Mario Lang  <mlang@delysid.org>
@@ -909,7 +909,7 @@
 2001-07-26  Mario Lang  <mlang@delysid.org>
 
 	* erc.el 1.29:
-	fixed one occurence of a setq with only one argument (XEmacs didnt like that)
+	fixed one occurence of a setq with only one argument (XEmacs didn't like that)
 
 	* erc.el 1.28:
 	Added erc-next-line-add-newlines customisation possibility.
@@ -1001,7 +1001,7 @@
 	Insert (erc-current-nick) instead of (erc-display-prompt). good night :)
 
 	* erc.el 1.9:
-	small, but it was anoying, so I just did it (defcustom for erc-join-buffer and erc-join-info-buffer)
+	small, but it was annoying, so I just did it (defcustom for erc-join-buffer and erc-join-info-buffer)
 
 2001-06-29  Alex Schroeder  <alex@gnu.org>
 
diff --git a/ChangeLog.02 b/ChangeLog.02
index cf47994..f78f225 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -953,7 +953,7 @@
 
 	* erc-pcomplete.el 1.11: * Fix emacs/xemacs compatibility
 
-	* debian/scripts/install 1.10: * Dont compile erc-compat, fix ELCDIR
+	* debian/scripts/install 1.10: * Don't compile erc-compat, fix ELCDIR
 
 	* debian/control 1.5: * Change maintainer field
 
@@ -1080,13 +1080,13 @@
 	2) (misfeature) ERC notices the user in the minibuffer when it
 	   ignores something - this can get very annoying, since the
 	   minibuffer is also visible when not looking at ERC buffers.
-	   Added a customizeable variable for this, the default is nil.
+	   Added a customizable variable for this, the default is nil.
 	3) (wishlist) There is no IGNORE or UNIGNORE command.
 	   Added.
 	4) (wishlist) Some IRC clients, notably irssi, allow the user to
 	   ignore "replies" to ignored people. A reply is defined as a
 	   line starting with "nick:", where nick is the nick of an
-	   ignored person. Added that functionaly.
+	   ignored person. Added that functionality.
 	Done by Jorgen Schaefer <forcer@forcix.cx>
 
 2002-11-02  Alex Schroeder  <alex@gnu.org>
@@ -1198,7 +1198,7 @@
 	(erc-stamp-disable): Renamed erc-stamp-destroy.
 	(erc-timestamp-mode): Use new names.
 
-	* erc.el 1.300: Removed autload for erc-complete and
+	* erc.el 1.300: Removed autoload for erc-complete and
 	erc-track-modified-channels-mode -- the autoload cookie should do
 	that instead.
 	(erc-input-message): Doc string, removed binding for erc-complete.
@@ -1456,7 +1456,7 @@
 
 2002-06-17  Diane Murray  <disumu@x3y2z1.net>
 
-	* erc.el 1.287: * added beginning suport for 005 numerics:
+	* erc.el 1.287: * added beginning support for 005 numerics:
 	  - added buffer local variable erc-server-parameters
 	  - added erc-server-005, which sets erc-server-parameters if the server has
 	    used this code to show its parameters
@@ -1534,7 +1534,7 @@
 	* erc.el 1.283:
 	* added erc-set-channel-limit, erc-set-channel-key, erc-toggle-channel-mode
 
-	* added erc-get-channel-mode-from-keypress, which is binded to C-c m
+	* added erc-get-channel-mode-from-keypress, which is bound to C-c m
 	  sends the next character which is typed to one of the 3 new functions
 	  - did not remove erc-invite-only-mode and it's key binding in case
 	    people are used to it, although it probably should be removed...
@@ -1756,7 +1756,7 @@
 	  - added variable erc-whowas-on-nosuchnick
 	  - in erc-server-401 do WHOWAS if erc-whowas-on-nosuchnick is non-nil
 
-	* erc.el 1.267: forgot documentaion for erc-nickserv-alist
+	* erc.el 1.267: forgot documentation for erc-nickserv-alist
 
 	* erc.el 1.266: NickServ identification changed and enhanced:
 	- erc-nickserv-identify-autodetect now called from erc-server-NOTICE-hook
@@ -1777,7 +1777,7 @@
 	  - in erc-fill-variable: set fill-column to value of erc-fill-column
 
 	* erc.el 1.265: erc.el:
-	* fixed bug where topic wasn't being set when chanel name was provided
+	* fixed bug where topic wasn't being set when channel name was provided
 
 	erc-fill.el:
 	* filling with erc-fill-variable now works with custom defined fill width:
@@ -1946,7 +1946,7 @@
 	* erc-chess.el 1.5: more fixing.
 
 	Now, the 'match question works. It sends an accept back.
-	But display popup doesnt work..
+	But display popup doesn't work..
 
 	* erc-chess.el 1.4: fixup (still far from working)
 
@@ -1978,7 +1978,7 @@
 	fixup release, far from ready for real usage, but it appears to work.
 
 	* erc.el 1.242:
-	speed improvments based on elp-instrument-package RET erc- RET results
+	speed improvements based on elp-instrument-package RET erc- RET results
 
 	* erc-chess.el 1.1: initial version.
 	please test it
@@ -1988,7 +1988,7 @@
 
 	(as usual, blank password)
 
-	Add the resulting dir to your load-path and reqire erc-chess.
+	Add the resulting dir to your load-path and require erc-chess.
 
 	Usage: Just do /chess nickname
 	The remote end much use erc, as no other irc client I know of supports this ...
@@ -2070,7 +2070,7 @@
 
 	* erc-track.el 1.4:
 	experimental: Added face support to mode-line channel activity tracker.
-	Currently we use the faces used for indicating in the buffer (erc-pal-face for channels with pal acitivity...)
+	Currently we use the faces used for indicating in the buffer (erc-pal-face for channels with pal activity...)
 
 2002-03-05  Mario Lang  <mlang@delysid.org>
 
@@ -2084,12 +2084,12 @@
 
 	* erc-track.el 1.2: Implemented channel name shortening.
 	Vars erc-track-cutoff says: all channel names longer than this will be shortened.
-	Var erc-track-minimum-channel-length says: dont make names shorten than this.
+	Var erc-track-minimum-channel-length says: don't make names shorten than this.
 	(Thanks go out to kensanata for the nice unique-substrings utility function).
 
 	* erc.el 1.233: silly typo corrected
 
-	* erc.el 1.232:	* erc.el 1.232: * New varialbe: erc-common-server-name-suffixes
+	* erc.el 1.232:	* erc.el 1.232: * New variable: erc-common-server-name-suffixes
 	  This alist can be used to change the server names displayed in mode-line
 	  to a shorter version..
 	* New function: erc-shorten-server-name (uses var above)
@@ -2169,7 +2169,7 @@
 	Demonstrates how the new hook system can be nicely used.
 
 	* erc.el 1.221:
-	new hook: erc-default-server-hook. This one gets called if we dont have anything defined for a certain IRC server message.
+	new hook: erc-default-server-hook. This one gets called if we don't have anything defined for a certain IRC server message.
 	New function: erc-default-server-handler. (used by above hook).
 	New function: erc-debug-missing-hooks: Used by above hook to save a list of unimplemented server messages.
 	New function: erc-server-buffer, erc-server-buffer-p.
@@ -2311,7 +2311,7 @@
 
 	* erc.el 1.204: Use nreverse instead of reverse.
 	Use eq instead of equal where possible.
-	Rewrote erc-get-buffer to not use find-if (find-if does very deep function-call nesting, which isnt good ina  defun which is called so often)
+	Rewrote erc-get-buffer to not use find-if (find-if does very deep function-call nesting, which isn't good in a defun which is called so often)
 
 2002-02-13  Mario Lang  <mlang@delysid.org>
 
@@ -2339,7 +2339,7 @@
 
 	* servers.pl 1.1:
 	Script to convert mircs servers.ini to a elisp salist kind of thing.
-	(development tool, it doesnt help you much as a user)
+	(development tool, it doesn't help you much as a user)
 
 	* erc.el 1.201:
 	* erc-display-line-buffer: renamed to erc-display-line-1
diff --git a/ChangeLog.03 b/ChangeLog.03
index ddc8a56..60be5f1 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -347,7 +347,7 @@
 	Fix paren-in-column-zero bug in docstring.
 	Add a sort of bogus, but still better :type.
 	Add autojoin and netsplit by default.
-	(erc-update-modules): Dont barf with an error if `require' fails.
+	(erc-update-modules): Don't barf with an error if `require' fails.
 	We can still error out if the mode is not defined.
 
 2003-08-31  Andreas Fuchs  <asf@void.at>
@@ -579,7 +579,7 @@
 	    This no longer raises a bad-syntax error - was this a catch-all to stop a
 	    backtrace? Does it belong?
 	(erc-cmd-APPENDTOPIC): the correct way to display help when you want to
-	    accept an abitrary string is to (signal 'wrong-number-of-arguments nil).
+	    accept an arbitrary string is to (signal 'wrong-number-of-arguments nil).
 	    This fixes a bug where people could not /at topics with a space in them.
 
 2003-06-09  Damien Elmes  <erc@repose.cx>
@@ -657,7 +657,7 @@
 
 	* erc-truncate.el 1.2: remove require of erc-log
 	(erc-truncate-buffer-to-size): use erc-save-buffer-in-logs when it's
-	there, else, dont.
+	there, else, don't.
 
 2003-04-29  Andreas Fuchs  <asf@void.at>
 
@@ -821,7 +821,7 @@
 	  of user friendliness.
 	(define-erc-module): the enable and disable routines now update erc-modules
 	    accordingly
-	erc-modules: new variable controllig the modules which erc has loaded/will
+	erc-modules: new variable controlling the modules which erc has loaded/will
 	    load. when customising, it will automatically enable modules. it won't
 	    automatically disable modules which are removed, yet.
 	(erc-update-modules): enable all modules in `erc-modules'
@@ -1036,7 +1036,7 @@
 	notify the user we're trying to connect when using asych
 	    connections
 
-	* erc.el 1.486 (erc-connect): support an asyncronous connection
+	* erc.el 1.486 (erc-connect): support an asynchronous connection
 	(erc-process-sentinel): ditto
 
 	* erc-track.el 1.48:
@@ -1048,7 +1048,7 @@
 	    a command
 
 	* erc.el 1.484: (erc-save-buffer-in-logs):
-	    - check for a sensibile region before saving the buffer. if the
+	    - check for a sensible region before saving the buffer. if the
 	      connection process is killed early on, there is not a sensible region
 	      to save
 	    - don't set buffer-file-name on save. we don't need it, and it means we
@@ -1363,7 +1363,7 @@
 	again.
 	(erc): Require cl for delete-if.
 	(erc-button-remove-old-buttons): Rewrote using delete-if to
-	prevent exceesive consing.  Having the marker list is still ugly,
+	prevent excesive consing.  Having the marker list is still ugly,
 	so another solution needs to be found.
 
 2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
@@ -1388,7 +1388,7 @@
 	* erc.el 1.454: erc-banlist-*: return nil so further hooks are called
 
 	* erc.el 1.453 (erc-server-368):
-	supress "end of ban list" messages - use /listbans now
+	suppress "end of ban list" messages - use /listbans now
 
 	* erc.el 1.452 (erc-send-current-line):
 	removed the check for leading whitespace again - the
@@ -1411,7 +1411,7 @@
 
 	* erc.el 1.448:
 	* (erc-remove-channel-member): Do not use delq, modify the list using setcdr like delq does.
-	In theory, this should be way faster since the list doesnt get traverse two times.
+	In theory, this should be way faster since the list doesn't get traverse two times.
 	Measurement didn't show any real difference though :(, this system is flawed for channels with >300 users it seems...
 	Also moved some defcustoms up.
 
@@ -1475,7 +1475,7 @@
 	* erc.el 1.441:
 	erc-error-face: setting a background doesn't work so well with multi-line
 	    messages, so we don't. fg color is negotiable ;-)
-	(erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it
+	(erc-cmd-QUERY): fixed, new doco, suppress (erc-delete-query) until we fix it
 	(erc-send-current-line): allow multi-line messages provided they don't start
 	    with a slash - there's no need to prohibit them if the slash isn't the
 	    first character
@@ -1484,7 +1484,7 @@
 	* bunch of extra cmds fixed, nick, sv etc.
 
 	* erc.el 1.439 (erc-cmd-HELP): fixed
-	(erc-extract-command-from-line): when deterimining canon-defun, make sure we
+	(erc-extract-command-from-line): when determining canon-defun, make sure we
 	    have a valid symbol
 	(erc-cmd-KICK): fixed
 
@@ -1572,13 +1572,13 @@
 	do appropriate comparisons, simplified.
 	* (erc-dcc-list-add): New functions
 	various callers of (cons (list ...) erc-dcc-list) updated.
-	Other stuff I'm to bored to document now
+	Other stuff I'm too bored to document now
 
 2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
 
 	* erc-stamp.el 1.24 (erc-insert-timestamp-right):
 	Removed redundant code that overrid the
-	window-width. Now substracts (length string) from every found
+	window-width. Now subtracts (length string) from every found
 	indentation positions.
 
 2003-01-14  Mario Lang  <mlang@delysid.org>
@@ -1734,7 +1734,7 @@
 	(erc-notify-NICK): Changed to make it IRC-case-insensitive when comparing nicks.
 	(erc-notify-QUIT): Changed to make it IRC-case-insensitive when comparing nicks.
 	(erc-cmd-NOTIFY): Now "/notify -l" lists the nicks on your notify list.  Now
-	    when you remove a nick from your notify list, you no longer recieve a spurious
+	    when you remove a nick from your notify list, you no longer receive a spurious
 	    signoff notification for that nick.  Changed to make it IRC-case-insensitive when
 	    comparing nicks.
 
@@ -1934,7 +1934,7 @@
 
 	* erc-dcc.el 1.21 (erc-dcc-chat): Add docstring
 	Add self-test.
-	Fix error if /dcc chat nick doesnt find the nick
+	Fix error if /dcc chat nick doesn't find the nick
 
 2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
 
@@ -2097,7 +2097,7 @@
 	* erc-dcc.el 1.2: make /dcc LIST work
 
 	* erc-dcc.el 1.1:
-	Initial checkin, dont use it!  its really far from complete.  Hackers: help!
+	Initial checkin, don't use it!  its really far from complete.  Hackers: help!
 
 	* erc-notify.el 1.11:
 	New function erc-notify-NICK, and added signon/off hooks which were missing
diff --git a/ChangeLog.04 b/ChangeLog.04
index 9f3ab85..0613f8b 100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@ -739,7 +739,7 @@
 
 	* erc.el, erc-backend.el (erc-cmd-BANLIST): Added a missing "'"
 	that was preventing /BANLIST from working.  In erc-backend.el,
-	added server repsonse handler for 367 and 368 reponses to get
+	added server response handler for 367 and 368 responses to get
 	/BANLIST working.
 
 2004-05-26  Francis Litterio  <franl@users.sourceforge.net>
@@ -806,7 +806,7 @@
 
 2004-05-17  Mario Lang  <mlang@delysid.org>
 
-	* erc-log.el: Dont autoload a define-key statement, erc-mode-map
+	* erc-log.el: Don't autoload a define-key statement, erc-mode-map
 	might not be known yet
 
 2004-05-16  Lawrence Mitchell  <wence@gmx.li>
@@ -827,7 +827,7 @@
 	(391): New.
 	(406, 432): Use ?n, not ?c in `erc-display-message'.
 	(431, 445, 446, 451, 462, 463, 464, 465, 481, 483, 485, 491, 501,
-	502): All error responsess with no arguments grouped together.
+	502): All error responses with no arguments grouped together.
 
 2004-05-14  Diane Murray  <disumu@x3y2z1.net>
 
@@ -1715,7 +1715,7 @@
 	* erc.el: Added erc-server-001 which runs when the server sends
 	its welcome message.  It sets the current-nick to reflect the
 	server's settings.  This fixes a bug where nicks that were too long
-	and got truncated by ther server were still set to the old value.
+	and got truncated by the server were still set to the old value.
 	(nickname-in-use): If user wants to try again manually, let user
 	know that the nick is taken.  If not, go through erc-default-nicks
 	until none are left, and then try one last time with
@@ -2064,7 +2064,7 @@
 	the event hook.
 	(erc-cmd-IDLE): New function.  Implements the new /IDLE command.
 	Usage: /IDLE NICK (erc-seconds-to-string): New function.  Converts
-	a number of seconds to an Engligh phrase.
+	a number of seconds to an English phrase.
 
 2004-01-02  Francis Litterio  <franl@users.sourceforge.net>
 
diff --git a/ChangeLog.05 b/ChangeLog.05
index 8357c3f..1b308fe 100644
--- a/ChangeLog.05
+++ b/ChangeLog.05
@@ -831,7 +831,7 @@
 	`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
+	compatibility code should live. When and if ERC is bundled with
 	Emacs, some of the hacks in this file should be merged into Viper
 	itself.
 
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Oct 01 02:31:33 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1KkvFF-0005Vs-4C
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KkvFD-0005VR-FL
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KkvFC-0005V7-OK
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:30 -0400
Received: from [199.232.76.173] (port=44436 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KkvFC-0005V2-D3
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:30 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:44822)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1KkvFC-0003dF-1j
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:30 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1KkvFB-0000Dk-Fw
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:29 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1KkvF5-0008Qh-PE
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:25 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 30 Sep 2008 22:43:09 -0700
To: erc-commit@gnu.org
Message-Id: <E1KkvF5-0008Qh-PE@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] erc-dcc: Use a 4-byte string to represent
	packet size as per CTCP spec.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 06:31:31 -0000

* erc-dcc.el (erc-pack-int): Make sure returned string is within 4 bytes.
  Always return a 4-byte string, so that we conform to the CTCP spec.
  (erc-most-positive-int-bytes): New constant representing the number of
  bytes that most-positive-fixnum can be stored in.
  (erc-most-positive-int-msb): New constant representing the contents of
  the most significant byte of most-positive-fixnum.
  (erc-unpack-int): Make sure that the integer we get back can be
  represented in Emacs.
---
 erc-dcc.el |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/erc-dcc.el b/erc-dcc.el
index 2877107..cbd02d0 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -200,25 +200,55 @@ compared with `erc-nick-equal-p' which is IRC case-insensitive."
     result))
 
 (defun erc-pack-int (value)
-  "Convert an integer into a packed string."
-  (let* ((len (ceiling (/ value 256.0)))
-         (str (make-string len ?a))
-         (i (1- len)))
-    (while (>= i 0)
+  "Convert an integer into a packed string in network byte order,
+which is big-endian."
+  ;; make sure value is not negative
+  (when (< value 0)
+    (error "ERC-DCC (erc-pack-int): packet size is negative"))
+  ;; make sure size is not larger than 4 bytes
+  (let ((len (if (= value 0) 0
+               (ceiling (/ (ceiling (/ (log value) (log 2))) 8.0)))))
+    (when (> len 4)
+      (error "ERC-DCC (erc-pack-int): packet too large")))
+  ;; pack
+  (let ((str (make-string 4 0))
+        (i 3))
+    (while (and (>= i 0) (> value 0))
       (aset str i (% value 256))
       (setq value (/ value 256))
       (setq i (1- i)))
     str))
 
+(defconst erc-most-positive-int-bytes
+  (ceiling (/ (ceiling (/ (log most-positive-fixnum) (log 2))) 8.0))
+  "Maximum number of bytes for a fixnum.")
+
+(defconst erc-most-positive-int-msb
+  (lsh most-positive-fixnum (- 0 (* 8 (1- erc-most-positive-int-bytes))))
+  "Content of the most significant byte of most-positive-fixnum.")
+
 (defun erc-unpack-int (str)
   "Unpack a packed string into an integer."
-  (let ((len (length str))
-        (num 0)
-        (count 0))
-    (while (< count len)
-      (setq num (+ num (lsh (aref str (- len count 1)) (* 8 count))))
-      (setq count (1+ count)))
-    num))
+  (let ((len (length str)))
+    ;; strip leading 0-bytes
+    (let ((start 0))
+      (while (and (> len start) (eq (aref str start) 0))
+        (setq start (1+ start)))
+      (when (> start 0)
+        (setq str (substring str start))
+        (setq len (- len start))))
+    ;; make sure size is not larger than Emacs can handle
+    (when (or (> len (min 4 erc-most-positive-int-bytes))
+              (and (eq len erc-most-positive-int-bytes)
+                   (> (aref str 0) erc-most-positive-int-msb)))
+      (error "ERC-DCC (erc-unpack-int): packet to send is too large"))
+    ;; unpack
+    (let ((num 0)
+          (count 0))
+      (while (< count len)
+        (setq num (+ num (lsh (aref str (- len count 1)) (* 8 count))))
+        (setq count (1+ count)))
+      num)))
 
 (defconst erc-dcc-ipv4-regexp
   (concat "^"
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Oct 01 02:31:44 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1KkvFQ-0005cv-9H
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KkvFO-0005bS-OL
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KkvFN-0005aJ-QH
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:42 -0400
Received: from [199.232.76.173] (port=44440 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KkvFN-0005a6-FH
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:41 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:44850)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1KkvFM-0003fP-O1
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:41 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1KkvFM-0000Fp-3D
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:40 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1KkvFH-0008RM-Ky
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:35 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 30 Sep 2008 23:25:49 -0700
To: erc-commit@gnu.org
Message-Id: <E1KkvFH-0008RM-Ky@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] erc-dcc: Fix some issues with
	erc-dcc-do-CLOSE-command.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 06:31:43 -0000

* erc-dcc.el (erc-dcc-do-CLOSE-command): Update docstring.  Don't use the
  line variable.  Try to disambiguate between type and nick when only one
  is provided.  Validate both type and nick arguments.  Allow matching by
  just nick.
---
 erc-dcc.el |   43 ++++++++++++++++++++++++++++++-------------
 1 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/erc-dcc.el b/erc-dcc.el
index cbd02d0..4d2fcd3 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -79,6 +79,11 @@ IRC users."
   :group 'erc-dcc
   :type 'boolean)
 
+(defconst erc-dcc-connection-types
+  '("CHAT" "GET" "SEND")
+  "List of valid DCC connection types.
+All values of the list must be uppercase strings.")
+
 (defvar erc-dcc-list nil
   "List of DCC connections. Looks like:
   ((:nick \"nick!user@host\" :type GET :peer proc :parent proc :size size :file file)
@@ -477,19 +482,31 @@ where FOO is one of CLOSE, GET, SEND, LIST, CHAT, etc."
         t))))
 
 (defun erc-dcc-do-CLOSE-command (proc &optional type nick)
-  "/dcc close type nick
-type and nick are optional."
-  ;; FIXME, should also work if only nick is specified
-  (when (string-match (concat "^\\s-*\\(\\S-+\\)? *\\("
-                              erc-valid-nick-regexp "\\)?\\s-*$") line)
-    (let ((type (when (match-string 1 line)
-                  (intern (upcase (match-string 1 line)))))
-          (nick (match-string 2 line))
-          (ret t))
+  "Close a connection.  Usage: /dcc close type nick.
+At least one of TYPE and NICK must be provided."
+  ;; disambiguate type and nick if only one is provided
+  (when (and type (null nick)
+             (not (member (upcase type) erc-dcc-connection-types)))
+    (setq nick type)
+    (setq type nil))
+  ;; validate nick argument
+  (unless (and nick (string-match (concat "\\`" erc-valid-nick-regexp "\\'")
+                                  nick))
+    (setq nick nil))
+  ;; validate type argument
+  (unless (and type (member (upcase type) erc-dcc-connection-types))
+    (setq type nil))
+  (when (or nick type)
+    (let ((ret t))
       (while ret
-        (if nick
-            (setq ret (erc-dcc-member :type type :nick nick))
-          (setq ret (erc-dcc-member :type type)))
+        (cond ((and nick type)
+               (setq ret (erc-dcc-member :type type :nick nick)))
+              (nick
+               (setq ret (erc-dcc-member :nick nick)))
+              (type
+               (setq ret (erc-dcc-member :type type)))
+              (t
+               (setq ret nil)))
         (when ret
           ;; found a match - delete process if it exists.
           (and (processp (plist-get ret :peer))
@@ -500,7 +517,7 @@ type and nick are optional."
            'dcc-closed
            ?T (plist-get ret :type)
            ?n (erc-extract-nick (plist-get ret :nick))))))
-      t))
+    t))
 
 (defun erc-dcc-do-GET-command (proc nick &rest file)
   "Do a DCC GET command.  NICK is the person who is sending the file.
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Oct 01 02:31:52 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1KkvFY-0005kj-Ha
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KkvFW-0005ir-Rq
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KkvFW-0005iB-6V
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:50 -0400
Received: from [199.232.76.173] (port=44442 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KkvFW-0005i3-1i
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:50 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:44870)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1KkvFV-0003gv-Nh
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:49 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1KkvFV-0000HH-2i
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:49 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1KkvFQ-0008Ry-Mo
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:46 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 30 Sep 2008 23:28:35 -0700
To: erc-commit@gnu.org
Message-Id: <E1KkvFQ-0008Ry-Mo@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] erc-dcc.el (erc-dcc-append-contents): Set
	inhibit-read-only to t.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 06:31:51 -0000

* erc-dcc.el (erc-dcc-append-contents): Set inhibit-read-only to t.
---
 erc-dcc.el |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/erc-dcc.el b/erc-dcc.el
index 4d2fcd3..748746c 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -951,7 +951,8 @@ filter and a process sentinel, and making the connection."
   "Append the contents of BUFFER to FILE.
 The contents of the BUFFER will then be erased."
   (with-current-buffer buffer
-    (let ((coding-system-for-write 'binary))
+    (let ((coding-system-for-write 'binary)
+          (inhibit-read-only t))
       (write-region (point-min) (point-max) erc-dcc-file-name t 'nomessage)
       (erase-buffer))))
 
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Oct 01 02:32:01 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1KkvFg-0005ns-RR
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 02:32:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KkvFf-0005nZ-JG
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KkvFe-0005nN-7I
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:58 -0400
Received: from [199.232.76.173] (port=44443 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KkvFe-0005nK-2a
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:58 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:44883)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1KkvFd-0003hz-Oj
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:57 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1KkvFd-0000IF-52
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:57 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1KkvFZ-0008SY-A9
	for erc-commit@gnu.org; Wed, 01 Oct 2008 02:31:55 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 30 Sep 2008 23:28:42 -0700
To: erc-commit@gnu.org
Message-Id: <E1KkvFZ-0008SY-A9@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] Update ChangeLog.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 06:32:00 -0000

---
 ChangeLog |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d93364..73a6bac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2008-10-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc-dcc.el (erc-pack-int): Make sure returned string is within 4
+	bytes.  Always return a 4-byte string, so that we conform to the
+	CTCP spec.
+	(erc-most-positive-int-bytes): New constant representing the
+	number of bytes that most-positive-fixnum can be stored in.
+	(erc-most-positive-int-msb): New constant representing the
+	contents of the most significant byte of most-positive-fixnum.
+	(erc-unpack-int): Make sure that the integer we get back can be
+	represented in Emacs.
+	(erc-dcc-do-CLOSE-command): Update docstring.  Don't use the line
+	variable.  Try to disambiguate between type and nick when only one
+	is provided.  Validate both type and nick arguments.  Allow
+	matching by just nick.
+	(erc-dcc-append-contents): Set inhibit-read-only to t.
+
 2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* erc.el: Remove code for Carbon.
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Oct 01 11:01:13 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Kl3CT-0002Fc-B0
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 11:01:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kl3CR-0002DR-O5
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:01:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kl3CN-0002B9-Et
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:01:10 -0400
Received: from [199.232.76.173] (port=40327 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kl3CN-0002B6-BR
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:01:07 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:38915)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1Kl3CM-0000sW-Ri
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:01:06 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1Kl3CL-00026n-D0
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:01:05 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1Kl3CC-0000VI-DA
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:00:59 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Wed, 1 Oct 2008 07:56:36 -0700
To: erc-commit@gnu.org
Message-Id: <E1Kl3CC-0000VI-DA@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] erc-dcc: Fix bug in /dcc close type.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 15:01:12 -0000

* erc-dcc.el (erc-dcc-do-CLOSE-command): Make type a symbol before
  passing to erc-dcc-member.
---
 erc-dcc.el |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/erc-dcc.el b/erc-dcc.el
index 748746c..08eaa14 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -494,7 +494,8 @@ At least one of TYPE and NICK must be provided."
                                   nick))
     (setq nick nil))
   ;; validate type argument
-  (unless (and type (member (upcase type) erc-dcc-connection-types))
+  (if (and type (member (upcase type) erc-dcc-connection-types))
+      (setq type (intern (upcase type)))
     (setq type nil))
   (when (or nick type)
     (let ((ret t))
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Oct 01 11:20:59 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Kl3Va-0000Lr-UR
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 11:20:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kl3VZ-0000L2-Dq
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:20:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kl3VX-0000KG-3I
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:20:56 -0400
Received: from [199.232.76.173] (port=54092 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kl3VW-0000K3-QQ
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:20:54 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:55806)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1Kl3VW-0007G8-Ib
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:20:54 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1Kl3VU-0005pV-6K
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:20:52 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1Kl3VR-0001bz-R3
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:20:50 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Wed, 1 Oct 2008 08:09:55 -0700
To: erc-commit@gnu.org
Message-Id: <E1Kl3VR-0001bz-R3@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] erc-dcc: Prevent auto-compression from
	triggering when writing a file.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 15:20:57 -0000

* erc-dcc.el (erc-dcc-append-contents): Prevent auto-compression from
  triggering when we write the contents to a file.
---
 erc-dcc.el |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/erc-dcc.el b/erc-dcc.el
index 08eaa14..71c5ec9 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -953,7 +953,11 @@ filter and a process sentinel, and making the connection."
 The contents of the BUFFER will then be erased."
   (with-current-buffer buffer
     (let ((coding-system-for-write 'binary)
-          (inhibit-read-only t))
+          (inhibit-read-only t)
+          (inhibit-file-name-handlers
+           (append '(jka-compr-handler image-file-handler)
+                   inhibit-file-name-handlers))
+          (inhibit-file-name-operation 'write-region))
       (write-region (point-min) (point-max) erc-dcc-file-name t 'nomessage)
       (erase-buffer))))
 
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Oct 01 11:21:05 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Kl3Vh-0000Oi-3n
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 11:21:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kl3Vf-0000OG-8l
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:21:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kl3Ve-0000Nc-Dq
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:21:02 -0400
Received: from [199.232.76.173] (port=54096 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kl3Ve-0000NS-12
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:21:02 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:55815)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1Kl3Vd-0007II-RV
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:21:02 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1Kl3Vc-0005qy-Uy
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:21:01 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1Kl3VY-0001cs-2V
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:20:56 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Wed, 1 Oct 2008 08:10:03 -0700
To: erc-commit@gnu.org
Message-Id: <E1Kl3VY-0001cs-2V@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] ChangeLog: Update.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 15:21:03 -0000

---
 ChangeLog |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 73a6bac..4fa5cf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,9 @@
 	variable.  Try to disambiguate between type and nick when only one
 	is provided.  Validate both type and nick arguments.  Allow
 	matching by just nick.
-	(erc-dcc-append-contents): Set inhibit-read-only to t.
+	(erc-dcc-append-contents): Set inhibit-read-only to t.  Prevent
+	auto-compression from triggering when we write the contents to a
+	file.
 
 2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Oct 01 11:40:59 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Kl3ow-0004xQ-TN
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kl3ov-0004wp-FE
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kl3ou-0004wL-TI
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:57 -0400
Received: from [199.232.76.173] (port=50052 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kl3ou-0004wF-NS
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:56 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:46605)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1Kl3ou-00041H-FO
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:56 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1Kl3oq-0000aX-5l
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:52 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1Kl3oo-0002f9-IB
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:51 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Wed, 1 Oct 2008 08:35:03 -0700
To: erc-commit@gnu.org
Message-Id: <E1Kl3oo-0002f9-IB@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] erc-dcc: Prevent auto-compression from
	triggering when starting a transfer.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 15:40:57 -0000

* erc-dcc (erc-dcc-get-file): Prevent auto-compression from triggering
  when we truncate a file.
---
 erc-dcc.el |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/erc-dcc.el b/erc-dcc.el
index 71c5ec9..32b189d 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -928,7 +928,11 @@ filter and a process sentinel, and making the connection."
       (setq erc-dcc-file-name file)
 
       ;; Truncate the given file to size 0 before appending to it.
-      (write-region (point) (point) erc-dcc-file-name nil 'nomessage)
+      (let ((inhibit-file-name-handlers
+             (append '(jka-compr-handler image-file-handler)
+                     inhibit-file-name-handlers))
+            (inhibit-file-name-operation 'write-region))
+        (write-region (point) (point) erc-dcc-file-name nil 'nomessage))
 
       (setq erc-server-process parent-proc
             erc-dcc-entry-data entry)
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Wed Oct 01 11:41:01 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Kl3oz-0004yf-7a
	for mharc-erc-commit@gnu.org; Wed, 01 Oct 2008 11:41:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Kl3oy-0004yR-Kw
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:41:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Kl3oy-0004y1-3m
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:41:00 -0400
Received: from [199.232.76.173] (port=50053 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Kl3ox-0004xv-VN
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:41:00 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:46618)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1Kl3ox-00041p-OF
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:59 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1Kl3ow-0000bi-Um
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:58 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1Kl3ou-0002g0-1g
	for erc-commit@gnu.org; Wed, 01 Oct 2008 11:40:56 -0400
From: Michael Olson <mwolson@gnu.org>
Date: Wed, 1 Oct 2008 08:35:10 -0700
To: erc-commit@gnu.org
Message-Id: <E1Kl3ou-0002g0-1g@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] ChangeLog: Update.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2008 15:41:00 -0000

---
 ChangeLog |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fa5cf4..531acc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
 	(erc-dcc-append-contents): Set inhibit-read-only to t.  Prevent
 	auto-compression from triggering when we write the contents to a
 	file.
+	(erc-dcc-get-file): Prevent auto-compression from triggering when
+	we truncate a file.
 
 2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Fri Oct 03 03:33:13 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1KlfA1-0002a9-DP
	for mharc-erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Klf9z-0002YD-LT
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Klf9y-0002XH-P7
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:11 -0400
Received: from [199.232.76.173] (port=50040 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Klf9y-0002Wx-Fq
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:10 -0400
Received: from mx20.gnu.org ([199.232.41.8]:46857)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@grepfind.mwolson.org>)
	id 1Klf9y-0004sz-8Q
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:10 -0400
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@grepfind.mwolson.org>) id 1Klf9x-0006QJ-41
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:09 -0400
Received: from cpe-75-84-154-172.socal.res.rr.com ([75.84.154.172]
	helo=grepfind.mwolson.org)
	by deleuze.hcoop.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@grepfind.mwolson.org>)
	id 1Klf9w-0005Y8-H4
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:08 -0400
Received: from mwolson by grepfind.mwolson.org with local (Exim 4.69)
	(envelope-from <mwolson@grepfind.mwolson.org>) id 1Klf9u-0007MK-UA
	for erc-commit@gnu.org; Fri, 03 Oct 2008 00:33:06 -0700
X-Hashcash: 1:20:081003:erc-commit@gnu.org::S+wKIebwyKam+vxW:00000000000000000000000000000000000000000004LfY
From: Michael Olson <mwolson@gnu.org>
To: erc-commit@gnu.org
Date: Thu, 2 Oct 2008 23:40:23 -0700
Message-Id: <E1KlexW-0007dR-UM@mire.hcoop.net>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 1)
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6,
	seldom 2.4 (older, 4)
Subject: [Erc-commit] [COMMIT] erc-dcc: Fix bugs involving size of received
	files.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Oct 2008 07:33:11 -0000


* erc-dcc.el (english): Increase size heading by two places.
  (erc-dcc-byte-count): Move higher.
  (erc-dcc-do-LIST-command): Use erc-dcc-byte-count to get accurate
  count.  Coerce byte total to floating point before performing
  computation, otherwise division will truncate to 0.
  (erc-dcc-append-contents): Update erc-dcc-byte-count.
  (erc-dcc-get-filter): Don't update erc-dcc-byte-count, because that
  will give incorrect size totals.  Instead, figure out how much we have
  by summing byte count and current buffer size.
  (erc-dcc-get-sentinel): Don't update erc-dcc-byte-count.
---
 erc-dcc.el |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/erc-dcc.el b/erc-dcc.el
index 32b189d..e6329c1 100644
--- a/erc-dcc.el
+++ b/erc-dcc.el
@@ -150,9 +150,9 @@ All values of the list must be uppercase strings.")
    (dcc-get-file-too-long
     . "DCC: %f: File longer than sender claimed; aborting transfer")
    (dcc-get-notfound . "DCC: %n hasn't offered %f for DCC transfer")
-   (dcc-list-head . "DCC: From      Type  Active  Size          Filename")
-   (dcc-list-line . "DCC: --------  ----  ------  ------------  --------")
-   (dcc-list-item . "DCC: %-8n  %-4t  %-6a  %-12s  %f")
+   (dcc-list-head . "DCC: From      Type  Active  Size            Filename")
+   (dcc-list-line . "DCC: --------  ----  ------  --------------  --------")
+   (dcc-list-item . "DCC: %-8n  %-4t  %-6a  %-14s  %f")
    (dcc-list-end  . "DCC: End of list.")
    (dcc-malformed . "DCC: error: %n (%u@%h) sent malformed request: %q")
    (dcc-privileged-port
@@ -551,6 +551,9 @@ PROC is the server process."
        nil '(notice error) 'active
        'dcc-get-notfound ?n nick ?f filename))))
 
+(defvar erc-dcc-byte-count nil)
+(make-variable-buffer-local 'erc-dcc-byte-count)
+
 (defun erc-dcc-do-LIST-command (proc)
   "This is the handler for the /dcc list command.
 It lists the current state of `erc-dcc-list' in an easy to read manner."
@@ -586,12 +589,18 @@ It lists the current state of `erc-dcc-list' in an easy to read manner."
                            (plist-member elt :file)
                            (buffer-live-p (get-buffer (plist-get elt :file)))
                            (plist-member elt :size))
-                      (concat " (" (number-to-string
+                      (let ((byte-count (with-current-buffer
+                                            (get-buffer (plist-get elt :file))
+                                          (+ (buffer-size) 0.0
+                                             erc-dcc-byte-count))))
+                        (concat " ("
+                                (if (= byte-count 0)
+                                    "0"
+                                  (number-to-string
+                                   (truncate
                                     (* 100
-                                       (/ (buffer-size
-                                           (get-buffer (plist-get elt :file)))
-                                          (plist-get elt :size))))
-                              "%)")))
+                                       (/ byte-count (plist-get elt :size))))))
+                                "%)"))))
        ?f (or (and (plist-member elt :file) (plist-get elt :file)) "")))
     (erc-display-message
      nil 'notice 'active
@@ -901,8 +910,6 @@ other client."
   :group 'erc-dcc
   :type 'integer)
 
-(defvar erc-dcc-byte-count nil)
-(make-variable-buffer-local 'erc-dcc-byte-count)
 (defvar erc-dcc-file-name nil)
 (make-variable-buffer-local 'erc-dcc-file-name)
 
@@ -963,6 +970,7 @@ The contents of the BUFFER will then be erased."
                    inhibit-file-name-handlers))
           (inhibit-file-name-operation 'write-region))
       (write-region (point-min) (point-max) erc-dcc-file-name t 'nomessage)
+      (setq erc-dcc-byte-count (+ (buffer-size) erc-dcc-byte-count))
       (erase-buffer))))
 
 (defun erc-dcc-get-filter (proc str)
@@ -972,23 +980,24 @@ buffer, and sends back the replies after each block of data per the DCC
 protocol spec.  Well not really.  We write back a reply after each read,
 rather than every 1024 byte block, but nobody seems to care."
   (with-current-buffer (process-buffer proc)
-    (let ((inhibit-read-only t))
+    (let ((inhibit-read-only t)
+          received-bytes)
       (goto-char (point-max))
       (insert (string-make-unibyte str))
 
-      (setq erc-dcc-byte-count (+ (length str) erc-dcc-byte-count))
       (when (> (point-max) erc-dcc-receive-cache)
         (erc-dcc-append-contents (current-buffer) erc-dcc-file-name))
+      (setq received-bytes (+ (buffer-size) erc-dcc-byte-count))
 
       (and erc-dcc-verbose
            (erc-display-message
             nil 'notice erc-server-process
             'dcc-get-bytes-received
             ?f (file-name-nondirectory buffer-file-name)
-            ?b (number-to-string erc-dcc-byte-count)))
+            ?b (number-to-string received-bytes)))
       (cond
        ((and (> (plist-get erc-dcc-entry-data :size) 0)
-             (> erc-dcc-byte-count (plist-get erc-dcc-entry-data :size)))
+             (> received-bytes (plist-get erc-dcc-entry-data :size)))
         (erc-display-message
          nil '(error notice) 'active
          'dcc-get-file-too-long
@@ -996,7 +1005,7 @@ rather than every 1024 byte block, but nobody seems to care."
         (delete-process proc))
        (t
         (process-send-string
-         proc (erc-pack-int erc-dcc-byte-count)))))))
+         proc (erc-pack-int received-bytes)))))))
 
 
 (defun erc-dcc-get-sentinel (proc event)
@@ -1008,7 +1017,6 @@ transfer is complete."
     (delete-process proc)
     (setq erc-dcc-list (delete erc-dcc-entry-data erc-dcc-list))
     (unless (= (point-min) (point-max))
-      (setq erc-dcc-byte-count (+ (buffer-size) erc-dcc-byte-count))
       (erc-dcc-append-contents (current-buffer) erc-dcc-file-name))
     (erc-display-message
      nil 'notice erc-server-process
-- 
debian.1.5.6.1.19.ge6b2





From MAILER-DAEMON Fri Oct 03 03:33:57 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1KlfAj-0002ps-MR
	for mharc-erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KlfAi-0002pn-Jp
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KlfAe-0002pb-7w
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:55 -0400
Received: from [199.232.76.173] (port=50050 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KlfAe-0002pY-1Z
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:52 -0400
Received: from mx20.gnu.org ([199.232.41.8]:46911)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@grepfind.mwolson.org>)
	id 1KlfAd-0004wS-UV
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:52 -0400
Received: from deleuze.hcoop.net ([69.90.123.67])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mwolson@grepfind.mwolson.org>) id 1KlfAc-0006So-VR
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:51 -0400
Received: from cpe-75-84-154-172.socal.res.rr.com ([75.84.154.172]
	helo=grepfind.mwolson.org)
	by deleuze.hcoop.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@grepfind.mwolson.org>)
	id 1KlfAc-0005bq-8I
	for erc-commit@gnu.org; Fri, 03 Oct 2008 03:33:50 -0400
Received: from mwolson by grepfind.mwolson.org with local (Exim 4.69)
	(envelope-from <mwolson@grepfind.mwolson.org>) id 1KlfAZ-0007N3-Uu
	for erc-commit@gnu.org; Fri, 03 Oct 2008 00:33:47 -0700
X-Hashcash: 1:20:081003:erc-commit@gnu.org::Wu/wPJRX/RHPrOGC:00000000000000000000000000000000000000000004Isn
From: Michael Olson <mwolson@gnu.org>
To: erc-commit@gnu.org
Date: Thu, 2 Oct 2008 23:56:40 -0700
Message-ID: <87d4ii2kv8.fsf@grepfind.mwolson.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 1)
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6,
	seldom 2.4 (older, 4)
Subject: [Erc-commit] [COMMIT] Update ChangeLog
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Oct 2008 07:33:56 -0000

---
 ChangeLog |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 531acc5..3d1ac3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-10-03  Michael Olson  <mwolson@gnu.org>
+
+	* erc-dcc.el (english): Increase size heading by two places.
+	(erc-dcc-byte-count): Move higher.
+	(erc-dcc-do-LIST-command): Use erc-dcc-byte-count to get accurate
+	count.  Coerce byte total to floating point before performing
+	computation, otherwise division will truncate to 0.
+	(erc-dcc-append-contents): Update erc-dcc-byte-count.
+	(erc-dcc-get-filter): Don't update erc-dcc-byte-count, because
+	that will give incorrect size totals.  Instead, figure out how
+	much we have by summing byte count and current buffer size.
+	(erc-dcc-get-sentinel): Don't update erc-dcc-byte-count.
+
 2008-10-01  Michael Olson  <mwolson@gnu.org>
 
 	* erc-dcc.el (erc-pack-int): Make sure returned string is within 4
-- 
debian.1.5.6.1.19.ge6b2





From MAILER-DAEMON Sat Oct 25 14:20:20 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1KtnkK-0000aH-My
	for mharc-erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KtnkJ-0000Z2-6m
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KtnkG-0000Wt-Ij
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:18 -0400
Received: from [199.232.76.173] (port=52876 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KtnkG-0000Wf-7H
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:16 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:55565)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1KtnkG-0006NY-BZ
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1KtnkC-0006WU-RT
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:12 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1KtnkC-0006Oc-0n
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:12 -0400
From: Michael Olson <mwolson@gnu.org>
To: erc-commit@gnu.org
Message-Id: <E1KtnkC-0006Oc-0n@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] More fun with ChangeLogs from Emacs.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
Date: Sat, 25 Oct 2008 18:20:19 -0000
X-Original-Date: Tue, 7 Oct 2008 20:59:35 -0700
X-List-Received-Date: Sat, 25 Oct 2008 18:20:19 -0000

---
 ChangeLog.01 |    6 +++---
 ChangeLog.02 |   12 ++++++------
 ChangeLog.03 |    4 ++--
 ChangeLog.06 |    4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ChangeLog.01 b/ChangeLog.01
index 2e8a0b0..1978485 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -679,7 +679,7 @@
 2001-10-20  Alex Schroeder  <alex@gnu.org>
 
 	* erc.el 1.70:
-	Replaced all occurences of put-text-property with a call to
+	Replaced all occurrences of put-text-property with a call to
 	erc-put-text-property.
 	(erc-put-text-property): New function.
 	(erc-tracking-modified-channels): Moved to the front of the file such
@@ -780,7 +780,7 @@
 	* Changed some (if ...) without else part to (when ...)
 	* Some (while ...) to use (dolist ...)
 	* Fix for completion popup generating tracebacks.
-	* New function erc-arrange-session-in-mulptiple-windows
+	* New function erc-arrange-session-in-multiple-windows
 	* Lots of other stuff, read the diff
 
 2001-10-02  Mario Lang  <mlang@delysid.org>
@@ -909,7 +909,7 @@
 2001-07-26  Mario Lang  <mlang@delysid.org>
 
 	* erc.el 1.29:
-	fixed one occurence of a setq with only one argument (XEmacs didn't like that)
+	fixed one occurrence of a setq with only one argument (XEmacs didn't like that)
 
 	* erc.el 1.28:
 	Added erc-next-line-add-newlines customisation possibility.
diff --git a/ChangeLog.02 b/ChangeLog.02
index f78f225..aa9d84e 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -180,7 +180,7 @@
 	(erc-generate-log-file-name-long): Doc: Mention
 	erc-generate-log-file-name-function.
 	(erc-save-buffer-in-logs): Use erc-logging-enabled and
-	erc-current-logfile.  Doc: Mention erc-logging-enabbled.
+	erc-current-logfile.  Doc: Mention erc-logging-enabled.
 
 	(erc-encode-string-for-target): Only do the real work when
 	featurep mule; else just return the string unchanged.
@@ -970,7 +970,7 @@
 	* erc-bbdb.el 1.17:
 	* Create a global-minor-mode (i.e., make it a proper erc-module)
 
-	* erc.el 1.316: * (define-erc-modle): New defmacro
+	* erc.el 1.316: * (define-erc-module): New defmacro
 
 2002-11-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
 
@@ -1181,7 +1181,7 @@
 	* erc-notify.el 1.5: Add pcomplete support
 
 	* erc.el 1.301:
-	Remove autoload statments, remove autoload cookie from erc-mode and erc-info-mode
+	Remove autoload statements, remove autoload cookie from erc-mode and erc-info-mode
 
 	* erc-fill.el 1.14, erc-match.el 1.11: add/remove autoload cookies
 
@@ -1332,7 +1332,7 @@
 2002-07-22  Mario Lang  <mlang@delysid.org>
 
 	* erc.el 1.294:
-	Removed timestamp related code and moved into erc-stampe.l
+	Removed timestamp related code and moved into erc-stamp.el
 
 	* erc-stamp.el 1.1:
 	Timestamping code moved out of erc.el. Additional, now we can timestamp either on the left or on the right side
@@ -1571,7 +1571,7 @@
 	* added undefined-ctcp error message to english catalog
 
 	* changed some (when (not erc-disable-ctcp-replies) to use unless instead
-	  and some if's without else statments to use when or use
+	  and some if's without else statements to use when or use
 
 	* CTCP replies now use erc-display-message, formatted as notices
 
@@ -2327,7 +2327,7 @@
 	* erc.el 1.202: * erc-format-nick-function: New variable.
 	* (erc-format-nick): The default for above var. Just return the nick.
 	* (erc-format-@nick): Prefix NICK with @ or + if OP or VOICE.
-	* Removed erc-track-modified-channels related code and moved into erc-tracke.l
+	* Removed erc-track-modified-channels related code and moved into erc-track.el
 	   Its auto-loaded now
 
 	* erc-track.el 1.1: Split code from erc.el
diff --git a/ChangeLog.03 b/ChangeLog.03
index 60be5f1..248d572 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -166,7 +166,7 @@
 
 2003-10-25  Mario Lang  <mlang@delysid.org>
 
-	* erc.el 1.577: Fix typo tuncate->rruncate
+	* erc.el 1.577: Fix typo tuncate->truncate
 
 2003-10-24  Mario Lang  <mlang@delysid.org>
 
@@ -1697,7 +1697,7 @@
 	* buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed
 	  Keep This info in erc-dcc-member :sent and :confirmed plist values
 	* :	* :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer 
-	* erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-conntected, which now prints a msg...
+	* erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-connected, which now prints a msg...
 
 	* erc-dcc.el 1.46:
 	* (erc-dcc-chat-accept): Renamed from erc-dcc-chat. Callers updated.
diff --git a/ChangeLog.06 b/ChangeLog.06
index 1248db5..a54c8b2 100644
--- a/ChangeLog.06
+++ b/ChangeLog.06
@@ -367,7 +367,7 @@
 	* erc-log.el (log): Use erc-away-time.  Remove unnecessary check.
 	Pass `buffer' argument to erc-log-setup-logging instead of setting
 	the current buffer.  Ditto for erc-log-disable-logging.
-	(erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer'
+	(erc-log-setup-logging, erc-log-disable-logging): Accept a `buffer'
 	argument.
 
 	* erc-list.el (erc-chanlist): Use erc-with-server-buffer.
@@ -1161,7 +1161,7 @@
 	(erc-speedbar-goto-buffer): Fix compiler warning.
 
 	* erc-ibuffer.el: Use `define-ibuffer-filter' instead of
-	`ibuffer-degine-limiter'.  Use `define-ibuffer-column' instead of
+	`ibuffer-define-limiter'.  Use `define-ibuffer-column' instead of
 	`ibuffer-define-column'.  Require 'ibuf-ext so that the macros
 	work without compiler warnings.
 
-- 
debian.1.5.6.1.19.ge6b2




From MAILER-DAEMON Sat Oct 25 14:20:21 2008
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1KtnkL-0000ao-Q3
	for mharc-erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KtnkK-0000Zq-29
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KtnkG-0000Wk-DV
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:19 -0400
Received: from [199.232.76.173] (port=52875 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KtnkG-0000Wd-59
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:16 -0400
Received: from deleuze.hcoop.net ([69.90.123.67]:55566)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <mwolson@gnu.org>) id 1KtnkG-0006Na-BJ
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:16 -0400
Received: from mire.hcoop.net ([69.90.123.68] ident=Debian-exim)
	by deleuze.hcoop.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <mwolson@gnu.org>) id 1KtnkE-0006Xa-MX
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:14 -0400
Received: from mwolson by mire.hcoop.net with local (Exim 4.63)
	(envelope-from <mwolson@gnu.org>) id 1KtnkD-0006PE-Vv
	for erc-commit@gnu.org; Sat, 25 Oct 2008 14:20:14 -0400
From: Michael Olson <mwolson@gnu.org>
To: erc-commit@gnu.org
Message-Id: <E1KtnkD-0006PE-Vv@mire.hcoop.net>
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 1)
Subject: [Erc-commit] [COMMIT] erc.texi: Move PRE5_3 comments to PRE5_4.
X-BeenThere: erc-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: erc-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/erc-commit>
List-Post: <mailto:erc-commit@gnu.org>
List-Help: <mailto:erc-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/erc-commit>,
	<mailto:erc-commit-request@gnu.org?subject=subscribe>
Date: Sat, 25 Oct 2008 18:20:20 -0000
X-Original-Date: Wed, 8 Oct 2008 20:16:20 -0700
X-List-Received-Date: Sat, 25 Oct 2008 18:20:20 -0000

---
 erc.texi |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/erc.texi b/erc.texi
index 0fca912..980181f 100644
--- a/erc.texi
+++ b/erc.texi
@@ -703,7 +703,7 @@ Translate morse code in messages
 
 @end table
 
-@c PRE5_3: Document every option of every module in its own subnode
+@c PRE5_4: Document every option of every module in its own subnode
 
 
 @node Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
@@ -936,7 +936,7 @@ stuff, to the current ERC buffer."
 @section Options
 @cindex options
 
-@c PRE5_3: (Node) Document every ERC option (module options go in
+@c PRE5_4: (Node) Document every ERC option (module options go in
 @c previous chapter)
 
 This section has not yet been written.  For now, the easiest way to
-- 
debian.1.5.6.1.19.ge6b2




