Commits

adrian  committed d32ec40

packages: sync of erc with upstream revision 1.774

-------------------- ChangeLog entries follow: --------------------

xemacs-packages/erc/ChangeLog addition:

2005-10-15 Adrian Aichner <adrian@xemacs.org>

* Full sync with upstream revision 1.774.
* AUTHORS:
* CREDITS:
* ChangeLog.2002.upstream:
* ChangeLog.2004.upstream:
* ChangeLog.upstream:
* Makefile (AUTHOR_VERSION):
* Makefile.upstream:
* NEWS:
* erc-autoaway.el:
* erc-autoaway.el (erc-autoaway-version):
* erc-autoaway.el (defvar):
* erc-autoaway.el (erc-autoaway-message):
* erc-autojoin.el:
* erc-autojoin.el (erc-autojoin-version):
* erc-autojoin.el (erc-autojoin-channels):
* erc-autojoin.el (erc-autojoin-add):
* erc-autojoin.el (erc-autojoin-remove):
* erc-backend.el:
* erc-backend.el (erc-server-current-nick): New.
* erc-backend.el (erc-server-process): New.
* erc-backend.el (erc-session-server): New.
* erc-backend.el (erc-session-port): New.
* erc-backend.el (erc-server-announced-name): New.
* erc-backend.el (erc-server-parameters): New.
* erc-backend.el (erc-server-connected): New.
* erc-backend.el (erc-server-quitting): New.
* erc-backend.el (erc-server-lines-sent): New.
* erc-backend.el (erc-server-last-peers): New.
* erc-backend.el (erc-server-last-sent-time): New.
* erc-backend.el (erc-server-last-ping-time): New.
* erc-backend.el (erc-server-lag): New.
* erc-backend.el (erc-server-filter-data): New.
* erc-backend.el (erc-server-duplicates): New.
* erc-backend.el (erc-server-processing-p): New.
* erc-backend.el (erc-server-flood-last-message): New.
* erc-backend.el (erc-server-flood-queue): New.
* erc-backend.el (erc-server-flood-timer): New.
* erc-backend.el (erc-server): New.
* erc-backend.el (erc-server-auto-reconnect): New.
* erc-backend.el (erc-split-line-length): New.
* erc-backend.el (erc-server-coding-system): New.
* erc-backend.el (erc-encoding-coding-alist): New.
* erc-backend.el (erc-server-connect-function): New.
* erc-backend.el (erc-server-prevent-duplicates): New.
* erc-backend.el (erc-server-duplicate-timeout): New.
* erc-backend.el (erc-server-flood-margin): New.
* erc-backend.el (erc-server-flood-penalty): New.
* erc-backend.el (erc-server-send-ping-interval): New.
* erc-backend.el (erc-server-ping-handler): New.
* erc-backend.el (erc-split-line): New.
* erc-backend.el (erc-upcase-first-word): New.
* erc-backend.el (erc-server-setup-periodical-server-ping): New.
* erc-backend.el (erc-server-connect): New.
* erc-backend.el (erc-server-filter-function): New.
* erc-backend.el (erc-process-sentinel-1): New.
* erc-backend.el (erc-process-sentinel): New.
* erc-backend.el (erc-coding-system-for-target): New.
* erc-backend.el (erc-decode-string-from-target): New.
* erc-backend.el (erc-send-line): New.
* erc-backend.el (erc-server-send): New.
* erc-backend.el (erc-server-send-queue): New.
* erc-backend.el (erc-message): New.
* erc-backend.el (erc-send-ctcp-message): New.
* erc-backend.el (erc-send-ctcp-notice): New.
* erc-backend.el (erc-decode-parsed-server-response):
* erc-backend.el (erc-handle-parsed-server-response):
* erc-backend.el (erc-handle-unknown-server-response):
* erc-backend.el (INVITE):
* erc-backend.el (JOIN):
* erc-backend.el (PING):
* erc-backend.el (PONG):
* erc-backend.el (PRIVMSG):
* erc-backend.el (001):
* erc-backend.el (MOTD):
* erc-backend.el (004):
* erc-backend.el (252):
* erc-backend.el (321):
* erc-backend.el (322):
* erc-backend.el (352):
* erc-backend.el (401):
* erc-bbdb.el:
* erc-bbdb.el (erc-bbdb-version):
* erc-bbdb.el (erc-bbdb-irc-highlight-field):
* erc-bbdb.el (erc-bbdb-bitlbee-name-field): New.
* erc-bbdb.el (erc-bbdb-search-name-and-create):
* erc-bbdb.el (erc-bbdb-insinuate-and-show-entry):
* erc-bbdb.el (erc-bbdb-whois):
* erc-bbdb.el (erc-bbdb-JOIN):
* erc-bbdb.el (erc-bbdb-NICK):
* erc-button.el:
* erc-button.el (erc-button-version):
* erc-chess.el:
* erc-chess.el (erc-chess-version):
* erc-chess.el (erc-chess-handler):
* erc-chess.el (erc-chess-engine-create):
* erc-compat.el:
* erc-compat.el (erc-compat-version):
* erc-compat.el (not):
* erc-compat.el (erc-view-mode-enter):
* erc-compat.el ('erc-view-mode-enter): 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 (erc-dcc-version):
* erc-dcc.el (erc-dcc-host):
* erc-dcc.el (erc-cmd-DCC):
* erc-dcc.el (erc-dcc-do-CHAT-command):
* erc-dcc.el (erc-dcc-do-LIST-command):
* erc-dcc.el (erc-dcc-handle-ctcp-send):
* erc-dcc.el (erc-dcc-chat-request): New.
* erc-dcc.el (erc-dcc-handle-ctcp-chat):
* erc-dcc.el (erc-dcc-get-parent): New.
* erc-dcc.el (erc-dcc-nick):
* erc-dcc.el (erc-dcc-send-file):
* erc-dcc.el (erc-dcc-get-file):
* erc-dcc.el (erc-dcc-get-filter):
* erc-dcc.el (erc-dcc-get-sentinel):
* erc-dcc.el (erc-cmd-CREQ):
* erc-dcc.el (erc-cmd-SREQ):
* erc-dcc.el (erc-dcc-chat):
* erc-dcc.el (erc-dcc-chat-setup):
* erc-dcc.el (erc-dcc-chat-accept):
* erc-dcc.el (erc-dcc-chat-parse-output):
* erc-dcc.el (erc-dcc-chat-close):
* erc-ezbounce.el:
* erc-ezbounce.el (erc-ezb-version):
* erc-ezbounce.el (erc-cmd-ezb):
* erc-ezbounce.el (erc-ezb-identify):
* erc-ezbounce.el (erc-ezb-select):
* erc-ezbounce.el (erc-ezb-select-session):
* erc-fill.el:
* erc-fill.el (erc-fill-version):
* erc-goodies.el (erc-scroll-to-bottom):
* erc-goodies.el (erc-occur):
* erc-ibuffer.el:
* erc-ibuffer.el (erc-ibuffer-version):
* erc-ibuffer.el (erc-server):
* erc-ibuffer.el (erc-server-name):
* erc-ibuffer.el (erc-target):
* erc-ibuffer.el (erc-topic):
* erc-ibuffer.el (erc-away):
* erc-ibuffer.el (erc-channel-modes):
* erc-identd.el:
* erc-identd.el (erc-identd-start):
* erc-imenu.el:
* erc-imenu.el (erc-imenu-version):
* erc-imenu.el (erc-unfill-notice):
* erc-imenu.el (erc-create-imenu-index):
* erc-lang.el:
* erc-list.el:
* erc-list.el (erc-list-version):
* erc-list.el (erc-chanlist):
* erc-list.el (erc-chanlist-highlight-line):
* erc-list.el (erc-chanlist-toggle-sort-state):
* erc-log.el:
* erc-log.el (erc-log-version):
* erc-log.el (erc-generate-log-file-name-function):
* erc-log.el (log):
* erc-log.el (erc-save-buffer-in-logs):
* erc-match.el:
* erc-match.el (erc-match-version):
* erc-match.el (erc-text-matched-hook):
* erc-match.el (erc-add-fool):
* erc-match.el (erc-log-matches):
* erc-match.el (away)): Removed.
* erc-match.el (erc-log-matches-make-buffer):
* erc-match.el (erc-log-matches-come-back):
* erc-menu.el:
* erc-menu.el (erc-menu-version):
* erc-menu.el (erc-menu-definition):
* erc-menu.el ("erc"):
* erc-nets.el:
* erc-nets.el (erc-nets-version):
* erc-nets.el (erc-networks-alist):
* erc-nets.el (erc-determine-network):
* erc-nets.el (nil):
* erc-nets.el (erc-set-network-name):
* erc-nets.el (erc-nets):
* erc-netsplit.el:
* erc-netsplit.el (erc-netsplit-version):
* erc-nicklist.el:
* erc-nicklist.el (nil):
* erc-nicklist.el (erc-nicklist-version):
* erc-nicklist.el (erc-nicklist-use-icons): New.
* erc-nicklist.el (erc-nicklist-icons-directory): New.
* erc-nicklist.el (erc-nicklist-voiced-position): New.
* erc-nicklist.el (erc-nicklist-bitlbee-connected-p): New.
* erc-nicklist.el (erc-nicklist-images-alist): New.
* erc-nicklist.el (erc-nicklist-insert-medium-name-or-icon): New.
* erc-nicklist.el (erc-nicklist-search-for-nick): New.
* erc-nicklist.el (erc-nicklist-insert-contents): New.
* erc-nicklist.el (erc-nicklist-update):
* erc-nicklist.el (erc-nicklist-mode-map):
* erc-nicklist.el (erc-nicklist-call-erc-command):
* erc-nicklist.el (erc-nicklist-cmd-QUERY): New.
* erc-nicklist.el (erc-nicklist-kbd-cmd-QUERY): New.
* erc-nicklist.el (erc-nicklist-menu):
* erc-nicklist.el (erc-nicklist-kbd-menu): New.
* erc-nicklist.el (erc-nicklist-channel-nicks): Removed.
* erc-nicklist.el (erc-nicklist-channel-users-info): New.
* erc-nickserv.el:
* erc-nickserv.el (erc-nickserv-version):
* erc-nickserv.el (erc-nickserv-alist):
* erc-nickserv.el (erc-nickserv-call-identify-function):
* erc-notify.el:
* erc-notify.el (erc-notify-list):
* erc-notify.el (erc-notify-timer):
* erc-notify.el (erc-notify-JOIN):
* erc-notify.el (erc-notify-NICK):
* erc-notify.el (erc-notify-QUIT):
* erc-notify.el (erc-cmd-NOTIFY):
* erc-page.el:
* erc-page.el (erc-ctcp-query-PAGE):
* erc-page.el (erc-cmd-PAGE):
* erc-pcomplete.el:
* erc-pcomplete.el (erc-pcomplete-version):
* erc-pcomplete.el (pcomplete-erc-all-nicks):
* erc-pcomplete.el (pcomplete-erc-channels):
* erc-ring.el:
* erc-ring.el (erc-ring-version):
* erc-sound.el:
* erc-speedbar.el:
* erc-speedbar.el (erc-speedbar-version):
* erc-speedbar.el (erc-speedbar-buttons):
* erc-speedbar.el (erc-speedbar-server-buttons):
* erc-speedbar.el (erc-speedbar-channel-buttons):
* erc-speedbar.el (erc-speedbar-expand-channel):
* erc-spelling.el:
* erc-spelling.el (erc-spelling-version):
* erc-spelling.el (erc-spelling-dictionaries): Removed.
* erc-stamp.el:
* erc-stamp.el (erc-stamp-version):
* erc-stamp.el (erc-add-timestamp):
* erc-stamp.el (erc-format-timestamp):
* erc-track.el:
* erc-track.el (erc-track-version):
* erc-track.el (erc-track-visibility):
* erc-track.el (track):
* erc-track.el (erc-modified-channels-update):
* erc-track.el (erc-track-modified-channels):
* erc-track.el (erc-track-switch-direction):
* erc-track.el (erc-track-sort-by-activest):
* erc-truncate.el:
* erc-viper.el:
* erc-xdcc.el:
* erc.el:
* erc.el (erc-version-string):
* erc.el (erc-menu):
* erc.el (erc-display):
* erc.el (erc-coding-systems): Removed.
* erc.el (erc-backend):
* erc.el ('erc-send-command): New.
* erc.el (erc-session-password):
* erc.el (erc-session-server): Removed.
* erc.el (erc-disconnected-hook):
* erc.el (erc-session-port): Removed.
* erc.el (erc-announced-server-name): Removed.
* erc.el (erc-server-parameters): Removed.
* erc.el (erc-process): Removed.
* erc.el (erc-connected): Removed.
* erc.el (erc-server-user):
* erc.el (erc-channel-user):
* erc.el (erc-get-server-user):
* erc.el (erc-add-server-user):
* erc.el (erc-remove-server-user):
* erc.el (erc-change-user-nickname):
* erc.el (erc-remove-channel-users):
* erc.el (channel-topic): Removed.
* erc.el (erc-channel-topic): New.
* erc.el (channel-modes): Removed.
* erc.el (erc-channel-modes): New.
* erc.el (erc-prompt):
* erc.el (erc-notice-prefix):
* erc.el (erc-prompt-for-channel-key):
* erc.el (erc-auto-reconnect): Removed.
* erc.el (erc-flood-protect):
* erc.el (erc-flood-limit): Removed.
* erc.el (erc-flood-limit2): Removed.
* erc.el (erc-mode-map):
* erc.el (erc-server-buffer):
* erc.el (erc-server-buffer-live-p):
* erc.el (erc-ison-p):
* erc.el (erc-mode):
* erc.el (erc-generate-new-buffer-name):
* erc.el (erc-with-buffer):
* erc.el (erc-buffer-filter):
* erc.el (erc-buffer-list):
* erc.el (erc-iswitchb):
* erc.el (current-nick): Removed.
* erc.el (channel-user-limit): Removed.
* erc.el (erc-channel-user-limit): New.
* erc.el (channel-key): Removed.
* erc.el (erc-channel-key): New.
* erc.el (last-peers): Removed.
* erc.el (invitation): Removed.
* erc.el (erc-invitation): New.
* erc.el (away): Removed.
* erc.el (erc-away): New.
* erc.el (channel-list): Removed.
* erc.el (erc-channel-list): New.
* erc.el (last-sent-time): Removed.
* erc.el (last-ping-time): Removed.
* erc.el (erc-modules):
* erc.el (last-ctcp-time): Removed.
* erc.el (erc-lines-sent): Removed.
* erc.el (erc-bytes-sent): Removed.
* erc.el (quitting): Removed.
* erc.el (bad-nick): Removed.
* erc.el (erc-bad-nick): New.
* erc.el (erc):
* erc.el (erc-previous-read): Removed.
* erc.el (erc-select-read-args):
* erc.el (erc-select-ssl):
* erc.el (erc-connect-function): Removed.
* erc.el (erc-connect): Removed.
* erc.el (erc-log-irc-protocol):
* erc.el (erc-split-multiline): Removed.
* erc.el (erc-toggle-debug-irc-protocol):
* erc.el (erc-process-filter): Removed.
* erc.el (erc-send-action):
* erc.el (erc-process-sentinel-1): Removed.
* erc.el (erc-display-line-1):
* erc.el (erc-process-sentinel): Removed.
* erc.el (erc-flood-exceeded-p): Removed.
* erc.el (erc-send-command): Removed.
* erc.el (erc-display-line):
* erc.el (erc-default-coding-system): Removed.
* erc.el (erc-encoding-coding-alist): Removed.
* erc.el (erc-send-input-line):
* erc.el (erc-coding-system-for-target): Removed.
* erc.el (erc-encode-string-for-target): Removed.
* erc.el (erc-decode-string-from-target): Removed.
* erc.el (erc-split-command): Removed.
* erc.el (erc-process-input-line):
* erc.el (erc-upcase-first-word): Removed.
* erc.el (erc-send-ctcp-message): Removed.
* erc.el (erc-send-ctcp-notice): Removed.
* erc.el (erc-cmd-default):
* erc.el (erc-cmd-UNIGNORE):
* erc.el (erc-cmd-OPS):
* erc.el (erc-cmd-AWAY):
* erc.el (erc-cmd-JOIN):
* erc.el (erc-cmd-NAMES):
* erc.el (erc-cmd-KICK):
* erc.el (erc-cmd-WHOIS):
* erc.el (erc-send-message):
* erc.el (erc-message): Removed.
* erc.el (erc-cmd-MODE):
* erc.el (erc-cmd-NICK):
* erc.el (erc-cmd-PART):
* erc.el (erc-cmd-QUOTE):
* erc.el (erc-cmd-QUIT):
* erc.el (erc-cmd-BYE):
* erc.el (erc-kill-queries-on-quit): Removed.
* erc.el (erc-cmd-SV):
* erc.el (erc-cmd-DEOP):
* erc.el (erc-cmd-OP):
* erc.el (erc-cmd-TIME):
* erc.el (erc-cmd-TOPIC):
* erc.el (erc-cmd-APPENDTOPIC):
* erc.el (erc-cmd-CLEARTOPIC):
* erc.el (channel-banlist): Removed.
* erc.el (erc-channel-banlist): New.
* erc.el (erc-cmd-BANLIST):
* erc.el (erc-cmd-MASSUNBAN):
* erc.el (erc-display-prompt):
* erc.el (erc-input-message):
* erc.el (erc-join-channel):
* erc.el (erc-set-topic):
* erc.el (erc-set-channel-limit):
* erc.el (erc-set-channel-key):
* erc.el (erc-quit-server):
* erc.el (erc-query):
* erc.el (erc-duplicates): Removed.
* erc.el (erc-duplicate-timeout): Removed.
* erc.el (erc-prevent-duplicates): Removed.
* erc.el (erc-nickname-in-use):
* erc.el (erc-server-hooks):
* erc.el (erc-auto-query):
* erc.el (erc-lag): Removed.
* erc.el (erc-send-ping-interval): Removed.
* erc.el (erc-ping-handler): Removed.
* erc.el (erc-setup-periodical-server-ping): Removed.
* erc.el (erc-echo-notice-in-user-buffers):
* erc.el (erc-echo-notice-in-user-and-target-buffers):
* erc.el (erc-echo-notice-in-first-user-buffer):
* erc.el (erc-server-version): Removed.
* erc.el (erc-banlist-store):
* erc.el (erc-banlist-finished):
* erc.el (erc-banlist-update):
* erc.el (erc-connection-established):
* erc.el (erc-set-initial-user-mode):
* erc.el (erc-ctcp-query-FINGER):
* erc.el (erc-process-away):
* erc.el (erc-update-channel-topic):
* erc.el (erc-set-modes):
* erc.el (erc-update-modes):
* erc.el (erc-update-channel-limit):
* erc.el (erc-update-channel-key):
* erc.el (erc-handle-user-status-change):
* erc.el (erc-send-current-line):
* erc.el (erc-send-input):
* erc.el (erc-display-command):
* erc.el (erc-send-single-line): Removed.
* erc.el (erc-display-msg):
* erc.el (erc-set-current-nick):
* erc.el (erc-current-nick):
* erc.el (erc-add-default-channel):
* erc.el (erc-ignored-reply-p):
* erc.el (with-erc-channel-buffer): Removed.
* erc.el (erc-toggle-flood-control):
* erc.el (erc-toggle-channel-mode):
* erc.el (erc-login):
* erc.el (erc-determine-parameters):
* erc.el (erc-away-p):
* erc.el (erc-mode-line-format):
* erc.el (erc-format-target):
* erc.el (erc-format-target-and/or-server):
* erc.el (erc-format-away-status):
* erc.el (erc-format-channel-modes):
* erc.el (erc-update-mode-line-buffer):
* erc.el (erc-arrange-session-in-multiple-windows):
* erc.el (erc-process-alive):
* erc.el (erc-kill-server):
* erc.el (erc-kill-channel):
* servers.pl:

  • Participants
  • Parent commits 861d72e

Comments (0)

Files changed (47)

 benj2       Benjamin Drieu <benj@debian.org>
 bigmike160  Michael Olson <mwolson@gnu.org>
 bojohan     Johan Bockgard <bojohan@users.sourceforge.net>
-disumu      Diane Murray <dsm@muenster.de>
+disumu      Diane Murray <disumu@x3y2z1.net>
 elisteran   Brian Palmer <bpalmer@gmail.com>
 emcdloc     Edward O'Connor <ted@oconnor.cx>
 forcer      Jorgen Schaefer <forcer@users.sourceforge.net>
 Tijs van Bakel <smoke@wanadoo.nl>:
   * helped a lot in crucial rewriting phase
 
-Diane Murray <dsm@muenster.de>:
+Diane Murray <disumu@x3y2z1.net>:
   * Miscellaneous development, additions, bug fixes
   * erc-nickserv.el
 
 
 Andreas Schwab <schwab@suse.de>:
   * Corrected a bug in sorting of channel users (erc.el).
+  * Fixed an unnecessary use of the `format' function (erc.el).
+  * Added an entry for OFTC in erc-nickserv-alist.
 
 Kai Fan (m_pupil AT yahoo DOT com) (aka "It's me FKtPp ;)"):
   * Enhanced non-ASCII character support (erc-backend.el).
   * Submitted small patch that fixed a load failure in erc-autoaway.el
     when using Emacs21.
 
+John Paul Wallington (jpw AT pobox DOT com):
+  * Recommended replacing calls to `string-to-int' with
+    `string-to-number'.
+
+Luigi Panzeri (matley AT muppetslab DOT org):
+  * Provided an erc-nickserv-alist entry for Azzurra.
+
 ----
 
 P.S.: Many people contributed small bits to ERC whose names I probably
+2005-10-15  Adrian Aichner  <adrian@xemacs.org>
+
+	* Full sync with upstream revision 1.774.
+	* AUTHORS: 
+	* CREDITS:
+	* ChangeLog.2002.upstream:
+	* ChangeLog.2004.upstream:
+	* ChangeLog.upstream:
+	* Makefile (AUTHOR_VERSION):
+	* Makefile.upstream:
+	* NEWS:
+	* erc-autoaway.el:
+	* erc-autoaway.el (erc-autoaway-version):
+	* erc-autoaway.el (defvar):
+	* erc-autoaway.el (erc-autoaway-message):
+	* erc-autojoin.el:
+	* erc-autojoin.el (erc-autojoin-version):
+	* erc-autojoin.el (erc-autojoin-channels):
+	* erc-autojoin.el (erc-autojoin-add):
+	* erc-autojoin.el (erc-autojoin-remove):
+	* erc-backend.el:
+	* erc-backend.el (erc-server-current-nick): New.
+	* erc-backend.el (erc-server-process): New.
+	* erc-backend.el (erc-session-server): New.
+	* erc-backend.el (erc-session-port): New.
+	* erc-backend.el (erc-server-announced-name): New.
+	* erc-backend.el (erc-server-parameters): New.
+	* erc-backend.el (erc-server-connected): New.
+	* erc-backend.el (erc-server-quitting): New.
+	* erc-backend.el (erc-server-lines-sent): New.
+	* erc-backend.el (erc-server-last-peers): New.
+	* erc-backend.el (erc-server-last-sent-time): New.
+	* erc-backend.el (erc-server-last-ping-time): New.
+	* erc-backend.el (erc-server-lag): New.
+	* erc-backend.el (erc-server-filter-data): New.
+	* erc-backend.el (erc-server-duplicates): New.
+	* erc-backend.el (erc-server-processing-p): New.
+	* erc-backend.el (erc-server-flood-last-message): New.
+	* erc-backend.el (erc-server-flood-queue): New.
+	* erc-backend.el (erc-server-flood-timer): New.
+	* erc-backend.el (erc-server): New.
+	* erc-backend.el (erc-server-auto-reconnect): New.
+	* erc-backend.el (erc-split-line-length): New.
+	* erc-backend.el (erc-server-coding-system): New.
+	* erc-backend.el (erc-encoding-coding-alist): New.
+	* erc-backend.el (erc-server-connect-function): New.
+	* erc-backend.el (erc-server-prevent-duplicates): New.
+	* erc-backend.el (erc-server-duplicate-timeout): New.
+	* erc-backend.el (erc-server-flood-margin): New.
+	* erc-backend.el (erc-server-flood-penalty): New.
+	* erc-backend.el (erc-server-send-ping-interval): New.
+	* erc-backend.el (erc-server-ping-handler): New.
+	* erc-backend.el (erc-split-line): New.
+	* erc-backend.el (erc-upcase-first-word): New.
+	* erc-backend.el (erc-server-setup-periodical-server-ping): New.
+	* erc-backend.el (erc-server-connect): New.
+	* erc-backend.el (erc-server-filter-function): New.
+	* erc-backend.el (erc-process-sentinel-1): New.
+	* erc-backend.el (erc-process-sentinel): New.
+	* erc-backend.el (erc-coding-system-for-target): New.
+	* erc-backend.el (erc-decode-string-from-target): New.
+	* erc-backend.el (erc-send-line): New.
+	* erc-backend.el (erc-server-send): New.
+	* erc-backend.el (erc-server-send-queue): New.
+	* erc-backend.el (erc-message): New.
+	* erc-backend.el (erc-send-ctcp-message): New.
+	* erc-backend.el (erc-send-ctcp-notice): New.
+	* erc-backend.el (erc-decode-parsed-server-response):
+	* erc-backend.el (erc-handle-parsed-server-response):
+	* erc-backend.el (erc-handle-unknown-server-response):
+	* erc-backend.el (INVITE):
+	* erc-backend.el (JOIN):
+	* erc-backend.el (PING):
+	* erc-backend.el (PONG):
+	* erc-backend.el (PRIVMSG):
+	* erc-backend.el (001):
+	* erc-backend.el (MOTD):
+	* erc-backend.el (004):
+	* erc-backend.el (252):
+	* erc-backend.el (321):
+	* erc-backend.el (322):
+	* erc-backend.el (352):
+	* erc-backend.el (401):
+	* erc-bbdb.el:
+	* erc-bbdb.el (erc-bbdb-version):
+	* erc-bbdb.el (erc-bbdb-irc-highlight-field):
+	* erc-bbdb.el (erc-bbdb-bitlbee-name-field): New.
+	* erc-bbdb.el (erc-bbdb-search-name-and-create):
+	* erc-bbdb.el (erc-bbdb-insinuate-and-show-entry):
+	* erc-bbdb.el (erc-bbdb-whois):
+	* erc-bbdb.el (erc-bbdb-JOIN):
+	* erc-bbdb.el (erc-bbdb-NICK):
+	* erc-button.el:
+	* erc-button.el (erc-button-version):
+	* erc-chess.el:
+	* erc-chess.el (erc-chess-version):
+	* erc-chess.el (erc-chess-handler):
+	* erc-chess.el (erc-chess-engine-create):
+	* erc-compat.el:
+	* erc-compat.el (erc-compat-version):
+	* erc-compat.el (not):
+	* erc-compat.el (erc-view-mode-enter):
+	* erc-compat.el ('erc-view-mode-enter): 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 (erc-dcc-version):
+	* erc-dcc.el (erc-dcc-host):
+	* erc-dcc.el (erc-cmd-DCC):
+	* erc-dcc.el (erc-dcc-do-CHAT-command):
+	* erc-dcc.el (erc-dcc-do-LIST-command):
+	* erc-dcc.el (erc-dcc-handle-ctcp-send):
+	* erc-dcc.el (erc-dcc-chat-request): New.
+	* erc-dcc.el (erc-dcc-handle-ctcp-chat):
+	* erc-dcc.el (erc-dcc-get-parent): New.
+	* erc-dcc.el (erc-dcc-nick):
+	* erc-dcc.el (erc-dcc-send-file):
+	* erc-dcc.el (erc-dcc-get-file):
+	* erc-dcc.el (erc-dcc-get-filter):
+	* erc-dcc.el (erc-dcc-get-sentinel):
+	* erc-dcc.el (erc-cmd-CREQ):
+	* erc-dcc.el (erc-cmd-SREQ):
+	* erc-dcc.el (erc-dcc-chat):
+	* erc-dcc.el (erc-dcc-chat-setup):
+	* erc-dcc.el (erc-dcc-chat-accept):
+	* erc-dcc.el (erc-dcc-chat-parse-output):
+	* erc-dcc.el (erc-dcc-chat-close):
+	* erc-ezbounce.el:
+	* erc-ezbounce.el (erc-ezb-version):
+	* erc-ezbounce.el (erc-cmd-ezb):
+	* erc-ezbounce.el (erc-ezb-identify):
+	* erc-ezbounce.el (erc-ezb-select):
+	* erc-ezbounce.el (erc-ezb-select-session):
+	* erc-fill.el:
+	* erc-fill.el (erc-fill-version):
+	* erc-goodies.el (erc-scroll-to-bottom):
+	* erc-goodies.el (erc-occur):
+	* erc-ibuffer.el:
+	* erc-ibuffer.el (erc-ibuffer-version):
+	* erc-ibuffer.el (erc-server):
+	* erc-ibuffer.el (erc-server-name):
+	* erc-ibuffer.el (erc-target):
+	* erc-ibuffer.el (erc-topic):
+	* erc-ibuffer.el (erc-away):
+	* erc-ibuffer.el (erc-channel-modes):
+	* erc-identd.el:
+	* erc-identd.el (erc-identd-start):
+	* erc-imenu.el:
+	* erc-imenu.el (erc-imenu-version):
+	* erc-imenu.el (erc-unfill-notice):
+	* erc-imenu.el (erc-create-imenu-index):
+	* erc-lang.el:
+	* erc-list.el:
+	* erc-list.el (erc-list-version):
+	* erc-list.el (erc-chanlist):
+	* erc-list.el (erc-chanlist-highlight-line):
+	* erc-list.el (erc-chanlist-toggle-sort-state):
+	* erc-log.el:
+	* erc-log.el (erc-log-version):
+	* erc-log.el (erc-generate-log-file-name-function):
+	* erc-log.el (log):
+	* erc-log.el (erc-save-buffer-in-logs):
+	* erc-match.el:
+	* erc-match.el (erc-match-version):
+	* erc-match.el (erc-text-matched-hook):
+	* erc-match.el (erc-add-fool):
+	* erc-match.el (erc-log-matches):
+	* erc-match.el (away)): Removed.
+	* erc-match.el (erc-log-matches-make-buffer):
+	* erc-match.el (erc-log-matches-come-back):
+	* erc-menu.el:
+	* erc-menu.el (erc-menu-version):
+	* erc-menu.el (erc-menu-definition):
+	* erc-menu.el ("erc"):
+	* erc-nets.el:
+	* erc-nets.el (erc-nets-version):
+	* erc-nets.el (erc-networks-alist):
+	* erc-nets.el (erc-determine-network):
+	* erc-nets.el (nil):
+	* erc-nets.el (erc-set-network-name):
+	* erc-nets.el (erc-nets):
+	* erc-netsplit.el:
+	* erc-netsplit.el (erc-netsplit-version):
+	* erc-nicklist.el:
+	* erc-nicklist.el (nil):
+	* erc-nicklist.el (erc-nicklist-version):
+	* erc-nicklist.el (erc-nicklist-use-icons): New.
+	* erc-nicklist.el (erc-nicklist-icons-directory): New.
+	* erc-nicklist.el (erc-nicklist-voiced-position): New.
+	* erc-nicklist.el (erc-nicklist-bitlbee-connected-p): New.
+	* erc-nicklist.el (erc-nicklist-images-alist): New.
+	* erc-nicklist.el (erc-nicklist-insert-medium-name-or-icon): New.
+	* erc-nicklist.el (erc-nicklist-search-for-nick): New.
+	* erc-nicklist.el (erc-nicklist-insert-contents): New.
+	* erc-nicklist.el (erc-nicklist-update):
+	* erc-nicklist.el (erc-nicklist-mode-map):
+	* erc-nicklist.el (erc-nicklist-call-erc-command):
+	* erc-nicklist.el (erc-nicklist-cmd-QUERY): New.
+	* erc-nicklist.el (erc-nicklist-kbd-cmd-QUERY): New.
+	* erc-nicklist.el (erc-nicklist-menu):
+	* erc-nicklist.el (erc-nicklist-kbd-menu): New.
+	* erc-nicklist.el (erc-nicklist-channel-nicks): Removed.
+	* erc-nicklist.el (erc-nicklist-channel-users-info): New.
+	* erc-nickserv.el:
+	* erc-nickserv.el (erc-nickserv-version):
+	* erc-nickserv.el (erc-nickserv-alist):
+	* erc-nickserv.el (erc-nickserv-call-identify-function):
+	* erc-notify.el:
+	* erc-notify.el (erc-notify-list):
+	* erc-notify.el (erc-notify-timer):
+	* erc-notify.el (erc-notify-JOIN):
+	* erc-notify.el (erc-notify-NICK):
+	* erc-notify.el (erc-notify-QUIT):
+	* erc-notify.el (erc-cmd-NOTIFY):
+	* erc-page.el:
+	* erc-page.el (erc-ctcp-query-PAGE):
+	* erc-page.el (erc-cmd-PAGE):
+	* erc-pcomplete.el:
+	* erc-pcomplete.el (erc-pcomplete-version):
+	* erc-pcomplete.el (pcomplete-erc-all-nicks):
+	* erc-pcomplete.el (pcomplete-erc-channels):
+	* erc-ring.el:
+	* erc-ring.el (erc-ring-version):
+	* erc-sound.el:
+	* erc-speedbar.el:
+	* erc-speedbar.el (erc-speedbar-version):
+	* erc-speedbar.el (erc-speedbar-buttons):
+	* erc-speedbar.el (erc-speedbar-server-buttons):
+	* erc-speedbar.el (erc-speedbar-channel-buttons):
+	* erc-speedbar.el (erc-speedbar-expand-channel):
+	* erc-spelling.el:
+	* erc-spelling.el (erc-spelling-version):
+	* erc-spelling.el (erc-spelling-dictionaries): Removed.
+	* erc-stamp.el:
+	* erc-stamp.el (erc-stamp-version):
+	* erc-stamp.el (erc-add-timestamp):
+	* erc-stamp.el (erc-format-timestamp):
+	* erc-track.el:
+	* erc-track.el (erc-track-version):
+	* erc-track.el (erc-track-visibility):
+	* erc-track.el (track):
+	* erc-track.el (erc-modified-channels-update):
+	* erc-track.el (erc-track-modified-channels):
+	* erc-track.el (erc-track-switch-direction):
+	* erc-track.el (erc-track-sort-by-activest):
+	* erc-truncate.el:
+	* erc-viper.el:
+	* erc-xdcc.el:
+	* erc.el:
+	* erc.el (erc-version-string):
+	* erc.el (erc-menu):
+	* erc.el (erc-display):
+	* erc.el (erc-coding-systems): Removed.
+	* erc.el (erc-backend):
+	* erc.el ('erc-send-command): New.
+	* erc.el (erc-session-password):
+	* erc.el (erc-session-server): Removed.
+	* erc.el (erc-disconnected-hook):
+	* erc.el (erc-session-port): Removed.
+	* erc.el (erc-announced-server-name): Removed.
+	* erc.el (erc-server-parameters): Removed.
+	* erc.el (erc-process): Removed.
+	* erc.el (erc-connected): Removed.
+	* erc.el (erc-server-user):
+	* erc.el (erc-channel-user):
+	* erc.el (erc-get-server-user):
+	* erc.el (erc-add-server-user):
+	* erc.el (erc-remove-server-user):
+	* erc.el (erc-change-user-nickname):
+	* erc.el (erc-remove-channel-users):
+	* erc.el (channel-topic): Removed.
+	* erc.el (erc-channel-topic): New.
+	* erc.el (channel-modes): Removed.
+	* erc.el (erc-channel-modes): New.
+	* erc.el (erc-prompt):
+	* erc.el (erc-notice-prefix):
+	* erc.el (erc-prompt-for-channel-key):
+	* erc.el (erc-auto-reconnect): Removed.
+	* erc.el (erc-flood-protect):
+	* erc.el (erc-flood-limit): Removed.
+	* erc.el (erc-flood-limit2): Removed.
+	* erc.el (erc-mode-map):
+	* erc.el (erc-server-buffer):
+	* erc.el (erc-server-buffer-live-p):
+	* erc.el (erc-ison-p):
+	* erc.el (erc-mode):
+	* erc.el (erc-generate-new-buffer-name):
+	* erc.el (erc-with-buffer):
+	* erc.el (erc-buffer-filter):
+	* erc.el (erc-buffer-list):
+	* erc.el (erc-iswitchb):
+	* erc.el (current-nick): Removed.
+	* erc.el (channel-user-limit): Removed.
+	* erc.el (erc-channel-user-limit): New.
+	* erc.el (channel-key): Removed.
+	* erc.el (erc-channel-key): New.
+	* erc.el (last-peers): Removed.
+	* erc.el (invitation): Removed.
+	* erc.el (erc-invitation): New.
+	* erc.el (away): Removed.
+	* erc.el (erc-away): New.
+	* erc.el (channel-list): Removed.
+	* erc.el (erc-channel-list): New.
+	* erc.el (last-sent-time): Removed.
+	* erc.el (last-ping-time): Removed.
+	* erc.el (erc-modules):
+	* erc.el (last-ctcp-time): Removed.
+	* erc.el (erc-lines-sent): Removed.
+	* erc.el (erc-bytes-sent): Removed.
+	* erc.el (quitting): Removed.
+	* erc.el (bad-nick): Removed.
+	* erc.el (erc-bad-nick): New.
+	* erc.el (erc):
+	* erc.el (erc-previous-read): Removed.
+	* erc.el (erc-select-read-args):
+	* erc.el (erc-select-ssl):
+	* erc.el (erc-connect-function): Removed.
+	* erc.el (erc-connect): Removed.
+	* erc.el (erc-log-irc-protocol):
+	* erc.el (erc-split-multiline): Removed.
+	* erc.el (erc-toggle-debug-irc-protocol):
+	* erc.el (erc-process-filter): Removed.
+	* erc.el (erc-send-action):
+	* erc.el (erc-process-sentinel-1): Removed.
+	* erc.el (erc-display-line-1):
+	* erc.el (erc-process-sentinel): Removed.
+	* erc.el (erc-flood-exceeded-p): Removed.
+	* erc.el (erc-send-command): Removed.
+	* erc.el (erc-display-line):
+	* erc.el (erc-default-coding-system): Removed.
+	* erc.el (erc-encoding-coding-alist): Removed.
+	* erc.el (erc-send-input-line):
+	* erc.el (erc-coding-system-for-target): Removed.
+	* erc.el (erc-encode-string-for-target): Removed.
+	* erc.el (erc-decode-string-from-target): Removed.
+	* erc.el (erc-split-command): Removed.
+	* erc.el (erc-process-input-line):
+	* erc.el (erc-upcase-first-word): Removed.
+	* erc.el (erc-send-ctcp-message): Removed.
+	* erc.el (erc-send-ctcp-notice): Removed.
+	* erc.el (erc-cmd-default):
+	* erc.el (erc-cmd-UNIGNORE):
+	* erc.el (erc-cmd-OPS):
+	* erc.el (erc-cmd-AWAY):
+	* erc.el (erc-cmd-JOIN):
+	* erc.el (erc-cmd-NAMES):
+	* erc.el (erc-cmd-KICK):
+	* erc.el (erc-cmd-WHOIS):
+	* erc.el (erc-send-message):
+	* erc.el (erc-message): Removed.
+	* erc.el (erc-cmd-MODE):
+	* erc.el (erc-cmd-NICK):
+	* erc.el (erc-cmd-PART):
+	* erc.el (erc-cmd-QUOTE):
+	* erc.el (erc-cmd-QUIT):
+	* erc.el (erc-cmd-BYE):
+	* erc.el (erc-kill-queries-on-quit): Removed.
+	* erc.el (erc-cmd-SV):
+	* erc.el (erc-cmd-DEOP):
+	* erc.el (erc-cmd-OP):
+	* erc.el (erc-cmd-TIME):
+	* erc.el (erc-cmd-TOPIC):
+	* erc.el (erc-cmd-APPENDTOPIC):
+	* erc.el (erc-cmd-CLEARTOPIC):
+	* erc.el (channel-banlist): Removed.
+	* erc.el (erc-channel-banlist): New.
+	* erc.el (erc-cmd-BANLIST):
+	* erc.el (erc-cmd-MASSUNBAN):
+	* erc.el (erc-display-prompt):
+	* erc.el (erc-input-message):
+	* erc.el (erc-join-channel):
+	* erc.el (erc-set-topic):
+	* erc.el (erc-set-channel-limit):
+	* erc.el (erc-set-channel-key):
+	* erc.el (erc-quit-server):
+	* erc.el (erc-query):
+	* erc.el (erc-duplicates): Removed.
+	* erc.el (erc-duplicate-timeout): Removed.
+	* erc.el (erc-prevent-duplicates): Removed.
+	* erc.el (erc-nickname-in-use):
+	* erc.el (erc-server-hooks):
+	* erc.el (erc-auto-query):
+	* erc.el (erc-lag): Removed.
+	* erc.el (erc-send-ping-interval): Removed.
+	* erc.el (erc-ping-handler): Removed.
+	* erc.el (erc-setup-periodical-server-ping): Removed.
+	* erc.el (erc-echo-notice-in-user-buffers):
+	* erc.el (erc-echo-notice-in-user-and-target-buffers):
+	* erc.el (erc-echo-notice-in-first-user-buffer):
+	* erc.el (erc-server-version): Removed.
+	* erc.el (erc-banlist-store):
+	* erc.el (erc-banlist-finished):
+	* erc.el (erc-banlist-update):
+	* erc.el (erc-connection-established):
+	* erc.el (erc-set-initial-user-mode):
+	* erc.el (erc-ctcp-query-FINGER):
+	* erc.el (erc-process-away):
+	* erc.el (erc-update-channel-topic):
+	* erc.el (erc-set-modes):
+	* erc.el (erc-update-modes):
+	* erc.el (erc-update-channel-limit):
+	* erc.el (erc-update-channel-key):
+	* erc.el (erc-handle-user-status-change):
+	* erc.el (erc-send-current-line):
+	* erc.el (erc-send-input):
+	* erc.el (erc-display-command):
+	* erc.el (erc-send-single-line): Removed.
+	* erc.el (erc-display-msg):
+	* erc.el (erc-set-current-nick):
+	* erc.el (erc-current-nick):
+	* erc.el (erc-add-default-channel):
+	* erc.el (erc-ignored-reply-p):
+	* erc.el (with-erc-channel-buffer): Removed.
+	* erc.el (erc-toggle-flood-control):
+	* erc.el (erc-toggle-channel-mode):
+	* erc.el (erc-login):
+	* erc.el (erc-determine-parameters):
+	* erc.el (erc-away-p):
+	* erc.el (erc-mode-line-format):
+	* erc.el (erc-format-target):
+	* erc.el (erc-format-target-and/or-server):
+	* erc.el (erc-format-away-status):
+	* erc.el (erc-format-channel-modes):
+	* erc.el (erc-update-mode-line-buffer):
+	* erc.el (erc-arrange-session-in-multiple-windows):
+	* erc.el (erc-process-alive):
+	* erc.el (erc-kill-server):
+	* erc.el (erc-kill-channel):
+	* servers.pl:
+
+2005-10-15  Adrian Aichner  <adrian@xemacs.org>
+
+	* AUTHORS:
+	* CREDITS:
+	* ChangeLog.2002.upstream:
+	* ChangeLog.2004.upstream:
+	* ChangeLog.upstream:
+	* Makefile (AUTHOR_VERSION):
+	* Makefile.upstream:
+	* NEWS:
+	* erc-autoaway.el:
+	* erc-autoaway.el (erc-autoaway-version):
+	* erc-autoaway.el (defvar):
+	* erc-autoaway.el (erc-autoaway-message):
+	* erc-autojoin.el:
+	* erc-autojoin.el (erc-autojoin-version):
+	* erc-autojoin.el (erc-autojoin-channels):
+	* erc-autojoin.el (erc-autojoin-add):
+	* erc-autojoin.el (erc-autojoin-remove):
+	* erc-backend.el:
+	* erc-backend.el (erc-server-current-nick): New.
+	* erc-backend.el (erc-server-process): New.
+	* erc-backend.el (erc-session-server): New.
+	* erc-backend.el (erc-session-port): New.
+	* erc-backend.el (erc-server-announced-name): New.
+	* erc-backend.el (erc-server-parameters): New.
+	* erc-backend.el (erc-server-connected): New.
+	* erc-backend.el (erc-server-quitting): New.
+	* erc-backend.el (erc-server-lines-sent): New.
+	* erc-backend.el (erc-server-last-peers): New.
+	* erc-backend.el (erc-server-last-sent-time): New.
+	* erc-backend.el (erc-server-last-ping-time): New.
+	* erc-backend.el (erc-server-lag): New.
+	* erc-backend.el (erc-server-filter-data): New.
+	* erc-backend.el (erc-server-duplicates): New.
+	* erc-backend.el (erc-server-processing-p): New.
+	* erc-backend.el (erc-server-flood-last-message): New.
+	* erc-backend.el (erc-server-flood-queue): New.
+	* erc-backend.el (erc-server-flood-timer): New.
+	* erc-backend.el (erc-server): New.
+	* erc-backend.el (erc-server-auto-reconnect): New.
+	* erc-backend.el (erc-split-line-length): New.
+	* erc-backend.el (erc-server-coding-system): New.
+	* erc-backend.el (erc-encoding-coding-alist): New.
+	* erc-backend.el (erc-server-connect-function): New.
+	* erc-backend.el (erc-server-prevent-duplicates): New.
+	* erc-backend.el (erc-server-duplicate-timeout): New.
+	* erc-backend.el (erc-server-flood-margin): New.
+	* erc-backend.el (erc-server-flood-penalty): New.
+	* erc-backend.el (erc-server-send-ping-interval): New.
+	* erc-backend.el (erc-server-ping-handler): New.
+	* erc-backend.el (erc-split-line): New.
+	* erc-backend.el (erc-upcase-first-word): New.
+	* erc-backend.el (erc-server-setup-periodical-server-ping): New.
+	* erc-backend.el (erc-server-connect): New.
+	* erc-backend.el (erc-server-filter-function): New.
+	* erc-backend.el (erc-process-sentinel-1): New.
+	* erc-backend.el (erc-process-sentinel): New.
+	* erc-backend.el (erc-coding-system-for-target): New.
+	* erc-backend.el (erc-decode-string-from-target): New.
+	* erc-backend.el (erc-send-line): New.
+	* erc-backend.el (erc-server-send): New.
+	* erc-backend.el (erc-server-send-queue): New.
+	* erc-backend.el (erc-message): New.
+	* erc-backend.el (erc-send-ctcp-message): New.
+	* erc-backend.el (erc-send-ctcp-notice): New.
+	* erc-backend.el (erc-decode-parsed-server-response):
+	* erc-backend.el (erc-handle-parsed-server-response):
+	* erc-backend.el (erc-handle-unknown-server-response):
+	* erc-backend.el (INVITE):
+	* erc-backend.el (JOIN):
+	* erc-backend.el (PING):
+	* erc-backend.el (PONG):
+	* erc-backend.el (PRIVMSG):
+	* erc-backend.el (001):
+	* erc-backend.el (MOTD):
+	* erc-backend.el (004):
+	* erc-backend.el (252):
+	* erc-backend.el (321):
+	* erc-backend.el (322):
+	* erc-backend.el (352):
+	* erc-backend.el (401):
+	* erc-bbdb.el:
+	* erc-bbdb.el (erc-bbdb-version):
+	* erc-bbdb.el (erc-bbdb-irc-highlight-field):
+	* erc-bbdb.el (erc-bbdb-bitlbee-name-field): New.
+	* erc-bbdb.el (erc-bbdb-search-name-and-create):
+	* erc-bbdb.el (erc-bbdb-insinuate-and-show-entry):
+	* erc-bbdb.el (erc-bbdb-whois):
+	* erc-bbdb.el (erc-bbdb-JOIN):
+	* erc-bbdb.el (erc-bbdb-NICK):
+	* erc-button.el:
+	* erc-button.el (erc-button-version):
+	* erc-chess.el:
+	* erc-chess.el (erc-chess-version):
+	* erc-chess.el (erc-chess-handler):
+	* erc-chess.el (erc-chess-engine-create):
+	* erc-compat.el:
+	* erc-compat.el (erc-compat-version):
+	* erc-compat.el (not):
+	* erc-compat.el (erc-view-mode-enter):
+	* erc-compat.el ('erc-view-mode-enter): 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):
 2005-06-05  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 0.17 released.

File ChangeLog.2002.upstream

 
 	* debian/rules 1.10: Use $(wildcard *.el) instead of a hardcoded list
 
-2002-07-03  Diane Murray  <dsm@muenster.de>
+2002-07-03  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el 1.292:
 	erc-iswitchb now works correctly if erc-modified-channels-alist is non-nil
 
-2002-07-01  Diane Murray  <dsm@muenster.de>
+2002-07-01  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-menu.el 1.8:
 	* changed how we check if we should activate "Track hidden channels" and
 	Make /set anonymous-lign set erc-anonymous-login, also report
 	which var was set to which val.
 
-2002-06-28  Diane Murray  <dsm@muenster.de>
+2002-06-28  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-menu.el 1.6: added "Customize ERC"
 
 	  (by rw)
 	Delete (erc-display-prompt) from reconnect to avoid clutter
 
-2002-06-23  Diane Murray  <dsm@muenster.de>
+2002-06-23  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el 1.288:
 	erc-get-channel-mode-from-keypress is now bound to C-c C-m
 	* erc-track.el 1.15:
 	Fixed bug where buffer-names suddenly had text-properties.
 
-2002-06-19  Diane Murray  <dsm@muenster.de>
+2002-06-19  Diane Murray  <disumu@x3y2z1.net>
 
 	* Makefile 1.5: changed erc-auto.el to $(SPECIAL) in make fullclean
 
 	* Makefile 1.4: remove erc-auto.el on make fullclean
 
-2002-06-18  Diane Murray  <dsm@muenster.de>
+2002-06-18  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-match.el 1.10: fixed spelling error
 
 	* erc-track.el:
 	  added support for erc-current-nick-face
 
-2002-06-17  Diane Murray  <dsm@muenster.de>
+2002-06-17  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el 1.287: * added beginning suport 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
 
-2002-06-16  Diane Murray  <dsm@muenster.de>
+2002-06-16  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el 1.286:
 	* bugfix: when pasting lines with blank lines in between, remove the blank lines
 	* erc-nickserv.el 1.4 (erc-networks): Added doc string.
 	(erc-nickserv-alist): Added doc string.
 
-2002-06-14  Diane Murray  <dsm@muenster.de>
+2002-06-14  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-ring.el 1.4:
 	fixed bug so that the prompt and command always get put at the end of the buffer
 	Added :type for erc-nickserv-passwords custom.
 	Fixed hook usage.
 
-2002-06-07  Diane Murray  <dsm@muenster.de>
+2002-06-07  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-nickserv.el 1.2: * added GalaxyNet
 
 
 	* erc.el 1.284: Added /squery command
 
-2002-06-06  Diane Murray  <dsm@muenster.de>
+2002-06-06  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-menu.el 1.5: * made group Channel modes
 	  - moved change mode and invite only mode to here
 	* erc-match.el: Fixed a stupid mistake where
 	                "*** Your new nick is <foo>" would trigger an error.
 
-2002-06-04  Diane Murray  <dsm@muenster.de>
+2002-06-04  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-nickserv.el 1.1, erc.el 1.282: * added erc-nickserv.el
 	* moved nickserv identification variables and functions to the new file
 
 	* fixed bug where nil was shown if no reason was given by users on /PART
 
-2002-06-03  Diane Murray  <dsm@muenster.de>
+2002-06-03  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-match.el 1.7:
 	* fixed bug where erc-log-matches produced an error when the value of
 	  (erc-default-target) was not a channel
 	* use erc-format-timestamp, if it's non-nil, for %t in erc-log-match-format
 
-2002-06-01  Diane Murray  <dsm@muenster.de>
+2002-06-01  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-button.el 1.18:
 	* made action case insensitive in erc-nick-popup and added a more descriptive
 	erc-track.el: erc-track-exclude-types: New variable. Defaults to ("JOIN" "PART") right now for testing, it should eventually set to nil soon again.
 	(erc-track-modified-channels): Use above fun and var to optionally exclude certain message types from channel tracking.
 
-2002-05-28  Diane Murray  <dsm@muenster.de>
+2002-05-28  Diane Murray  <disumu@x3y2z1.net>
 
 	* CREDITS 1.5: added myself, vain as it sounds ;)
 
 	* erc-nets.el 1.3: Added some old code I once worked on.
 	Added autoload cookie
 
-2002-05-24  Diane Murray  <dsm@muenster.de>
+2002-05-24  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-fill.el 1.10:
 	removed reference in documentation to old variable, changed it to the new one
 	  - new function erc-set-initial-user-mode gets called from
 	    erc-connection-established
 
-2002-05-22  Diane Murray  <dsm@muenster.de>
+2002-05-22  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el 1.270: fixed bug where prompt was missing after reconnect
 
-2002-05-21  Diane Murray  <dsm@muenster.de>
+2002-05-21  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el 1.269:
 	in erc-nickserv-identify: if network is unknown, just use "Nickserv"
 	  require NickServ@services.dal.net
 	  now sends to all NickServ with nick@server where possible
 
-2002-05-17  Diane Murray  <dsm@muenster.de>
+2002-05-17  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-fill.el 1.9:
 	* filling with erc-fill-variable now works with custom defined fill width:
 
 	* erc.el 1.264: whitespace fix
 
-2002-05-15  Diane Murray  <dsm@muenster.de>
+2002-05-15  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el 1.263:
 	* added explanation of empty string working in erc-quit-reason-various-alist
 	  "/ctcp nick time" and not just "/ctcp nick TIME"
 	* timestamp in front of server notices now shown in the timestamp face
 
-2002-05-13  Diane Murray  <dsm@muenster.de>
+2002-05-13  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el 1.262:
 	- in erc-format-privmessage: `erc-format-timestamp' added to message after

File ChangeLog.2004.upstream

 	(smiley): Module moved from erc.el to erc-goodies.el.
 	(scrolltobottom, readonly, noncommands, unmorse): New modules.
 
-2004-12-20  Diane Murray <dsm@muenster.de>
+2004-12-20  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el: (erc-format-away-status): Use `a', not `away' - that's
 	why it's there.
 	and not the entire message. Revision 1.707 had broken /me.
 	Shouting is bad! :)
 
-2004-12-14  Diane Murray <dsm@muenster.de>
+2004-12-14  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-nets.el (erc-networks-alist): Change undernet to Undernet as
 	is used in `erc-server-alist', so that completion works when using
 	`erc-server-select'.  This should fix Debian bug #282003 (erc:
 	cannot connect to Undernet).
 
-2004-12-14  Diane Murray <dsm@muenster.de>
+2004-12-14  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-backend.el: (def-edebug-spec): Only run this if 'edebug is
 	available.
 
-2004-12-14  Diane Murray <dsm@muenster.de>
+2004-12-14  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el: The last change to `erc-mode-line-format' introduced a
 	bug in Xemacs - it can't handle the #(" "...) strings at all.  The
 	(if it is bound) to the formatted `erc-header-line-format', then
 	do a `force-mode-line-update'.
 
-2004-12-12  Diane Murray <dsm@muenster.de>
+2004-12-12  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-modules): Disable modules removed with `customize'.
 	(erc-update-modules): Try to give a more descriptive error
 	message.
 
-2004-12-12  Diane Murray <dsm@muenster.de>
+2004-12-12  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-complete.el, erc.el, erc-list.el, erc-nets.el,
 	erc-nicklist.el, erc-pcomplete.el, erc-replace.el, erc-speak.el,
 	invocation, so erc-iswitchb can be substituted directly for
 	iswitchb in code.
 
-2004-12-11  Diane Murray <dsm@muenster.de>
+2004-12-11  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-track.el (erc-track-position-in-mode-line): Allow for the
 	fact that `erc-track-mode' isn't bound when file is loaded.
 
-2004-12-11  Diane Murray <dsm@muenster.de>
+2004-12-11  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-track.el (erc-track-position-in-mode-line): New customizable
 	variable.  (erc-track-remove-from-mode-line): New function.
 
 	* Makefile, debian/changelog: debian release 20041118-1
 
-2004-11-03  Diane Murray <dsm@muenster.de>
+2004-11-03  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-button.el (erc-button-buttonize-nicks): Set default value to
 	`t'.  Updated documentation and customization `:type' to reflect
 
 	* AUTHORS: Added self.
 
-2004-10-17  Diane Murray <dsm@muenster.de>
+2004-10-17  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-list.el: Added local variables for this file.
 	(erc-list-version): New.
 	(erc-prettify-channel-list, erc-chanlist-toggle-sort-state): Use
 	`unless' instead of when not.
 
-2004-10-17  Diane Murray <dsm@muenster.de>
+2004-10-17  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-backend.el (erc-handle-unknown-server-response): Fixed so
 	that the contents are only shown once. (MOTD): Display lines in
 	documentation.  Use `multiple-value-bind' to set variables in 367.
 	(391): Fixed so that the server name is shown correctly.
 
-2004-10-17  Diane Murray <dsm@muenster.de>
+2004-10-17  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-process-sentinel): Use CPROC instead of
 	`erc-process' in debug message.  Should fix a bug where an error
 	* HACKING: Add comment that C-c C-a can be useful if you write
 	ChangeLog entries using Emacs' standard functions.
 
-2004-05-17  Diane Murray <dsm@muenster.de>
+2004-05-17  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-speedbar.el: Ignore errors when attempting to require dframe
 	(there are a couple implementations of speedbar, one of which uses
 	(erc-speedbar-goto-buffer): Use dframe functions if dframe is
 	available.
 
-2004-05-17  Diane Murray <dsm@muenster.de>
+2004-05-17  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-autojoin.el: Added local variables for this file.
 	(erc-autojoin-add): The channel name is in `erc-response.contents'.
 	`erc-parse-line-from-server' version, since new version breaks for
 	a number of edge cases.
 
-2004-05-14  Diane Murray <dsm@muenster.de>
+2004-05-14  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-backend.el (erc-handle-unknown-server-response): New
 	function.  Added to `erc-default-server-functions'.  Display
 	(431, 445, 446, 451, 462, 463, 464, 465, 481, 483, 485, 491, 501,
 	502): All error responsess with no arguments grouped together.
 
-2004-05-14  Diane Murray <dsm@muenster.de>
+2004-05-14  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-message-type-member): Use `erc-response.command'.
 	`erc-track-exclude-types' should be respected again.
 	it.
 	(461): Command with invalid arguments is `second', not `third'.
 
-2004-05-14  Diane Murray <dsm@muenster.de>
+2004-05-14  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-notify.el (erc-notify-NICK): Use `erc-response.contents' to
 	get nickname.
 	(483, 491, 502, 005, KILL): Move from erc.el and rework using
 	`define-erc-response-handler' and erc-response struct.
 
-2004-05-12  Diane Murray <dsm@muenster.de>
+2004-05-12  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el: A few bug fixes to avoid errors after disconnect,
 	including the "Selecting deleted buffer" bug.
 	(erc-send-current-line): If there is no server buffer, let the
 	user know.
 
-2004-05-12  Diane Murray <dsm@muenster.de>
+2004-05-12  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el, erc-log.el: C-c C-l keybinding now defined in
 	erc-log.el.
 	(erc-cmd-JOIN): Fix applied for bug where /join -invite causes
 	errors when there's no `invitation'.
 
-2004-05-11  Diane Murray <dsm@muenster.de>
+2004-05-11  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el: (erc-cmd-JOIN): Make sure `chnl' is non-nil before trying
 	to join anything (chnl is not set if /join -invite is used but
 	there's no `invitation').
 
-2004-05-10  Diane Murray <dsm@muenster.de>
+2004-05-10  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-log.el: Define C-c C-l keybinding outside of `erc-log-mode',
 	making it available all the time; autoload definition.
 	(erc-log-version): New.
 
-2004-05-09  Diane Murray <dsm@muenster.de>
+2004-05-09  Diane Murray <disumu@x3y2z1.net>
 
 	* AUTHORS, CREDITS, Makefile, erc-autoaway.el, erc-autojoin.el,
 	erc-button.el, erc-chess.el, erc-dcc.el, erc-ezbounce.el,
 	erc-xdcc.el, erc.el: Applied all relevant bug fixes and code
 	cleanup made between the time of the ERC_4_0_RELEASE tag until now.
 
-2004-05-09  Diane Murray <dsm@muenster.de>
+2004-05-09  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-menu.el: Updated copyright years.
 
 	reference to erc-save-queries-on-quit.
 	(erc-conditional-save-queries): Ditto.
 
-2004-05-06  Diane Murray <dsm@muenster.de>
+2004-05-06  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-speedbar.el: Updated copyright years.  Added local variables
 	for this file; fixed indenting.
 	(erc-speedbar-goto-buffer): Don't use dframe functions, as dframe
 	isn't available with the default speedbar.
 
-2004-05-06  Diane Murray <dsm@muenster.de>
+2004-05-06  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el: (erc-sort-channel-users-alphabetically): New function.
 	(erc-server-412, erc-server-432, erc-server-475): New functions.
 	(erc-define-catalog): Added s401, s403, s405, s412, s421, s432,
 	s474, s475, and s481.
 
-2004-05-06  Diane Murray <dsm@muenster.de>
+2004-05-06  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-nickserv.el: Added documentation to Commentary, Usage.
 	Removed `outline-mode' from file local variables.
 	(erc-nickserv-identify): PASSWORD is not optional.  Autoload
 	function.
 
-2004-05-05  Diane Murray <dsm@muenster.de>
+2004-05-05  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-join-hook, erc-quit-hook, erc-part-hook,
 	erc-kick-hook, erc-connect-pre-hook): Now customizable.
 	* erc.el (erc-wash-quit-reason): Quote regexp special characters
 	in NICK, LOGIN and HOST.
 
-2004-05-04  Diane Murray <dsm@muenster.de>
+2004-05-04  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-server-parameters): Typo fix in docstring.
 	(erc-input-line-position): `:type' is now a choice between integer
 
 	* erc-nicklist.el: Initial version.
 
-2004-04-28  Diane Murray <dsm@muenster.de>
+2004-04-28  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-menu.el: Added local variables for file, fixed indenting.
 	(erc-menu-version): New variable.
 	down.  "Track hidden channel buffers": Removed.  "Enable/Disable
 	ERC Modules": New.
 
-2004-04-28  Diane Murray <dsm@muenster.de>
+2004-04-28  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-mode-map): Removed binding for
 	`erc-save-buffer-in-logs' (moved to erc-log.el).
 	(erc-cmd-QUERY, erc-cmd-OPS): Now interactive.
 
-2004-04-28  Diane Murray <dsm@muenster.de>
+2004-04-28  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-log.el: Added local variables for this file.
 	(erc-log-channels-directory): Added directory as a choice in
 	(define-erc-module): Define and undefine key binding (C-c
 	C-l) for `erc-save-buffer-in-logs' here.
 
-2004-04-28  Diane Murray <dsm@muenster.de>
+2004-04-28  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-nets.el: Added local variables for this file.
 	(erc-networks-alist): Fixed `:type' to work better in
 	customization.
 
-2004-04-28  Diane Murray <dsm@muenster.de>
+2004-04-28  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-match.el: Added local variables for file.  (erc-keywords):
 	Use `list' instead of `cons' in `:type'.  Fixes bug where mismatch
 	Escape parentheses in docstring.  Added keyword, nick-or-keyword as
 	options in `:type'.
 
-2004-04-28  Diane Murray <dsm@muenster.de>
+2004-04-28  Diane Murray <disumu@x3y2z1.net>
 
 	* 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-right-column): Added `:group' and `:type'.
 
-2004-04-28  Diane Murray <dsm@muenster.de>
+2004-04-28  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-modules): Added bbdb, log, match, sound, and stamp
 	as `:type' options; changed documentation for autojoin, fill,
 	(erc-log-matches-types-alist): Added `current-nick' to valid
 	choices.
 
-2004-04-20  Diane Murray <dsm@muenster.de>
+2004-04-20  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-page.el, erc-ezbounce.el, erc-speak.el, erc-match.el,
 	erc-track.el (erc-ezbounce, erc-page, erc-speak): Groups defined.
 	and erc-insert-timestamp-function set to
 	'erc-insert-timestamp-left, but otherwise it works now.
 
-2004-04-20  Diane Murray <dsm@muenster.de>
+2004-04-20  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el: (erc-cmd-SV): Show features gtk, mac-carbon, multi-tty.
 	Fixed so that arguments fit the format (build date was not being
 	(erc-update-mode-line-buffer): Escape %-signs in `channel-topic'
 	here.
 
-2004-04-19  Diane Murray <dsm@muenster.de>
+2004-04-19  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el: (erc-send-action, erc-ctcp-query-ACTION,
 	erc-ctcp-reply-ECHO-hook): Let `erc-display-message-highlight'
 	(erc-server-477-hook): Use `erc-server-477'.
 	(erc-define-catalog): Added `no-invitation'.
 
-2004-04-14  Diane Murray <dsm@muenster.de>
+2004-04-14  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-nickserv.el: Local variables for file added.
 	(erc-nickserv-passwords): Customization: Network symbols updated
 	symbol.
 	(erc-nickserv-alist): Now customizable variable.
 
-2004-04-09  Diane Murray <dsm@muenster.de>
+2004-04-09  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-autoaway.el (erc-autoaway-reset-idletime): Make sure `line'
 	is a string to avoid errors upon startup.
 
-2004-04-06  Diane Murray <dsm@muenster.de>
+2004-04-06  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-autoaway.el (erc-autoaway-version): New variable.
 	(erc-auto-discard-away): Updated docstring.
 	which allows for aliases to "/away" and any other text that the
 	user wants to ignore when `erc-auto-discard-away' is non-nil.
 
-2004-04-06  Diane Murray <dsm@muenster.de>
+2004-04-06  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-autoaway.el (erc-autoaway-reset-idletime): Forgot /gaway in
 	regexp.
 
-2004-04-06  Diane Murray <dsm@muenster.de>
+2004-04-06  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-autoaway.el (erc-autoaway-reset-idletime): If the user sends
 	an "/away" command, don't call `erc-autoaway-set-back', fixes bug
 	(erc-autoaway-set-back): Changed `l' to `line' for better
 	understanding.
 
-2004-04-05  Diane Murray <dsm@muenster.de>
+2004-04-05  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-set-channel-key): Now able to remove key.
 	(erc-set-channel-limit): Now able to remove limit.
 	(erc-get-channel-mode-from-keypress): Fixed docstring.
 
-2004-04-04  Diane Murray <dsm@muenster.de>
+2004-04-04  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-join-channel): Allow for optional channel key.
 	(erc-set-modes): Need to set `channel-key' to nil in case of mode
 	(erc-prepare-mode-line-format): Only show key if
 	`erc-show-channel-key-p' is non-nil.
 
-2004-04-04  Diane Murray <dsm@muenster.de>
+2004-04-04  Diane Murray <disumu@x3y2z1.net>
 
  	* erc.el (channel-key): New variable.
 	(erc-update-channel-key): New function.
 	default behavior, is for `erc-echo-notice-always-hook' to be set to
 	`(erc-echo-notice-in-default-buffer).
 
-2004-03-21  Diane Murray <dsm@muenster.de>
+2004-03-21  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-track.el: (erc-modified-channels-display): Added a space
 	before opening bracket.
 
-2004-03-21  Diane Murray <dsm@muenster.de>
+2004-03-21  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el: (erc-format-query-as-channel-p): New variable.
 	(erc-server-PRIVMSG-or-NOTICE): If `erc-format-query-as-channel-p'
 	(erc-server-001, erc-server-004, erc-server-005): Fixed
 	documentation.
 
-2004-03-20  Diane Murray <dsm@muenster.de>
+2004-03-20  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-stamp.el: Commentary: Changed `erc-stamp-mode' to
 	`erc-timestamp-mode'.
 	(erc-insert-timestamp-left): Use `erc-timestamp-face' on filler
 	spaces as well.
 
-2004-03-19  Diane Murray <dsm@muenster.de>
+2004-03-19  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-send-action): Use `erc-input-face'.
 	(erc-display-message-highlight): If the requested highlighting
 	(erc-put-text-property): Ditto.
 	(erc-add-default-channel): Ditto.
 
-2004-03-17  Diane Murray <dsm@muenster.de>
+2004-03-17  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-process-sentinel): Cancel ping timer upon
 	disconnect.
 	(erc-part-reason-zippy, erc-part-reason-zippy): Removed FIXME
 	comments.  I see no problem allowing typed in reasons.
 
-2004-03-16  Diane Murray <dsm@muenster.de>
+2004-03-16  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-stamp.el: (erc-insert-timestamp-left): Added support for
 	`erc-timestamp-only-if-changed-flag' and added docstring.
 	* erc-nets.el: From Adrian Aichner (adrian /at/ xemacs /dot/ org)
 	* erc-nets.el: XEmacs make-obsolete only takes two arguments.
 
-2004-03-10  Diane Murray <dsm@muenster.de>
+2004-03-10  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-nets.el (erc-determine-network): Use `erc-session-server' if
 	`erc-announced-server' is nil to avoid error if server does not
 	(erc-ports-list): Add docstring.  Rework function body to use
 	`nconc'.
 
-2004-03-09  Diane Murray <dsm@muenster.de>
+2004-03-09  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-list.el, erc-notify.el: (require 'erc-nets): added
 
-2004-03-08  Diane Murray <dsm@muenster.de>
+2004-03-08  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.
 	Use (erc-network) instead.
 
-2004-03-08  Diane Murray <dsm@muenster.de>
+2004-03-08  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-nickserv.el: Changed copyright notice.  Now require
 	erc-nets.  erc-nets.el now takes care of network-related functions
 	erc-nets.el do what this did before.  Deprecated.  Use
 	(erc-network) instead.
 
-2004-03-08  Diane Murray <dsm@muenster.de>
+2004-03-08  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-nets.el: Added commentary, `erc-nets-version'.
 	(erc-server-alist): Changed Brasnet to BRASnet.
 	`erc-disconnected-hook'.
 	(erc-server-select): Small documentation word change.
 
-2004-03-07  Diane Murray <dsm@muenster.de>
+2004-03-07  Diane Murray <disumu@x3y2z1.net>
 
 	* AUTHORS, CREDITS: disumu info updated
 
 	we'll probably have to do the iteration ourselves instead of using
 	assoc.
 
-2004-03-05  Diane Murray <dsm@muenster.de>
+2004-03-05  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el: Added erc-server-001 which runs when the server sends
 	its welcome message.  It sets the current-nick to reflect the
 
 	* HACKING: Initial commit.  Some thoughts on coding standards.
 
-2004-03-03  Diane Murray <dsm@muenster.de>
+2004-03-03  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-track.el: added the variable erc-track-priority-faces-only
 	which adds the option to ignore changes in a channel unless there
 	are faces from the erc-track-faces-priority-list in the message
 	options are nil, 'all, or a list of channel name strings
 
-2004-03-01  Diane Murray <dsm@muenster.de>
+2004-03-01  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el, erc-ibuffer.el, erc-menu.el: Changed erc-is-channel-op
 	and erc-is-channel-voice to erc-channel-user-op-p and
 	erc-channel-user-voice-p to better match erc-channel-user
 	structure (and emacs lisp usage)
 
-2004-03-01  Diane Murray <dsm@muenster.de>
+2004-03-01  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el, erc-ibuffer.el, erc-menu.el:
 	erc-track-modified-channels-mode is now erc-track-mode
 
-2004-02-29  Diane Murray <dsm@muenster.de>
+2004-02-29  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-match.el: Added 'keyword option to
 	erc-current-nick-highlight-type highlights all instances of

File ChangeLog.upstream

+2005-10-08  Diane Murray  <disumu@x3y2z1.net>
+
+	* AUTHORS, CREDITS, ChangeLog, ChangeLog.2002, ChangeLog.2004:
+	Updated my email address.
+
+2005-10-06  Michael Olson  <mwolson@gnu.org>
+
+	* 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.
+
+	* 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.
+
+2005-10-05  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-toggle-debug-irc-protocol): Use erc-view-mode-enter
+	rather than view-mode.
+
+	* 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.
+
+	* erc-compat.el (erc-view-mode-enter): New function that is
+	aliased to the correct way of entering view-mode.
+
+	* erc-match.el (erc-log-matches-make-buffer): Use
+	erc-view-mode-enter rather than view-mode-enter.
+
+2005-10-05  Edward O'Connor  <ted@oconnor.cx>
+
+	* 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.
+
+2005-10-03  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el (erc-message, erc-send-ctcp-message)
+	(erc-send-ctcp-notice): Encode string for target before sending.
+
+	* erc.el (erc-cmd-KICK, erc-cmd-PART, erc-cmd-QUIT, erc-cmd-TOPIC)
+	(erc-kill-server, erc-kill-channel): Ditto.
+
+2005-09-05  Johan Bockg�rd  <bojohan@users.sourceforge.net>
+
+	* erc-page.el (erc-ctcp-query-PAGE): (message text) -> (message
+	"%s" text).
+	(erc-cmd-PAGE): Simplify regexp. Put `do-not-parse-args' t.
+
+2005-09-05  Michael Olson  <mwolson@gnu.org>
+
+	* 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.
+
+	* erc-compat.el (erc-emacs-build-time): Use a string
+	representation rather than trying to coerce a time out of a string
+	on XEmacs.
+
+	* erc-identd.el (erc-identd-start): Use make-network-process
+	instead of open-network-stream.  Error out if this is not defined.
+
+	* 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.
+
+2005-09-04  Michael Olson  <mwolson@gnu.org>
+
+	* 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}.
+
+2005-09-03  Johan Bockg�rd  <bojohan@users.sourceforge.net>
+
+	* erc.el (erc-message): Simplify regexp.
+	(erc-cmd-DEOP, erc-cmd-OP): Simplify.
+
+2005-08-29  Michael Olson  <mwolson@gnu.org>
+
+	* 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-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.
+
+2005-08-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el: Add defvaralias for erc-announced-server-name, since
+	this seems to be widely used.
+
+2005-08-17  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc): Remove unnecessary boundp check.
+
+	* erc-autoaway.el: Fix compiler warning.
+
+	* 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-dcc.el (erc-dcc-chat-request, erc-dcc-get-parent): Move to
+	fix a compiler warning.
+
+	* erc-ibuffer.el (erc-server): Remove unnecessary boundp check.
+
+	* erc-identd.el (erc-identd-start): Use read-string instead of
+	read-input.
+
+	* erc-imenu.el (erc-unfill-notice): Use a while loop instead of
+	replace-regexp.
+
+	* erc-nicklist.el: Add conditional dependency on erc-bbdb.
+	(erc-nicklist-insert-contents): Tighten some regexps.
+
+	* erc-notify.el (erc-notify-list): Docfix.
+
+	* erc-spelling.el (erc-spelling-dictionaries): Add :type and
+	:group to silence a compiler warning.
+
+2005-08-14  Michael Olson  <mwolson@gnu.org>
+
+	* 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-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-match.el (erc-text-matched-hook): Don't hide fools by
+	default, but include it in the available options.
+
+2005-08-13  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-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 (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.
+
+2005-08-10  Michael Olson  <mwolson@gnu.org>
+
+	* 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: Remove copyright notice.
+
+	* erc.el: Remove 3 copyright notices.
+
+2005-08-09  Michael Olson  <mwolson@gnu.org>
+
+	* debian/changelog: Create 5.0.4-3 package.  This doesn't serve
+	any purpose other than to thank Romain Francoise for some advice.
+
+	* Makefile (debrelease): Allow last upload and extra build options
+	to be specified.
+
+2005-08-08  Michael Olson  <mwolson@gnu.org>
+
+	* debian/changelog: Create 5.0.4-2 package.
+
+	* debian/control (Uploaders): Add Romain Francoise.
+	(Standards-Version): Update to 3.6.2.
+	(Depends): Add `emacsen'.
+
+	* debian/scripts/startup.erc (load-path): Minor whitespace fixup.
+
+	* 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.
+
+	* erc.el (erc-mode): Use `make-local-variable' instead of
+	`make-variable-buffer-local'.
+
+2005-07-12  Michael Olson  <mwolson@gnu.org>
+
+	* debian/changelog: Build 5.0.4-1.
+
+	* Makefile (release): Prepare zip file in addition to tarball.
+
+	* NEWS: Add item for the undo fix.
+
+2005-07-09  Michael Olson  <mwolson@gnu.org>
+
+	* 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.
+
+	* 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.
+
+2005-07-09  Johan Bockg�rd  <bojohan@users.sourceforge.net>
+
+	* 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-compat.el (erc-propertize): Move here from erc.el. Always
+	return a copy of the string (like `propertize' in GNU Emacs).
+
+	* 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.
+
+2005-07-02  Michael Olson  <mwolson@gnu.org>
+
+	* 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.
+
+	* 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.
+
+	* 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.
+
+2005-06-29  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
+
+	* erc-nickserv.el (erc-nickserv-alist): Fix regexp for Azzurra.
+
+2005-06-26  Michael Olson  <mwolson@gnu.org>
+
+	* 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.el (erc-quit-server): Ditto.
+
+	* erc-ibuffer.el (erc-server, erc-server-name): Ditto.
+
+	* erc-notify.el (erc-notify-JOIN, erc-notify-NICK)
+	(erc-notify-QUIT): Ditto.
+
+2005-06-24  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
+
+	* 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.
+
+2005-06-23  Michael Olson  <mwolson@gnu.org>
+
+	* CREDITS: Add entries for Luigi Panzeri and Andreas Schwab.
+
+	* erc-nickserv.el (erc-nickserv-alist): Add entries for Azzurra
+	and OFTC.  Thanks to Luigi Panzeri and Andreas Schwab for
+	providing these.
+
+2005-06-16  Michael Olson  <mwolson@gnu.org>
+
+	* CREDITS: Add John Paul Wallington.
+
+	* erc.el: Thanks to John Paul Wallington for the following.
+	(erc-nickname-in-use): Use `string-to-number' instead of
+	`string-to-int'.
+
+	* erc-dcc.el (erc-dcc-handle-ctcp-send)
+	(erc-dcc-handle-ctcp-chat, erc-dcc-get-file)
+	(erc-dcc-chat-accept): Ditto.
+
+	* erc-identd.el (erc-identd-start): Ditto.
+
+2005-06-16  Johan Bockg�rd  <bojohan+sf@dd.chalmers.se>
+
+	* erc.el (erc-mode-map): Suppress `font-lock-fontify-block' key
+	binding since it destroys face properties.
+
+2005-06-08  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.
+
+2005-06-06  Michael Olson  <mwolson@gnu.org>
+
+	* 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.
+
+	* debian/changelog: Close "README file missing" bug.
+
+	* debian/rules (binary-erc): Install README file.
+
 2005-06-03  Michael Olson  <mwolson@gnu.org>
 
 	* erc.el (erc-with-buffer): Set `lisp-indent-function' so Emacs
 
 	* 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
 	refused. This error is reported differently when using
 	open-network-stream-nowait.
 
-2005-01-26  Diane Murray  <dsm@muenster.de>
+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  <dsm@muenster.de>
+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
 	to t when calling `write-region' to ensure that further log
 	entries start on fresh lines.
 	
-2005-01-21  Diane Murray  <dsm@muenster.de>
+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
 
 	* NEWS: Added the latest fixes.
 
-2005-01-20  Diane Murray  <dsm@muenster.de>
+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
 	(erc-button-press-button): Silenced a byte-compiler warning about
 	too few arguments in a call to `error'.
 
-2005-01-19  Diane Murray  <dsm@muenster.de>
+2005-01-19  Diane Murray  <disumu@x3y2z1.net>
 
 	* NEWS: Added list of 5.0.1 fixes.
 
 
 	* Makefile: Change version to correspond with our new scheme.
 
-2005-01-18  Diane Murray  <dsm@muenster.de>
+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
 	copyright notices.  If anyone has signed papers for Emacs in
 	general, merge them with the FSF's entry.
 
-2005-01-16  Diane Murray  <dsm@muenster.de>
+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
 	* erc-backend.el (def-edebug-spec): This macro caused problems (in
 	XEmacs). Use its expansion directly.
 
-2005-01-15  Diane Murray  <dsm@muenster.de>
+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
 	This should fix the problem of faces being "covered" by
 	`erc-button-face'.
 
-2005-01-14  Diane Murray  <dsm@muenster.de>
+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,
 
 	* erc-button.el: Improved docstring for variable erc-button-face.
 
-2005-01-13  Diane Murray  <dsm@muenster.de>
+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
 	`erc-insert-marker' or error if does not exist.
 	(erc-send-current-line): Widen before trying to send anything.
 
-2005-01-13  Diane Murray  <dsm@muenster.de>
+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
 	`erc-track-priority-faces-only', `erc-track-exclude', and
 	`erc-track-exclude-types' now work with server buffers.
 
-2005-01-12  Diane Murray  <dsm@muenster.de>
+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
 	XEmacs). The new function `erc-modified-channels-object' is used
 	to generate updated values for the same-named variable.
 
-2005-01-08  Diane Murray <dsm@muenster.de>
+2005-01-08  Diane Murray <disumu@x3y2z1.net>
 
 	* ChangeLog.2002: Changed instances of my sourceforge username and
 	email address to real name and email.
 	* NEWS: Use 3rd level heading instead of bullets for lists that
 	contain descriptions.
 
-2005-01-07  Diane Murray <dsm@muenster.de>
+2005-01-07  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-list.el: Require 'sort.
 	(erc-chanlist): Disable undo in the channel list buffer.
 	policy toward ChangeLog entries, which is that they should be
 	manually updated whenever a change is committed.
 
-2005-01-04  Diane Murray <dsm@muenster.de>
+2005-01-04  Diane Murray <disumu@x3y2z1.net>
 
 	* erc.el (erc-connection-established, erc-login): Update the
 	mode-line.
 
 	* AUTHORS: Update list of authors.
 
-2005-01-02  Diane Murray <dsm@muenster.de>
+2005-01-02  Diane Murray <disumu@x3y2z1.net>
 
 	* erc-goodies.el (erc-control-characters): New customization
 	group.
 
 
 VERSION = 0.17
-AUTHOR_VERSION = Version 5.0 Revision: 1.757
+AUTHOR_VERSION = Version 5.0 Revision: 1.774
 MAINTAINER = Adrian Aichner <adrian@xemacs.org>
 PACKAGE = erc
 PKG_TYPE = regular

File Makefile.upstream

 VERSION=5.1
 SNAPDIR=erc-$(VERSION)
+LASTUPLOAD = 5.0.4-2
+BUILDOPTS  =
 
 SPECIAL = erc-auto.el
 UNCOMPILED = erc-chess.el erc-bbdb.el erc-ibuffer.el erc-speak.el \
 		-f batch-byte-compile $<
 
 clean:
-	rm -f *~ *.elc
+	-rm -f *~ *.elc
 
-distclean realclean: clean
+realclean: clean
 	-rm -f $(TARGET) $(SPECIAL)
 
-debrelease: $(ALLSOURCE) $(SPECIAL)
-	rm -Rf ../$(SNAPDIR) && \
-	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR) && \
-	cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR) && \
-	cd ../ && \
-	tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR)
+distclean:
+	-rm -f $(TARGET)
+	-rm -Rf ../$(SNAPDIR)
+
+debrelease: $(ALLSOURCE) $(SPECIAL) distclean
+	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
+	cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
+	(cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
 	cp -R debian ../$(SNAPDIR)
 	test -d ../$(SNAPDIR)/debian/CVS && rm -R \
 	  ../$(SNAPDIR)/debian/CVS \
 	  ../$(SNAPDIR)/debian/.arch-ids \
 	  ../$(SNAPDIR)/debian/maint/.arch-ids \
 	  ../$(SNAPDIR)/debian/scripts/.arch-ids || :
-	cd ../$(SNAPDIR) && dpkg-buildpackage -rfakeroot
+	(cd ../$(SNAPDIR) && \
+	  dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
+	    -us -uc -rfakeroot && \
+	  echo "Running lintian ..." && \
+	  lintian -i ../erc_$(VERSION)*.deb || : && \
+	  echo "Done running lintian." && \
+	  debsign)
 
-release: autoloads
-	rm -rf ../erc-$(VERSION)
-	mkdir ../erc-$(VERSION)
+debrelease-mwolson:
+	-rm -f ../../dist/erc_*
+	-rm -f ../erc_$(VERSION)*
+	$(MAKE) debrelease
+	cp ../erc_$(VERSION)* ../../dist
+
+release: autoloads distclean
+	mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
 	cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../erc-$(VERSION)
-	cd ..; tar czf erc-$(VERSION).tar.gz erc-$(VERSION)/*
+	(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 ; \
+	  echo mput erc-$(VERSION).zip >> upload.lftp ; \
+	  echo mput erc-$(VERSION).tar.gz >> upload.lftp ; \
+	  echo close >> upload.lftp ; \
+	  lftp -f upload.lftp ; \
+	  rm -f upload.lftp)
 ERC NEWS                                                       -*- outline -*-
 
+* Fixes since ERC 5.0.3
+
+** Fix a problem with undo in channels.
+
 * Fixes since ERC 5.0.2
 
 ** Fix typo in the `ctcp-request-to' entry of the English catalog.

File erc-autoaway.el

 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+;; Boston, MA 02110-1301 USA
 </