Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-536
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-537
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-538
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-539
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-540
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-541
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-542
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-543
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-544
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-545
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-546
   Update from erc--emacs--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-547
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-548
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-549
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-550
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-551
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-552
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-553
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-554
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-555
   erc-iswitchb: Temporarily enable iswitchb mode

 * emacs@sv.gnu.org/emacs--devo--0--patch-556
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-557
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-558
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-559
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-560
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-561
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-562
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-563
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-564
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-565
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-566
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-567
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-568
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-569
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-570
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-571
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-572
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-573
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-574
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-575
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-576
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-577
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-578
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-579
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-580
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-581
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-582
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-583
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-584
   Fix admin/quick-install-emacs to work with recent versions of autoconf

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-171
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-172
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-173
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-174
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-175
   Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-176
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-177
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-178
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-179
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-180
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-181
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-182
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-183
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-184
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-185
   Merge from emacs--devo--0

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-590

11 files changed, 61 insertions, 444 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index dfb6fc7afe8..b356f83b0b2 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,23 @@
+2006-12-13  Leo  <sdl.web@gmail.com>  (tiny change)
+
+        * erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it
+        isn't active already, instead of leaving it on.
+
+2006-12-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * erc-ezbounce.el (erc-ezb-init-session-list): Doc fix.
+
+2006-12-08  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el: Re-evaluate contributions from a contributor, and found
+        them under 15 lines of non-obvious code, so it is safe to remove
+        the copyright notice.
+        (erc-modules): Remove list module.
+
+        * erc-list.el: Remove, since a contributor who has not completed
+        their assignment has contributed significantly more than 15 lines
+        of code to this file.
+
 2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
 
         * erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
@@ -18,6 +38,11 @@
         (erc-update-current-channel-member, erc-load-script):
         (erc-mode-line-away-status-format): Doc fixes.
 
+2006-11-20  Andrea Russo  <rastandy@inventati.org>
+
+        * erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
+        before calling `erc-display-prompt'.
+
 2006-11-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * erc.el (erc-after-connect, erc-open-ssl-stream)
@@ -86,6 +111,11 @@
         `erc-show-my-nick' is non-nil.
         (erc-compute-server): Doc fix.
 
+2006-10-01  John J Foerch  <jjfoerch@earthlink.net>
+
+        * erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
+        from the erc-timestamp field.
+
 2006-09-11  Michael Olson  <mwolson@gnu.org>
 
         * erc-nicklist.el (erc-nicklist-insert-contents): Add missing
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index 20a03801477..25f57569742 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -1035,7 +1035,7 @@
 
         * erc-speak.el, erc.el: New file.
 
-    Copyright (C) 2001 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2006 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 006ac0c1415..332bd7fbfb9 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -2596,7 +2596,7 @@
 
 See ChangeLog.01 for earlier changes.
 
-    Copyright (C) 2002 Free Software Foundation, Inc.
+    Copyright (C) 2002, 2006 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 6f55258c04e..20f0f92f5e0 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -2140,7 +2140,7 @@
 
 See ChangeLog.02 for earlier changes.
 
-    Copyright (C) 2003 Free Software Foundation, Inc.
+    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index 3ab41db65b4..c5338a311c9 100644
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -2069,7 +2069,7 @@
 
 See ChangeLog.03 for earlier changes.
 
-    Copyright (C) 2004 Free Software Foundation, Inc.
+    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index 8fa725459e2..a640aba00a1 100644
--- a/lisp/erc/ChangeLog.05
+++ b/lisp/erc/ChangeLog.05
@@ -1217,7 +1217,7 @@
 
 See ChangeLog.04 for earlier changes.
 
-    Copyright (C) 2005 Free Software Foundation, Inc.
+    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 1b5111e8525..eeb3e93801e 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1035,6 +1035,7 @@ other client."
     (setq erc-dcc-entry-data entry)
     (setq erc-dcc-unprocessed-output "")
     (setq erc-insert-marker (set-marker (make-marker) (point-max)))
+    (setq erc-input-marker (make-marker))
     (erc-display-prompt buffer (point-max))
     (set-process-buffer proc buffer)
     (add-hook 'kill-buffer-hook 'erc-dcc-chat-buffer-killed nil t)
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index d04fe782f7e..ea5afcabcbe 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -126,7 +126,7 @@ in the alist is `nil', prompt for the appropriate values."
 
 ;;;###autoload
 (defun erc-ezb-init-session-list (message)
-  "Reset the EZBounce session list to NIL."
+  "Reset the EZBounce session list to nil."
   (setq erc-ezb-session-list nil)
   (setq erc-ezb-inside-session-listing t))
 
@@ -134,7 +134,7 @@ in the alist is `nil', prompt for the appropriate values."
 (defun erc-ezb-end-of-session-list (message)
   "Indicate the end of the EZBounce session listing."
   (setq erc-ezb-inside-session-listing nil))
-  
+
 ;;;###autoload
 (defun erc-ezb-add-session (message)
   "Add an EZBounce session to the session list."
@@ -157,7 +157,7 @@ in the alist is `nil', prompt for the appropriate values."
              (read-from-minibuffer "IRC port: "
                                    (erc-port-to-string "6667")))))
       (erc-server-send (format "CONN %s %s" server port)))))
-    
+
 
 ;;;###autoload
 (defun erc-ezb-select-session ()
@@ -173,7 +173,7 @@ in the alist is `nil', prompt for the appropriate values."
 (defun erc-ezb-initialize ()
   "Add EZBouncer convenience functions to ERC."
   (add-hook 'erc-server-NOTICE-functions 'erc-ezb-notice-autodetect))
-        
+
 (provide 'erc-ezbounce)
 
 ;; arch-tag: e972aa7b-a9f4-4d16-a489-074ec7a1002e
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
deleted file mode 100644
index c041842429e..00000000000
--- a/lisp/erc/erc-list.el
+++ /dev/null
@@ -1,415 +0,0 @@
-;;; erc-list.el --- Provide a faster channel listing mechanism
-
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-;; Copyright (C) 2004 Brian Palmer
-
-;; Author: Mario Lang <mlang@lexx.delysid.org>
-;; Keywords: comm
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This file provides a simple derived mode for viewing Channel lists.
-;; It also serves as a demonstration of how the new server hook facility
-;; can be used.
-
-;;; Code:
-
-(require 'erc)
-(require 'erc-networks)
-(require 'sort)
-(unless (fboundp 'make-overlay)
-  (require 'overlay))
-(eval-when-compile (require 'cl))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; User customizable variables.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defgroup erc-list nil
-  "Display IRC channels in another window when using /LIST"
-  :group 'erc)
-
-(defcustom erc-chanlist-progress-message t
-  "*Show progress message while accumulating channel list."
-  :group 'erc-list
-  :type 'boolean)
-
-(defcustom erc-no-list-networks nil
-  "*A list of network names on which the /LIST command refuses to work."
-  :group 'erc-list
-  :type '(repeat string))
-
-(defcustom erc-chanlist-frame-parameters nil
-  "*If nil, the channel list is displayed in a new window; if non-nil,
-this variable holds the frame parameters used to make a frame to
-display the channel list."
-  :group 'erc-list
-  :type 'list)
-
-(defcustom erc-chanlist-hide-modeline nil
-  "*If nil, the channel list buffer has a modeline, otherwise the modeline is hidden."
-  :group 'erc-list
-  :type 'boolean)
-
-(defface erc-chanlist-header-face '((t (:bold t)))
-  "Face used for the headers in erc's channel list."
-  :group 'erc-faces)
-
-(defface erc-chanlist-odd-line-face '((t (:inverse-video t)))
-  "Face used for the odd lines in erc's channel list."
-  :group 'erc-faces)
-
-(defface erc-chanlist-even-line-face '((t (:inverse-video nil)))
-  "Face used for the even lines in erc's channel list."
-  :group 'erc-faces)
-
-(defface erc-chanlist-highlight '((t (:foreground "red")))
-  "Face used to highlight the current line in the channel list."
-  :group 'erc-faces)
-
-;; This should perhaps be a defface that inherits values from the highlight face
-;; but xemacs does not support inheritance
-(defcustom erc-chanlist-highlight-face 'erc-chanlist-highlight
-  "Face used for highlighting the current line in a list."
-  :type 'face
-  :group 'erc-faces)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; All variables below this line are for internal use only.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar erc-chanlist-channel-line-regexp "^\\([#&\\*][^ \t\n]*\\)\\s-+[0-9]+"
-  "Regexp that matches a channel line in the channel list buffer.")
-
-(defvar erc-chanlist-buffer nil)
-(make-variable-buffer-local 'erc-chanlist-buffer)
-
-(defvar erc-chanlist-last-time 0
-  "A time value used to throttle the progress indicator.")
-
-(defvar erc-chanlist-frame nil
-  "The frame displaying the most recent channel list buffer.")
-
-(defvar erc-chanlist-sort-state 'channel
-  "The sort mode of the channel list buffer.  Either 'channel or 'users.")
-(make-variable-buffer-local 'erc-chanlist-sort-state)
-
-(defvar erc-chanlist-highlight-overlay nil
-  "The overlay used for erc chanlist highlighting")
-(make-variable-buffer-local 'erc-chanlist-highlight-overlay)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Define erc-chanlist-mode.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defcustom erc-chanlist-mode-hook nil
-  "Hook run by erc-chanlist-mode."
-  :group 'erc-list
-  :type 'hook)
-
-(define-derived-mode erc-chanlist-mode fundamental-mode "ERC Channel List"
-  "Mode for viewing a channel list of a particular server.
-
-\\{erc-chanlist-mode-map}"
-  (local-set-key "\C-c\C-j" 'erc-join-channel)
-  (local-set-key "j" 'erc-chanlist-join-channel)
-  (local-set-key "n" 'next-line)
-  (local-set-key "p" 'previous-line)
-  (local-set-key "q" 'erc-chanlist-quit)
-  (local-set-key "s" 'erc-chanlist-toggle-sort-state)
-  (local-set-key "t" 'toggle-truncate-lines)
-  (setq erc-chanlist-sort-state 'channel)
-  (setq truncate-lines t)
-  (add-hook 'post-command-hook 'erc-chanlist-post-command-hook 'append 'local))
-
-;; Define module:
-;;;###autoload (autoload 'erc-list-mode "erc-list")
-(define-erc-module list nil
-  "List channels nicely in a separate buffer."
-  ((defalias 'erc-cmd-LIST 'erc-list-channels))
-  ((defalias 'erc-cmd-LIST 'erc-list-channels-simple)))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Functions.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;;###autoload
-(defun erc-list-channels (&rest channel)
-  "Display a buffer containing a list of channels on the current server.
-Optional argument CHANNEL specifies a single channel to list (instead of every
-available channel)."
-  (interactive
-   (remove "" (split-string
-               (read-from-minibuffer "List channels (RET for all): ") " ")))
-  (if (and (null channel)
-           (erc-member-ignore-case (erc-network-name) erc-no-list-networks))
-      (erc-display-line "ERC is configured not to allow the /LIST command on this network!"
-                        (current-buffer))
-    (erc-display-line (erc-make-notice (concat "Listing channel"
-                                               (if channel
-                                                   "."
-                                                 "s.  This may take a while."))))
-    (erc-chanlist channel))
-  t)
-
-(defun erc-list-channels-simple (&optional line)
-  "Send the LIST command to the current server with optional channels LINE."
-  (when (string-match "^\\s-*\\(.*\\)$" line)
-    (let ((channels (match-string 1 line)))
-      (erc-log (format "cmd: LIST: %s" channels))
-      (erc-server-send
-       (if (string= channels "")
-           "LIST"
-         (concat "LIST :" channels))))
-    t))
-(put 'erc-list-channels-simple 'do-not-parse-args t)
-
-;;;###autoload
-(defun erc-chanlist (&optional channels)
-  "Show a channel listing of the current server in a special mode.
-Please note that this function only works with IRC servers which conform
-to RFC and send the LIST header (#321) at start of list transmission."
-  (interactive)
-  (with-current-buffer (erc-server-buffer)
-    (erc-once-with-server-event
-     321
-     '(progn
-        (add-hook 'erc-server-322-functions 'erc-chanlist-322 nil t)
-
-        (erc-once-with-server-event
-         323
-         '(progn
-            (remove-hook 'erc-server-322-functions 'erc-chanlist-322 t)
-            (let ((buf erc-chanlist-buffer))
-              (if (not (buffer-live-p buf))
-                  (error "`erc-chanlist-buffer' does not refer to a live buffer"))
-
-              (set-buffer buf)
-              (buffer-disable-undo)
-              (let (buffer-read-only
-                    (sort-fold-case t))
-                (sort-lines nil (point-min) (point-max))
-                (setq erc-chanlist-sort-state 'channel)
-
-                (let ((sum (count-lines (point-min) (point-max))))
-                  (goto-char (point-min))
-                  (insert (substitute-command-keys
-                           (concat "'\\[erc-chanlist-toggle-sort-state]' toggle sort mode.\n"
-                                   "'\\[erc-chanlist-quit]' kill this buffer.\n"
-                                   "'\\[toggle-truncate-lines]' toggle line truncation.\n"
-                                   "'\\[erc-chanlist-join-channel]' join the channel listed on the current line.\n\n")))
-                  (insert (format "%d channels (sorted by %s).\n\n"
-                                  sum (if (eq erc-chanlist-sort-state 'channel)
-                                          "channel name"
-                                        "number of users"))))
-
-                (insert (format "%-25s%5s %s\n------------------------ ----- ----------------------------\n"
-                                "Channel"
-                                "Users"
-                                "Topic"))
-
-                ;; Display the channel list buffer.
-                (if erc-chanlist-frame-parameters
-                    (progn
-                      (if (or (null erc-chanlist-frame)
-                              (not (frame-live-p erc-chanlist-frame)))
-                          (setq erc-chanlist-frame
-                                (make-frame `((name . ,(format "Channels on %s"
-                                                               erc-session-server))
-                                              ,@erc-chanlist-frame-parameters))))
-                      (select-frame erc-chanlist-frame)
-                      (switch-to-buffer buf)
-                      (erc-prettify-channel-list))
-                  (pop-to-buffer buf)
-                  (erc-prettify-channel-list))))
-            (goto-char (point-min))
-            (search-forward-regexp "^------" nil t)
-            (forward-line 1)
-            (erc-chanlist-highlight-line)
-            (message "")
-            t))
-
-        (setq erc-chanlist-buffer (get-buffer-create
-                                   (format "*Channels on %s*"
-                                           (erc-response.sender parsed))))
-        (with-current-buffer erc-chanlist-buffer
-          (setq buffer-read-only nil)
-          (erase-buffer)
-          (erc-chanlist-mode)
-          (setq erc-server-process proc)
-          (if erc-chanlist-hide-modeline
-              (setq mode-line-format nil))
-          (setq buffer-read-only t))
-        t))
-
-    ;; Now that we've setup our callbacks, pull the trigger.
-    (if (interactive-p)
-        (message "Collecting channel list for server %s" erc-session-server))
-    (erc-server-send (if (null channels)
-                          "LIST"
-                        (concat "LIST "
-                                (mapconcat #'identity channels ","))))))
-
-(defun erc-chanlist-322 (proc parsed)
-  "Process an IRC 322 message.
-
-The message carries information about one channel for the LIST
-command."
-  (multiple-value-bind (channel num-users)
-      (cdr (erc-response.command-args parsed))
-    (let ((topic (erc-response.contents parsed)))
-      (with-current-buffer erc-chanlist-buffer
-        (save-excursion
-          (goto-char (point-max))
-          (let (buffer-read-only)
-            (insert (format "%-26s%4s %s\n" (erc-controls-strip channel)
-                            num-users
-                            (erc-controls-strip topic))))
-
-          ;; Maybe display a progress indicator in the minibuffer.
-          (when (and erc-chanlist-progress-message
-                     (> (erc-time-diff
-                         erc-chanlist-last-time (erc-current-time))
-                        3))
-            (setq erc-chanlist-last-time (erc-current-time))
-            (message "Accumulating channel list ... %c"
-                     (aref [?/ ?| ?\\ ?- ?! ?O ?o] (random 7))))
-
-          ;; Return success to prevent other hook functions from being run.
-          t)))))
-
-(defun erc-chanlist-post-command-hook ()
-  "Keep the current line highlighted."
-  (ignore-errors
-    (save-excursion
-      (beginning-of-line)
-      (if (looking-at erc-chanlist-channel-line-regexp)
-          (erc-chanlist-highlight-line)
-        (erc-chanlist-dehighlight-line)))))
-
-(defun erc-chanlist-highlight-line ()
-  "Highlight the current line."
-  (unless erc-chanlist-highlight-overlay
-    (setq erc-chanlist-highlight-overlay
-          (make-overlay (point-min) (point-min)))
-    ;; Detach it from the buffer.
-    (delete-overlay erc-chanlist-highlight-overlay)
-    (overlay-put erc-chanlist-highlight-overlay
-                 'face erc-chanlist-highlight-face)
-    ;; Expressly put it at a higher priority than the text
-    ;; properties used for faces later on. Gnu emacs promises that
-    ;; right now overlays are higher priority than text properties,
-    ;; but why take chances?
-    (overlay-put erc-chanlist-highlight-overlay 'priority 1))
-  (move-overlay erc-chanlist-highlight-overlay (point) (1+ (point-at-eol))))
-
-(defun erc-chanlist-dehighlight-line ()
-  "Remove the line highlighting."
-  (delete-overlay erc-chanlist-highlight-overlay))
-
-(defun erc-prettify-channel-list ()
-  "Make the channel list buffer look pretty.
-When this function runs, the current buffer must be the channel
-list buffer, or it does nothing."
-  (if (eq major-mode 'erc-chanlist-mode)
-      (save-excursion
-        (let ((inhibit-read-only t))
-          (goto-char (point-min))
-          (when (search-forward-regexp "^-------" nil t)
-            (add-text-properties
-             (point-min) (1+ (point-at-eol)) '(face erc-chanlist-header-face))
-            (forward-line 1))
-
-          (while (not (eobp))
-            (add-text-properties
-             (point) (1+ (point-at-eol)) '(face erc-chanlist-odd-line-face))
-            (forward-line 1)
-            (unless (eobp)
-              (add-text-properties
-               (point) (1+ (point-at-eol)) '(face erc-chanlist-even-line-face)))
-            (forward-line 1))))))
-
-(defun erc-chanlist-toggle-sort-state ()
-  "Toggle the channel list buffer sorting method.
-Either sort by channel names or by number of users in each channel."
-  (interactive)
-  (let ((inhibit-read-only t)
-        (sort-fold-case t))
-    (save-excursion
-      (goto-char (point-min))
-      (search-forward-regexp "^-----" nil t)
-      (forward-line 1)
-      (unless (eobp)
-        (if (eq erc-chanlist-sort-state 'channel)
-            (progn
-              (sort-numeric-fields 2 (point) (point-max))
-              (reverse-region (point) (point-max))
-              (setq erc-chanlist-sort-state 'users))
-          (sort-lines nil (point) (point-max))
-          (setq erc-chanlist-sort-state 'channel))
-
-        (goto-char (point-min))
-        (if (search-forward-regexp "^[0-9]+ channels (sorted by \\(.*\\)).$"
-                                   nil t)
-            (replace-match (if (eq erc-chanlist-sort-state 'channel)
-                               "channel name"
-                             "number of users")
-                           nil nil nil 1))
-
-        (goto-char (point-min))
-        (search-forward-regexp "^-----" nil t)
-        (forward-line 1)
-        (recenter -1)
-
-        (erc-prettify-channel-list)))))
-
-(defun erc-chanlist-quit ()
-  "Quit Chanlist mode.
-Kill the channel list buffer, window, and frame (if there's a frame
-devoted to the channel list)."
-  (interactive)
-  (kill-buffer (current-buffer))
-  (if (eq (selected-frame) erc-chanlist-frame)
-      (delete-frame)
-    (delete-window)))
-
-(defun erc-chanlist-join-channel ()
-  "Join the channel listed on the current line of the channel list buffer.
-Private channels, which are shown as asterisks (*), are ignored."
-  (interactive)
-  (save-excursion
-    (beginning-of-line)
-    (when (looking-at erc-chanlist-channel-line-regexp)
-      (let ((channel-name (match-string 1)))
-        (when (and (stringp channel-name)
-                   (not (string= channel-name "*")))
-          (run-at-time 0.5 nil 'erc-join-channel channel-name))))))
-
-(provide 'erc-list)
-
-;;; erc-list.el ends here
-;;
-;; Local Variables:
-;; indent-tabs-mode: t
-;; tab-width: 8
-;; End:
-
-;; arch-tag: 4a13196a-a61b-465a-9926-044dfbc7e5ff
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 5d43baab6c9..b0622b99443 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -266,8 +266,8 @@ be printed just before the window-width."
         (indent-to pos)
         (setq from (point))
         (insert string))
-      (erc-put-text-property from (1+ (point)) 'field 'erc-timestamp)
-      (erc-put-text-property from (1+ (point)) 'rear-nonsticky t)
+      (erc-put-text-property from (point) 'field 'erc-timestamp)
+      (erc-put-text-property from (point) 'rear-nonsticky t)
       (when erc-timestamp-intangible
         (erc-put-text-property from (1+ (point)) 'intangible t)))))
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index a40da6f62c0..7de2828b86d 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2,7 +2,6 @@
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006 Free Software Foundation, Inc.
-;; Copyright (C) 2004 Brian Palmer
 
 ;; Author: Alexander L. Belikoff (alexander@belikoff.net)
 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),
@@ -1669,22 +1668,25 @@ If `erc-track-mode' is in enabled, put the last element of
 Due to some yet unresolved reason, global function `iswitchb-mode'
 needs to be active for this function to work."
   (interactive "P")
-  (eval-and-compile
+  (eval-when-compile
     (require 'iswitchb))
-  (let ((iswitchb-make-buflist-hook
-         (lambda ()
-           (setq iswitchb-temp-buflist
-                 (mapcar 'buffer-name
-                         (erc-buffer-list
-                          nil
-                          (when arg erc-server-process)))))))
-    (switch-to-buffer
-     (iswitchb-read-buffer
-      "Switch-to: "
-      (if (boundp 'erc-modified-channels-alist)
-          (buffer-name (caar (last erc-modified-channels-alist)))
-        nil)
-      t))))
+  (let ((enabled iswitchb-mode))
+    (or enabled (iswitchb-mode 1))
+    (let ((iswitchb-make-buflist-hook
+           (lambda ()
+             (setq iswitchb-temp-buflist
+                   (mapcar 'buffer-name
+                           (erc-buffer-list
+                            nil
+                            (when arg erc-server-process)))))))
+      (switch-to-buffer
+       (iswitchb-read-buffer
+        "Switch-to: "
+        (if (boundp 'erc-modified-channels-alist)
+            (buffer-name (caar (last erc-modified-channels-alist)))
+          nil)
+        t)))
+    (or enabled (iswitchb-mode -1))))
 
 (defun erc-channel-list (proc)
   "Return a list of channel buffers.
@@ -1761,7 +1763,7 @@ all channel buffers on all servers."
 
 (defcustom erc-modules '(netsplit fill button match track completion readonly
                                   ring autojoin noncommands irccontrols
-                                  stamp list)
+                                  stamp)
   "A list of modules which ERC should enable.
 If you set the value of this without using `customize' remember to call
 \(erc-update-modules) after you change it.  When using `customize', modules
@@ -1792,7 +1794,6 @@ removed from the list will be disabled."
     (const :tag "Launch an identd server on port 8113" identd)
     (const :tag "Highlight or remove IRC control characters"
            irccontrols)
-    (const :tag "List channels in a separate buffer" list)
     (const :tag "Save buffers in logs" log)
     (const :tag "Highlight pals, fools, and other keywords" match)
     (const :tag "Detect netsplits" netsplit)