[Erc-commit] [commit][erc--emacs--22] Merged from erc--main--0

[mwolson]

Revision: erc--emacs--22--patch-48
Archive: address@hidden
Creator: Michael Olson <address@hidden>
Date: Mon Jul 30 00:05:55 EDT 2007
Standard-date: 2007-07-30 04:05:55 GMT
Removed-files: erc-nicklist.el
Modified-files: ChangeLog erc-backend.el erc-button.el
    erc-compat.el erc-goodies.el erc-log.el erc-sound.el
    erc-stamp.el erc.el man/erc.texi
New-patches: address@hidden/erc--emacs--22--patch-48
    address@hidden/erc--main--0--patch-138
    address@hidden/erc--main--0--patch-139
    address@hidden/erc--main--0--patch-140
    address@hidden/erc--main--0--patch-141
    address@hidden/erc--main--0--patch-145
    address@hidden/erc--main--0--patch-146
    address@hidden/erc--main--0--patch-147
    address@hidden/erc--main--0--patch-148
    address@hidden/erc--main--0--patch-149
    address@hidden/erc--main--0--patch-151
    address@hidden/erc--main--0--patch-152
    address@hidden/erc--main--0--patch-153
    address@hidden/erc--main--0--patch-154
    address@hidden/erc--main--0--patch-155
    address@hidden/erc--main--0--patch-156
    address@hidden/erc--main--0--patch-157
    address@hidden/erc--main--0--patch-158
Summary: Merged from erc--main--0
Keywords: merge

Patches applied:

 * address@hidden/erc--main--0--patch-138
   Fixed customization mismatch in erc-nicklist-voiced-position.

 * address@hidden/erc--main--0--patch-139
   erc-backend: Avoid gotcha in define-erc-response-handler

 * address@hidden/erc--main--0--patch-140
   erc-log: Allow log files to be placed in different directories

 * address@hidden/erc--main--0--patch-141
   Fix bug with pcomplete and Slashnet "hops"

 * address@hidden/erc--main--0--patch-145
   erc-button: Allow parentheses in URLs

 * address@hidden/erc--main--0--patch-146
   Figure out where user-specific Emacs settings are stored

 * address@hidden/erc--main--0--patch-147
   Fix bug in erc-toggle-debug-irc-protocol

 * address@hidden/erc--main--0--patch-148
   erc-log: Fix bug when erc-log-channels-directory is a function

 * address@hidden/erc--main--0--patch-149
   erc-goodies: Fix bug with buffer ordering in erc-scroll-to-bottom

 * address@hidden/erc--main--0--patch-151
   erc-log: Update header

 * address@hidden/erc--main--0--patch-152
   erc-stamp: Put timestamp on both left and right by default

 * address@hidden/erc--main--0--patch-153
   Add explicit tls connection function

 * address@hidden/erc--main--0--patch-154
   manual: Fix a typo, update URL

 * address@hidden/erc--main--0--patch-155
   Relicense all FSF-assigned parts of ERC to GPLv3

 * address@hidden/erc--main--0--patch-156
   Replace GPLv2 with GPLv3 in manual

 * address@hidden/erc--main--0--patch-157
   Make /reconnect work even when the server process is not alive

 * address@hidden/erc--main--0--patch-158
   Display message or trigger error depending on debug-on-error