changeset 83468:b98066f4aa10

Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-49 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-50 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-51 Make constrain-to-field notice overlays * emacs@sv.gnu.org/emacs--devo--0--patch-52 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-53 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-54 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-55 Merge from erc--emacs--0 * emacs@sv.gnu.org/emacs--devo--0--patch-56 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-57 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-58 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-59 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-60 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-61 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-62 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-63 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-64 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-65 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-66 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-67 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-68 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-69 rcirc: Add flexible response formatting; Add nick abbrevs * emacs@sv.gnu.org/emacs--devo--0--patch-70 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-71 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-72 Update from CVS: man/dired.texi (Tumme): More tumme documentation. * emacs@sv.gnu.org/gnus--rel--5.10--patch-18 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-19 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-20 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-21 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-22 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-23 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-24 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-25 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-26 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-27 Update from CVS: lisp/gnus.el: Remove bogus comment. * emacs@sv.gnu.org/gnus--rel--5.10--patch-28 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-29 Add sendmail.el and smptmail.el from Emacs tree to contrib/ git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-508
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 12 Feb 2006 00:15:44 +0000
parents d04d8ccb3c41 (current diff) 96e90465d41f (diff)
children 5816618f2b6d
files admin/FOR-RELEASE lib-src/emacsclient.c lib-src/rcs2log lib-src/vcdiff lisp/ChangeLog lisp/Makefile.in lisp/allout.el lisp/bindings.el lisp/calendar/todo-mode.el lisp/cus-face.el lisp/cus-start.el lisp/double.el lisp/ebuff-menu.el lisp/echistory.el lisp/edmacro.el lisp/emacs-lisp/cl-specs.el lisp/emacs-lisp/eldoc.el lisp/emulation/cua-base.el lisp/emulation/viper-init.el lisp/emulation/viper-util.el lisp/env.el lisp/erc/ChangeLog.2001 lisp/erc/ChangeLog.2002 lisp/erc/ChangeLog.2003 lisp/erc/ChangeLog.2004 lisp/erc/ChangeLog.2005 lisp/erc/erc-autojoin.el lisp/erc/erc-complete.el lisp/erc/erc-nets.el lisp/erc/erc-nickserv.el lisp/faces.el lisp/files.el lisp/forms.el lisp/frame.el lisp/isearch.el lisp/loadup.el lisp/mail/metamail.el lisp/mh-e/ChangeLog lisp/net/newsticker.el lisp/net/rcirc.el lisp/net/rlogin.el lisp/progmodes/ada-mode.el lisp/progmodes/ada-prj.el lisp/progmodes/ada-stmt.el lisp/progmodes/autoconf.el lisp/progmodes/delphi.el lisp/progmodes/ebrowse.el lisp/progmodes/gdb-ui.el lisp/progmodes/idlw-shell.el lisp/progmodes/idlw-toolbar.el lisp/progmodes/idlwave.el lisp/progmodes/vhdl-mode.el lisp/recentf.el lisp/server.el lisp/smerge-mode.el lisp/subr.el lisp/talk.el lisp/term/AT386.el lisp/term/internal.el lisp/term/iris-ansi.el lisp/term/mac-win.el lisp/term/news.el lisp/term/rxvt.el lisp/term/sun.el lisp/term/tvi970.el lisp/term/vt100.el lisp/term/wyse50.el lisp/term/x-win.el lisp/term/xterm.el lisp/type-break.el lisp/vc-cvs.el lisp/vc-hooks.el lisp/vc-rcs.el lisp/vc-sccs.el lisp/vc.el lisp/version.el lisp/whitespace.el lisp/x-dnd.el lisp/xt-mouse.el lispref/ChangeLog lispref/elisp.texi mac/makefile.MPW man/ChangeLog man/emacs.texi man/frames.texi man/kmacro.texi src/.gdbinit src/Makefile.in src/alloc.c src/buffer.c src/callint.c src/callproc.c src/cm.c src/cm.h src/coding.c src/coding.h src/config.in src/data.c src/dispextern.h src/dispnew.c src/fns.c src/fontset.c src/frame.c src/frame.h src/fringe.c src/image.c src/indent.c src/intervals.h src/keyboard.c src/keyboard.h src/keymap.c src/keymap.h src/lisp.h src/lread.c src/macterm.c src/macterm.h src/minibuf.c src/msdos.c src/prefix-args.c src/print.c src/process.c src/puresize.h src/scroll.c src/sysdep.c src/syssignal.h src/term.c src/termchar.h src/termhooks.h src/termopts.h src/w32inevt.c src/w32term.c src/w32term.h src/window.c src/xfaces.c src/xfns.c src/xmenu.c src/xselect.c src/xsmfns.c src/xterm.c src/xterm.h
diffstat 1086 files changed, 15450 insertions(+), 13930 deletions(-) [+]
line wrap: on
line diff
--- a/MAINTAINERS	Mon Feb 06 18:44:57 2006 +0000
+++ b/MAINTAINERS	Sun Feb 12 00:15:44 2006 +0000
@@ -39,7 +39,6 @@
 	lisp/term/tty-colors.el
 	lisp/international/codepage.el
 
-	man/faq.texi
 	man/msdog.texi
 
 Kenichi Handa
@@ -66,6 +65,12 @@
 	lisp/minibuf-eldef.el
 	lisp/rfn-eshadow.el
 
+Jay Belanger
+        Calc
+            lisp/calc/*
+            etc/calccard.tex
+            man/calc.texi
+
 ==============================================================================
 2.
 ==============================================================================
--- a/admin/FOR-RELEASE	Mon Feb 06 18:44:57 2006 +0000
+++ b/admin/FOR-RELEASE	Sun Feb 12 00:15:44 2006 +0000
@@ -66,35 +66,35 @@
 ---------		------		---------
 etc (and subdirs)	done		Thien-Thi Nguyen (ttn(@gnu.org))
 leim			working		Kenichi Handa
-lib-src			working		ttn
-lisp			working		ttn
-lisp/calc		working		ttn
-lisp/calendar		working		Glenn Morris
-lisp/emacs-lisp		working		ttn
-lisp/emulation		working		ttn
-lisp/eshell		working		ttn
+lib-src			done		ttn
+lisp			done		ttn
+lisp/calc		done		Jay Belanger
+lisp/calendar		done		Glenn Morris
+lisp/emacs-lisp		done		ttn
+lisp/emulation		done		ttn
+lisp/eshell		done		ttn
 lisp/gnus		done		Romain Francoise
 lisp/international	working		Kenichi Handa
 lisp/language		working		Kenichi Handa
-lisp/mail		working		ttn
+lisp/mail		done		ttn
 lisp/mh-e		done		Bill Wohler
-lisp/net		working		ttn
+lisp/net		done		ttn
 lisp/obsolete		done		ttn
 lisp/play		done		Romain Francoise
-lisp/progmodes		working		Nick Roberts
-lisp/term		working		ttn
-lisp/textmodes		working		ttn
+lisp/progmodes		done		Nick Roberts
+lisp/term		done		ttn
+lisp/textmodes		done		ttn
 lisp/url		done		ttn
 lispintro		done		ttn
-lispref			working		ttn
+lispref			done		ttn
 lwlib			done		ttn
 m4			done		ttn
-mac (and subdirs)	working		ttn
+mac (and subdirs)	done		ttn
 man			done		ttn
-msdos			working		ttn
-nt (and subdirs)	working		ttn
+msdos			done		ttn
+nt (and subdirs)	done		ttn
 oldXMenu		done		ttn
-src (and subdirs)	working		ttn
+src (and subdirs)	done		ttn
 vms			done		ttn
 
 ** Check the Emacs manual.
--- a/etc/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/etc/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,3 +1,11 @@
+2006-02-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* PROBLEMS (Mac OS X): Add QuickTime 7.0.4 / Mac OS X 10.3.9 breakage.
+
+2006-02-09  Mathias Dahl  <mathias.dahl@gmail.com>
+
+	* NEWS: New key bindings for Tumme in Dired.
+
 2006-02-05  Jay Belanger  <belanger@truman.edu>
 
 	* calccard.tex: Update copyright year.
--- a/etc/NEWS	Mon Feb 06 18:44:57 2006 +0000
+++ b/etc/NEWS	Sun Feb 12 00:15:44 2006 +0000
@@ -1833,6 +1833,12 @@
 
 * Changes in Specialized Modes and Packages in Emacs 22.1:
 
+** Changes in Dired
+*** Bindings for Tumme added
+Several new keybindings, all starting with the C-t prefix, have been
+added to Dired. They are all bound to commands in Tumme. As a starting
+point, mark some image files in a dired buffer and do C-t d to display
+thumbnails of them in a separate buffer.
 ** Changes in Hi Lock:
 
 +++
--- a/etc/PROBLEMS	Mon Feb 06 18:44:57 2006 +0000
+++ b/etc/PROBLEMS	Sun Feb 12 00:15:44 2006 +0000
@@ -1774,6 +1774,13 @@
 Mac OS X that causes process output to be truncated.  To avoid this,
 leave process-connection-type set to its default value of nil.
 
+*** Mac OS X 10.3.9 (Carbon): QuickTime 7.0.4 updater breaks build.
+
+On the above environment, build fails at the link stage with the
+message like "Undefined symbols: _HICopyAccessibilityActionDescription
+referenced from QuickTime expected to be defined in Carbon".  A
+workaround is to use QuickTime 7.0.1 reinstaller.
+
 ** FreeBSD
 
 *** FreeBSD 2.1.5: useless symbolic links remain in /tmp or other
--- a/lib-src/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -5788,8 +5788,8 @@
 ;; End:
 
     Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-	1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
-	Free Software Foundation, Inc.
+	1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 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.
 
--- a/lib-src/Makefile.in	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/Makefile.in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 # Makefile for lib-src subdirectory in GNU Emacs.
 # Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004,
-#               2005 Free Software Foundation, Inc.
+#               2005, 2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
--- a/lib-src/cvtmail.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/cvtmail.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Copyright (C) 1985, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/lib-src/digest-doc.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/digest-doc.c	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
    standard output a file of nroff output containing the doc strings.
 
    Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
--- a/lib-src/ebrowse.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/ebrowse.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
-   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
@@ -3689,7 +3689,7 @@
 version ()
 {
   printf ("ebrowse %s\n", VERSION);
-  puts ("Copyright (C) 1992-1999, 2000, 2001 Free Software Foundation, Inc.");
+  puts ("Copyright (C) 1992-2006 Free Software Foundation, Inc.");
   puts ("This program is distributed under the same terms as Emacs.");
   exit (EXIT_SUCCESS);
 }
--- a/lib-src/emacsclient.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/emacsclient.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Client process that communicates with GNU Emacs acting as server.
    Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/lib-src/emacstool.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/emacstool.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /*
    Copyright (C) 1986, 1988, 1990, 1991, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/lib-src/etags.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/etags.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Tags file maker to go with GNU Emacs           -*- coding: latin-1 -*-
    Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995,
                  1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc. and Ken Arnold
+                 2005, 2006 Free Software Foundation, Inc. and Ken Arnold
 
  This file is not considered part of GNU Emacs.
 
@@ -858,7 +858,7 @@
 print_version ()
 {
   printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
-  puts ("Copyright (C) 2002 Free Software Foundation, Inc. and Ken Arnold");
+  puts ("Copyright (C) 2006 Free Software Foundation, Inc. and Ken Arnold");
   puts ("This program is distributed under the same terms as Emacs");
 
   exit (EXIT_SUCCESS);
--- a/lib-src/fakemail.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/fakemail.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* sendmail-like interface to /bin/mail for system V,
    Copyright (C) 1985, 1994, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/lib-src/getopt.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/getopt.c	Sun Feb 12 00:15:44 2006 +0000
@@ -4,7 +4,7 @@
    before changing it!
    Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
                  1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
-	         2004, 2005 Free Software Foundation, Inc.
+	         2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
--- a/lib-src/getopt1.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/getopt1.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
    Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997,
-                 1998, 2004, 2005 Free Software Foundation, Inc.
+                 1998, 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
--- a/lib-src/getopt_.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/getopt_.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Declarations for getopt.
    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
-                 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
--- a/lib-src/getopt_int.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/getopt_int.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Internal declarations for getopt.
    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
-                 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
--- a/lib-src/gettext.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/gettext.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
    Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/lib-src/grep-changelog	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/grep-changelog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-#               2005 Free Software Foundation, Inc.
+#               2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/lib-src/hexl.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/hexl.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
 
--- a/lib-src/make-docfile.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/make-docfile.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Generate doc-string file for GNU Emacs from source files.
    Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/lib-src/makefile.w32-in	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/makefile.w32-in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005 Free Software Foundation, Inc.
+#                2005, 2006 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
--- a/lib-src/movemail.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/movemail.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
    locking file foo the way /bin/mail respects.
    Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/lib-src/ntlib.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/ntlib.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/lib-src/ntlib.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/ntlib.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
--- a/lib-src/pop.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/pop.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
    Copyright (C) 1991, 1993, 1996, 1997, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
    Written by Jonathan Kamens, jik@security.ov.com.
 
 This file is part of GNU Emacs.
--- a/lib-src/pop.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/pop.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
    Copyright (C) 1991, 1993, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
    Written by Jonathan Kamens, jik@security.ov.com.
 
 This file is part of GNU Emacs.
--- a/lib-src/profile.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/profile.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
    Copyright (C) 1992, 1994, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
  Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
 
--- a/lib-src/rcs-checkin	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/rcs-checkin	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 # This script accepts any number of file arguments and checks them into RCS.
 
 # Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
-#               2005 Free Software Foundation, Inc.
+#               2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/lib-src/rcs2log	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/rcs2log	Sun Feb 12 00:15:44 2006 +0000
@@ -55,7 +55,7 @@
 Id='$Id$'
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-#               2004, 2005 Free Software Foundation, Inc.
+#               2004, 2005, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-Copyright='Copyright (C) 2005 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2006 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
--- a/lib-src/sorted-doc.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/sorted-doc.c	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
    standard output a file of texinfo input containing the doc strings.
 
    Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
--- a/lib-src/test-distrib.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/test-distrib.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* test-distrib.c --- testing distribution of nonprinting chars
 
    Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
--- a/lib-src/update-game-score.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/update-game-score.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* update-game-score.c --- Update a score file
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/lib-src/vcdiff	Mon Feb 06 18:44:57 2006 +0000
+++ b/lib-src/vcdiff	Sun Feb 12 00:15:44 2006 +0000
@@ -4,7 +4,7 @@
 # This version is more compatible with rcsdiff(1).
 #
 # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
-#               2005 Free Software Foundation, Inc.
+#               2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/lisp/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,3 +1,246 @@
+2006-02-12  Miles Bader  <miles@gnu.org>
+
+	* net/rcirc.el (rcirc-nick-abbrevs, rcirc-response-formats):
+	New variables.
+	(rcirc-abbrev-nick): New function.
+	(rcirc-format-response-string): Rewrite to use the formats in
+	`rcirc-response-formats' and expand escape sequences therein.
+	A text-property `rcirc-text' is added over the actual response
+	text to make easy to find inside the returned string.
+	(rcirc-print): When filling, just look for the `rcirc-text'
+	text-property to find the appropriate fill prefix, instead of
+	using hardwired patterns.
+
+2006-02-11  Mathias Dahl  <brakjoller@hotmail.com>
+
+	* tumme.el: Enhanced some docstrings.  Added todo item about
+	  Thumbnail Managing Standard.
+
+2006-02-11  Kim F. Storm  <storm@cua.dk>
+
+	* ido.el (ido-buffer-internal): Set mark for ido-insert-buffer.
+	Don't use insert-buffer; do insert-buffer-substring directly.
+	(ido-file-internal): Set mark for ido-insert-file. Use insert-file-1.
+
+2006-02-11  Martin Rudalics  <rudalics@gmx.at>
+
+	* files.el (revert-buffer, recover-file): Replace buffer-read-only
+	with inhibit-read-only.	Suggested by Stefan Monnier.
+	(revert-buffer): Let insert-file-contents discard
+	buffer-undo-list.  Simplify code.
+	(find-file, find-file-existing, revert-buffer): Doc-string fixes.
+
+2006-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* menu-bar.el (menu-bar-select-yank): Add a doc string.
+
+	* help.el (describe-key-briefly): Now a wrapper for
+	describe-key-briefly-internal.  Bind enable-disabled-menus-and-buttons
+	to t.  Populate yank-menu if empty.
+	(describe-key-briefly-internal): Renamed from describe-key-briefly.
+	(describe-key): Now a wrapper for describe-key-internal.  Bind
+	enable-disabled-menus-and-buttons to t.  Populate yank-menu if empty.
+	(describe-key-internal): Renamed from describe-key.
+
+2006-02-11  Milan Zamazal  <pdm@zamazal.org>
+
+	* progmodes/glasses.el (glasses-separator): Doc fix.
+	(glasses-original-separator): New defcustom.
+	(glasses-make-readable, glasses-convert-to-unreadable): Use it.
+
+2006-02-11  Martin Rudalics  <rudalics@gmx.at>
+
+	* mwheel.el (mouse-wheel-up-event): Doc fix.
+
+2006-02-11  Mathias Dahl  <brakjoller@hotmail.com>
+
+	* tumme.el (tumme-dir): Changed default value to
+	  "~/.emacs-d/tumme"
+	  (tumme-dir): New function. Copied from thumbs.el.
+
+2006-02-10  Juanma Barranquero  <lekktu@gmail.com>
+
+	* desktop.el (desktop-outvar): Fix typo.
+	(desktop-save-buffer-p): Doc fix.
+
+	* subr.el (substitute-key-definition): Fix typo.
+
+2006-02-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* frame.el (select-frame-set-input-focus): Call x-focus-frame also
+	when window-system is mac.
+
+	* term/mac-win.el (fontset-standard): Rename from "fontset-mac".
+
+2006-02-10  Kim F. Storm  <storm@cua.dk>
+
+	* subr.el (substitute-key-definition-key): Pass t for NOERROR to
+	indirect-function instead of using condition-case.
+
+2006-02-10  Mathias Dahl  <mathias.dahl@gmail.com>
+
+	* tumme.el (tumme-copy-with-exif-file-name): Tried to make
+	docstring less `colloquial'...
+
+2006-02-09  Mathias Dahl  <mathias.dahl@gmail.com>
+
+	* tumme.el: Added a couple of todo items.
+
+2006-02-09  Lars Hansen  <larsh@soem.dk>
+
+	* hilit-chg.el: Add highlight-changes-mode to desktop-locals-to-save.
+	(highlight-changes-mode): Don't change desktop-locals-to-save.
+
+2006-02-09  Chong Yidong  <cyd@stupidchicken.com>
+
+	* image-mode.el (image-toggle-display): Clear image cache if using
+	filename.
+
+2006-02-09  Masatake YAMATO  <jet@gyve.org>
+
+	* dired-x.el (dired-guess-shell-alist-default): Add .man as
+	a `dired-man' target.
+
+	* progmodes/autoconf.el (autoconf-font-lock-keywords): Check start
+	boundary of symbols.
+
+2006-02-08  Peter Doornbosch  <peter.doornbosch@luminis.nl>  (tiny change)
+
+	* vc-svn.el (vc-svn-print-log): Show recent commits as well.
+
+2006-02-09  Juanma Barranquero  <lekktu@gmail.com>
+
+	* hilit-chg.el (hilit-chg-update-all-buffers): Use `mapc' instead of
+	`mapcar'; return nil.
+
+2006-02-08  Chong Yidong  <cyd@stupidchicken.com>
+
+	* mouse.el (mouse-drag-track): Don't change window if we rebind to
+	some other event.
+
+2006-02-08  Ryan Yeske  <rcyeske@gmail.com>
+
+	* net/rcirc.el (rcirc-startup-channels-alist):
+	Add irc.freenode.net and #emacs as defaults.
+	(rcirc-ignore-all-activity-flag): Remove variable.
+	(rcirc-authinfo): New variable.
+	(rcirc-authinfo-filename): Remove variable.
+	(rcirc-always-use-server-buffer-flag): New flag.
+	(rcirc): M-x rcirc will automatically connect without prompting.
+	C-u M-x rcirc will prompt.  Use rcirc-connect to create a
+	connection in lisp.
+	(rcirc-process-server-response-1): Remove everything but the nick
+	portion of the sender so it doesn't need to be done everywhere
+	else.  Update related code.
+	(global-map): Remove global keybindings.
+	(rcirc-get-buffer-create): Make sure rcirc-topic is set.
+	(rcirc-send-input): Split into several functions.
+	(rcirc-process-input-line, rcirc-process-message)
+	(rcirc-process-command): New functions.
+	(rcirc-target-buffer): New function to determine where to route
+	messages.
+	(rcirc-user-nick): Save match data.
+	(rcirc-toggle-ignore-buffer-activity)
+	(rcirc-update-activity-string): Remove global ignore functionality,
+	which can be done now by toggling rcirc-track-minor-mode.
+	(rcirc-track-minor-mode-map): New keymap.
+	(rcirc-track-minor-mode): New minor-mode.
+	(ignore): Make the ignore output nicer.  Always print it when
+	adding or removing nicks.
+	(rcirc-url-regexp): Improve.
+	(rcirc-mangle-text): Remove properties before using text in the
+	modeline.
+	(rcirc-authenticate): Authentication data comes from
+	rcirc-authinfo, not the file pointed to by rcirc-authinfo-file.
+	(rcirc-server-prefix): Inherit from rcirc-server.
+
+2006-02-08  Mathias Megyei  <Mathias.Megyei@micronas.com>  (tiny change)
+
+	* Makefile.in (compile): Append "|| true" to the end of the `find'
+	command, like compile-always does.
+
+2006-02-08  Sam Steingold  <sds@gnu.org>
+
+	* net/tramp.el (tramp-maybe-open-connection): Do not wait for
+	output from a dead connection.
+
+2006-02-07  Mathias Dahl  <brakjoller@hotmail.com>
+
+	* dired.el (dired-mode-map): Add more bindings for tumme.
+
+2006-02-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* wdired.el (wdired-mode-map): Use remap.
+	(wdired-get-filename): Massage.
+	(wdired-perm-mode-map): Don't copy bindings from wdired-mode-map.
+	(wdired-preprocess-perms, wdired-set-bit, wdired-toggle-bit): Use the
+	`keymap' property rather than `local-map'.
+
+2006-02-07  Mathias Dahl  <brakjoller@hotmail.com>
+
+	* tumme.el (tumme-get-thumbnail-image): New utility function.
+	Suggested by from Chong Yidong.
+	(tumme-dired-with-window-configuration): Rename from
+	`tumme-dired'.  Add code to save window configuration.
+	(tumme-restore-window-configuration): New command to restore the
+	window configuration that `tumme-dired-with-window-configuration'
+	saves before it changes the window configuration.
+	(tumme-show-all-from-dir): New command to display thumbnails for
+	all files in a directory entered by the user, like M-x thumbs.
+	(tumme-display-thumbs): Call `pop-to-buffer' after all thumbnails
+	have been created.
+	(tumme-display-thumbnail-original-image): Call `display-buffer'.
+	(obsolete-tumme-display-thumbnail-original-image-and-buffer):
+	Remove obsolete test function.
+
+2006-02-07  Juanma Barranquero  <lekktu@gmail.com>
+
+	* vc.el (small-temporary-file-directory): Remove defvar; there's
+	a defcustom for it in files.el.
+
+	* tumme.el (tumme-get-thumbnail-image): Add missing arg to `error'.
+	Fix typo in message.
+	(tumme-gallery-generate): Fix typo in `error' message.
+	(tumme-display-window-height-correction)
+	(tumme-display-window-width-correction, tumme-line-up-dynamic)
+	(tumme-line-up-interactive): Dox fixes.
+	(tumme-cmd-rotate-original-options, tumme-display-properties-format)
+	(tumme-restore-window-configuration, tumme-format-properties-string)
+	(tumme-create-thumbs, tumme-display-previous-thumbnail-original):
+	Fix typos in docstrings.
+
+2006-02-07  Chris Moore  <christopher.ian.moore@gmail.com>  (tiny change)
+
+	* wdired.el (wdired-get-filename): Fix bug: Don't re-normalize OLD.
+
+2006-02-07  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gud.el (gud-tooltip-mode): Remove autoload cookie.
+	User should use hook if desired.
+
+	* progmodes/gdb-ui.el (gdb-post-prompt): Regenerate breakpoints
+	buffer if necessary.
+	(gdb-delete-frame-or-window): New function.
+	(gdb-breakpoints-mode-map): Bind "q" to it.
+
+2006-02-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* textmodes/nroff-mode.el: Clean up name space.
+	(nroff-mode-syntax-table): Remove spurious `1' in the syntax of \n.
+	(nroff-mode): Obey the global setting of nroff-electric-mode.
+	(nroff-electric-mode): Use define-minor-mode and derived-mode-p.
+
+	* calendar/calendar.el (calendar-increment-month): Typo in last change.
+
+2006-02-06  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	* vc-svn.el (vc-svn-previous-version, vc-svn-next-version): New funcs.
+
+2006-02-06  Lars Hansen  <larsh@soem.dk>
+
+	* generic-x.el (etc-fstab-generic-mode): Add file system types
+	cifs and usbdevfs.  Allow special chars in file names.
+
 2006-02-05  Jay Belanger  <belanger@truman.edu>
 
 	Update copyright notices of the files in lisp/calc.
@@ -37,13 +280,12 @@
 	* textmodes/nroff-mode.el (nroff-font-lock-keywords): Don't be
 	greedy to find the closing bracket in \*[...] and similar
 	expressions.  This is a first rough fix -- many additional
-	refinements are necessary to make nroff mode really usable with
-	groff.
+	refinements are necessary to make nroff mode really usable with groff.
 
 2006-02-03  Jens Petersen  <petersen@redhat.com>  (tiny change)
 
-	* international/mule-cmds.el (set-locale-environment): Add
-	"/usr/share/X11/locale/locale.alias" to search list for xorg-x11
+	* international/mule-cmds.el (set-locale-environment):
+	Add "/usr/share/X11/locale/locale.alias" to search list for xorg-x11
 	libX11.
 
 2006-02-03  Joe Wells  <jbw@macs.hw.ac.uk>  (tiny change)
@@ -275,7 +517,7 @@
 	* international/latexenc.el: Add a suitable `coding:' tag.
 	(latexenc-find-file-coding-system): Undo last change.
 
-2006-01-27  Arne J,bx(Brgensen  <arne@arnested.dk>
+2006-01-27  Arne J,Ax(Brgensen  <arne@arnested.dk>
 
 	* international/latexenc.el (latexenc-find-file-coding-system):
 	Make sure latexenc-main-file is a regular file and is readable.
@@ -20079,7 +20321,7 @@
 ;; coding: iso-2022-7bit
 ;; End:
 
-    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.
 
--- a/lisp/Makefile.in	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/Makefile.in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 # Maintenance productions for the Lisp directory
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+#   2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -152,8 +153,10 @@
 # subdirectories, to make sure require's and load's in the files being
 # compiled find the right files.
 
+# `|| true' below prevents old Bash versions from getting confused
+# by an error.
 compile: $(lisp)/subdirs.el mh-autoloads doit
-	find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
+	find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \
 	wd=$(lisp); $(setwins);	\
 	els=`echo $$wins | tr ' \011' '\012\012' | \
 		sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`;	\
--- a/lisp/abbrev.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/abbrev.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; abbrev.el --- abbrev mode commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev convenience
--- a/lisp/abbrevlist.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/abbrevlist.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; abbrevlist.el --- list one abbrev table alphabetically ordered
 
 ;; Copyright (C) 1986, 1992, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;; Suggested by a previous version by Gildea.
 
 ;; Maintainer: FSF
--- a/lisp/align.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/align.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; align.el --- align text to a specific column, by regexp
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: convenience languages lisp
--- a/lisp/allout.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/allout.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; allout.el --- extensive outline mode for use alone and with other modes
 
 ;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
--- a/lisp/ansi-color.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ansi-color.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ansi-color.el --- translate ANSI escape sequences into faces
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
--- a/lisp/apropos.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/apropos.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; apropos.el --- apropos commands for users and programmers
 
 ;; Copyright (C) 1989, 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@bigbird.bu.edu>
 ;; Rewritten: Daniel Pfeiffer <occitan@esperanto.org>
--- a/lisp/arc-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/arc-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; arc-mode.el --- simple editing of archives
 
 ;; Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@gnu.org>
 ;; Keywords: archives msdog editing major-mode
--- a/lisp/autoarg.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/autoarg.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; autoarg.el --- make digit keys supply prefix args
 
 ;; Copyright (C) 1998, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:  Dave Love <fx@gnu.org>
 ;; Created: 1998-09-04
--- a/lisp/autoinsert.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/autoinsert.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
 
 ;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Charlie Martin <crm@cs.duke.edu>
 ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>
--- a/lisp/autorevert.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/autorevert.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; autorevert.el --- revert buffers when files on disk change
 
 ;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
 ;; Keywords: convenience
--- a/lisp/avoid.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/avoid.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; avoid.el --- make mouse pointer stay out of the way of editing
 
 ;; Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: mouse
--- a/lisp/battery.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/battery.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; battery.el --- display battery status information
 
 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;; Keywords: hardware
--- a/lisp/bindings.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/bindings.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; bindings.el --- define standard key bindings and some variables
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/bookmark.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/bookmark.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: Karl Fogel <kfogel@red-bean.com>
--- a/lisp/bs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/bs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; bs.el --- menu for selecting and displaying buffers
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
 ;; Maintainer: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
 ;; Keywords: convenience
--- a/lisp/buff-menu.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/buff-menu.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; buff-menu.el --- buffer menu main function and support functions -*- coding:utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience
--- a/lisp/button.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/button.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; button.el --- clickable buttons
 ;;
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: extensions
--- a/lisp/calculator.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calculator.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,11 +1,11 @@
 ;;; calculator.el --- a [not so] simple calculator for Emacs
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eli Barzilay <eli@barzilay.org>
 ;; Keywords: tools, convenience
-;; Time-stamp: <2005-07-18 17:45:34 juri>
+;; Time-stamp: <2006-02-06 13:36:00 ttn>
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/calendar/appt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/appt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; appt.el --- appointment notification functions
 
-;; Copyright (C) 1989, 1990, 1994, 1998, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1990, 1994, 1998, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
--- a/lisp/calendar/cal-bahai.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-bahai.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cal-bahai.el --- calendar functions for the Baha'i calendar.
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;;   Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: calendar
--- a/lisp/calendar/cal-china.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-china.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-china.el --- calendar functions for the Chinese calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
--- a/lisp/calendar/cal-coptic.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-coptic.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-coptic.el --- calendar functions for the Coptic/Ethiopic calendars
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
--- a/lisp/calendar/cal-dst.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-dst.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cal-dst.el --- calendar functions for daylight savings rules
 
-;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Paul Eggert <eggert@twinsun.com>
 ;;	Edward M. Reingold <reingold@cs.uiuc.edu>
--- a/lisp/calendar/cal-french.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-french.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cal-french.el --- calendar functions for the French Revolutionary calendar
 
 ;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003,
-;;   2004, 2005  Free Software Foundation, Inc.
+;;   2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
--- a/lisp/calendar/cal-hebrew.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-hebrew.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-hebrew.el --- calendar functions for the Hebrew calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Nachum Dershowitz <nachum@cs.uiuc.edu>
--- a/lisp/calendar/cal-islam.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-islam.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-islam.el --- calendar functions for the Islamic calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
--- a/lisp/calendar/cal-iso.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-iso.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-iso.el --- calendar functions for the ISO calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
--- a/lisp/calendar/cal-julian.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-julian.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-julian.el --- calendar functions for the Julian calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
--- a/lisp/calendar/cal-mayan.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-mayan.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cal-mayan.el --- calendar functions for the Mayan calendars
 
-;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu>
 ;;	Edward M. Reingold <reingold@cs.uiuc.edu>
--- a/lisp/calendar/cal-move.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-move.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-move.el --- calendar functions for movement in the calendar
 
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
--- a/lisp/calendar/cal-persia.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-persia.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-persia.el --- calendar functions for the Persian calendar
 
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
--- a/lisp/calendar/cal-tex.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-tex.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-tex.el --- calendar functions for printing calendars with LaTeX
 
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Steve Fisk <fisk@bowdoin.edu>
--- a/lisp/calendar/cal-x.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/cal-x.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cal-x.el --- calendar windows in dedicated frames in X
 
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
--- a/lisp/calendar/calendar.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/calendar.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1308,7 +1308,7 @@
 The return value is a pair (MONTH . YEAR).
 MON defaults to `displayed-month'.  YR defaults to `displayed-year'."
   (unless mon (setq mon displayed-month))
-  (unless yr (setq mon displayed-year))
+  (unless yr (setq yr displayed-year))
   (increment-calendar-month mon yr n)
   (cons mon yr))
 
--- a/lisp/calendar/diary-lib.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/diary-lib.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; diary-lib.el --- diary functions
 
 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005  Free Software Foundation, Inc.
+;;   2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
--- a/lisp/calendar/holidays.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/holidays.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; holidays.el --- holiday functions for the calendar package
 
 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1997, 2001, 2002, 2003,
-;;   2004, 2005  Free Software Foundation, Inc.
+;;   2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
--- a/lisp/calendar/icalendar.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/icalendar.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; icalendar.el --- iCalendar implementation -*-coding: utf-8 -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author:         Ulf Jasper <ulf.jasper@web.de>
 ;; Created:        August 2002
--- a/lisp/calendar/lunar.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/lunar.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; lunar.el --- calendar functions for phases of the moon
 
-;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
--- a/lisp/calendar/parse-time.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/parse-time.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; parse-time.el --- parsing time strings
 
-;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
--- a/lisp/calendar/solar.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/solar.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; solar.el --- calendar functions for solar events
 
-;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;;	Denis B. Roegel <Denis.Roegel@loria.fr>
--- a/lisp/calendar/time-date.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/time-date.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; time-date.el --- Date and time handling functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/calendar/timeclock.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/timeclock.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; timeclock.el --- mode for keeping track of how much you work
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/calendar/todo-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/calendar/todo-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; todo-mode.el --- major mode for editing TODO list files
 
-;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Oliver Seidel <os10000@seidel-space.de>
--- a/lisp/case-table.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/case-table.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; case-table.el --- code to extend the character set and support case tables
 
 ;; Copyright (C) 1988, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
--- a/lisp/cdl.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/cdl.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs
 
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi)
 ;; Maintainer: FSF
--- a/lisp/chistory.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/chistory.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; chistory.el --- list command history
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
--- a/lisp/cmuscheme.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/cmuscheme.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el
 
 ;; Copyright (C) 1988, 1994, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu>
 ;; Maintainer: FSF
--- a/lisp/comint.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/comint.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; comint.el --- general command interpreter in a window stuff
 
 ;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;	Simon Marshall <simon@gnu.org>
--- a/lisp/compare-w.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/compare-w.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; compare-w.el --- compare text between windows for Emacs
 
 ;; Copyright (C) 1986, 1989, 1993, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience files
--- a/lisp/complete.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/complete.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; complete.el --- partial completion mechanism plus other goodies
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: abbrev convenience
--- a/lisp/completion.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/completion.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; completion.el --- dynamic word-completion code
 
 ;; Copyright (C) 1990, 1993, 1995, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev convenience
--- a/lisp/cus-face.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/cus-face.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cus-face.el --- customization support for faces
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
--- a/lisp/cus-start.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/cus-start.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cus-start.el --- define customization properties of builtins
 ;;
 ;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
--- a/lisp/cus-theme.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/cus-theme.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cus-theme.el -- custom theme creation user interface
 ;;
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: FSF
--- a/lisp/custom.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/custom.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; custom.el --- tools for declaring and initializing options
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
--- a/lisp/cvs-status.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/cvs-status.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs cvs status tree tools
--- a/lisp/dabbrev.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dabbrev.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; dabbrev.el --- dynamic abbreviation package
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1996, 1997, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Don Morrison
 ;; Maintainer: Lars Lindberg <Lars.Lindberg@sypro.cap.se>
--- a/lisp/delim-col.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/delim-col.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,11 +1,11 @@
 ;;; delim-col.el --- prettify all columns in a region or rectangle
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/03/09 21:32:06 vinicius>
+;; Time-stamp: <2006-02-06 13:37:10 ttn>
 ;; Version: 2.1
 ;; Keywords: internal
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
--- a/lisp/delsel.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/delsel.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; delsel.el --- delete selection if you insert
 
 ;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Matthieu Devin <devin@lucid.com>
 ;; Maintainer: FSF
--- a/lisp/descr-text.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/descr-text.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; descr-text.el --- describe text mode
 
 ;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Maintainer: FSF
--- a/lisp/desktop.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/desktop.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; desktop.el --- save partial status of Emacs when killed
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Maintainter: Lars Hansen <larsh@soem.dk>
@@ -57,17 +57,17 @@
 ;; are supplied to handle special major and minor modes respectively.
 ;; `desktop-buffer-mode-handlers' is an alist of major mode specific functions
 ;; to restore a desktop buffer. Elements must have the form
-;; 
+;;
 ;;    (MAJOR-MODE . RESTORE-BUFFER-FUNCTION).
-;; 
+;;
 ;; Functions listed are called by `desktop-create-buffer' when `desktop-read'
 ;; evaluates the desktop file. Buffers with a major mode not specified here,
 ;; are restored by the default handler `desktop-restore-file-buffer'.
 ;; `desktop-minor-mode-handlers' is an alist of functions to restore
 ;; non-standard minor modes.  Elements must have the form
-;; 
+;;
 ;;    (MINOR-MODE . RESTORE-FUNCTION).
-;; 
+;;
 ;; Functions are called by `desktop-create-buffer' to restore minor modes.
 ;; Minor modes not specified here, are restored by the standard minor mode
 ;; function.  If you write a module that defines a major or minor mode that
@@ -661,7 +661,7 @@
 (defun desktop-outvar (varspec)
   "Output a setq statement for variable VAR to the desktop file.
 The argument VARSPEC may be the variable name VAR (a symbol),
-or a cons cell of the form  (VAR . MAX-SIZE),
+or a cons cell of the form (VAR . MAX-SIZE),
 which means to truncate VAR's value to at most MAX-SIZE elements
 \(if the value is a list) before saving the value."
   (let (var size)
@@ -684,7 +684,8 @@
 (defun desktop-save-buffer-p (filename bufname mode &rest dummy)
   "Return t if buffer should have its state saved in the desktop file.
 FILENAME is the visited file name, BUFNAME is the buffer name, and
-MODE is the major mode."
+MODE is the major mode.
+\n\(fn FILENAME BUFNAME MODE)"
   (let ((case-fold-search nil))
     (and (not (string-match desktop-buffers-not-to-save bufname))
          (not (memq mode desktop-modes-not-to-save))
--- a/lisp/dframe.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dframe.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; dframe --- dedicate frame support modes
 
 ;;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;    2005 Free Software Foundation
+;;    2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
--- a/lisp/diff-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/diff-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; diff-mode.el --- a mode for viewing/editing context diffs
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: convenience patch diff
--- a/lisp/diff.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/diff.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; diff.el --- run `diff' in compilation-mode
 
 ;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
--- a/lisp/dired-aux.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dired-aux.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; dired-aux.el --- less commonly used parts of dired  -*-byte-compile-dynamic: t;-*-
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>.
 ;; Maintainer: FSF
--- a/lisp/dired-x.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dired-x.el	Sun Feb 12 00:15:44 2006 +0000
@@ -8,7 +8,7 @@
 ;; Keywords: dired extensions files
 
 ;; Copyright (C) 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -1027,11 +1027,11 @@
                   " " dired-guess-shell-znew-switches))
 
    ;; The following four extensions are useful with dired-man ("N" key)
-   (list "\\.[0-9]$" '(progn (require 'man)
+   (list "\\.\\(?:[0-9]\\|man\\)$" '(progn (require 'man)
                              (if (Man-support-local-filenames)
                                  "man -l"
                                "cat * | tbl | nroff -man -h")))
-   (list "\\.[0-9]\\.g?z$" '(progn (require 'man)
+   (list "\\.\\(?:[0-9]\\|man\\)\\.g?z$" '(progn (require 'man)
                                    (if (Man-support-local-filenames)
                                        "man -l"
                                      "gunzip -qc * | tbl | nroff -man -h"))
--- a/lisp/dired.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dired.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; dired.el --- directory-browsing commands
 
 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Maintainer: FSF
@@ -1247,6 +1247,17 @@
     (define-key map "\177" 'dired-unmark-backward)
     (define-key map [remap undo] 'dired-undo)
     (define-key map [remap advertised-undo] 'dired-undo)
+    ;; thumbnail manipulation (tumme)
+    (define-key map "\C-td" 'tumme-display-thumbs)
+    (define-key map "\C-tt" 'tumme-tag-files)
+    (define-key map "\C-tr" 'tumme-tag-remove)
+    (define-key map "\C-tj" 'tumme-jump-thumbnail-buffer)
+    (define-key map "\C-ti" 'tumme-display-dired-image)
+    (define-key map "\C-tx" 'tumme-dired-display-external)
+    (define-key map "\C-ta" 'tumme-display-thumbs-append)
+    (define-key map "\C-t." 'tumme-display-thumb)
+    (define-key map "\C-tc" 'tumme-dired-comment-files)
+    (define-key map "\C-tf" 'tumme-mark-tagged-files)
 
     ;; Make menu bar items.
 
--- a/lisp/dirtrack.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dirtrack.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; dirtrack.el --- Directory Tracking by watching the prompt
 
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 17 1996
--- a/lisp/disp-table.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/disp-table.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; disp-table.el --- functions for dealing with char tables
 
 ;; Copyright (C) 1987, 1994, 1995, 1999, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Based on a previous version by Howard Gayle
--- a/lisp/dnd.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dnd.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; dnd.el --- drag and drop support.
 
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
 ;; Maintainer: FSF
--- a/lisp/dos-fns.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dos-fns.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; dos-fns.el --- MS-Dos specific functions
 
 ;; Copyright (C) 1991, 1993, 1995, 1996, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: Morten Welinder <terra@diku.dk>
 ;; Keywords: internal
--- a/lisp/dos-vars.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dos-vars.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; dos-vars.el --- MS-Dos specific user options
 
-;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/dos-w32.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/dos-w32.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms
 
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
--- a/lisp/double.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/double.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; double.el --- support for keyboard remapping with double clicking
 
 ;; Copyright (C) 1994, 1997, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: i18n
--- a/lisp/ebuff-menu.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ebuff-menu.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ebuff-menu.el --- electric-buffer-list mode
 
 ;; Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@ai.mit.edu>
 ;; Maintainer: FSF
--- a/lisp/echistory.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/echistory.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; echistory.el --- Electric Command History Mode
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
--- a/lisp/ediff-diff.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-diff.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-diff.el --- diff-related utilities
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff-help.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-help.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff-hook.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-hook.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff-init.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-init.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;     2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff-merg.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-merg.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-merg.el --- merging utilities
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff-mult.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-mult.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff-ptch.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-ptch.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-ptch.el --- Ediff's  patch support
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff-util.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-util.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-util.el --- the core commands and utilities of ediff
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff-vers.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-vers.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
 ;; Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff-wind.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff-wind.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff-wind.el --- window manipulation utilities
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/ediff.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ediff.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ediff.el --- a comprehensive visual interface to diff & patch
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Created: February 2, 1994
--- a/lisp/edmacro.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/edmacro.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; edmacro.el --- keyboard macro editor
 
 ;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Maintainer: Dave Gillespie <daveg@synaptics.com>
--- a/lisp/ehelp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ehelp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ehelp.el --- bindings for electric-help mode
 
 ;; Copyright (C) 1986, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, extensions
--- a/lisp/electric.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/electric.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; electric.el --- window maker and Command loop for `electric' modes
 
 ;; Copyright (C) 1985, 1986, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
--- a/lisp/elide-head.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/elide-head.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; elide-head.el --- hide headers in files
 
-;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: outlines tools
--- a/lisp/emacs-lisp/advice.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/advice.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; advice.el --- an overloading mechanism for Emacs Lisp functions
 
 ;; Copyright (C) 1993, 1994, 2000, 2001, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/assoc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/assoc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; assoc.el --- insert/delete/sort functions on association lists
 
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
 ;; Keywords: extensions
--- a/lisp/emacs-lisp/authors.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/authors.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: Kim F. Storm <storm@cua.dk>
--- a/lisp/emacs-lisp/autoload.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/autoload.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;; autoload.el --- maintain autoloads in loaddefs.el
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Keywords: maint
--- a/lisp/emacs-lisp/backquote.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/backquote.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; backquote.el --- implement the ` Lisp construct
 
 ;; Copyright (C) 1990, 1992, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Rick Sladkey <jrs@world.std.com>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/benchmark.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/benchmark.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; benchmark.el --- support for benchmarking code
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Love  <fx@gnu.org>
 ;; Keywords: lisp, extensions
--- a/lisp/emacs-lisp/bindat.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/bindat.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; bindat.el --- binary data structure packing and unpacking.
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Assignment name: struct.el
--- a/lisp/emacs-lisp/byte-opt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/byte-opt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler
 
 ;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;	Hallvard Furuseth <hbf@ulrik.uio.no>
--- a/lisp/emacs-lisp/byte-run.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/byte-run.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; byte-run.el --- byte-compiler support for inlining
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;	Hallvard Furuseth <hbf@ulrik.uio.no>
--- a/lisp/emacs-lisp/checkdoc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/checkdoc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; checkdoc.el --- check documentation strings for style requirements
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.6.2
--- a/lisp/emacs-lisp/cl-compat.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/cl-compat.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility)
 
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.02
--- a/lisp/emacs-lisp/cl-extra.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/cl-extra.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*-
 
 ;; Copyright (C) 1993, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: extensions
--- a/lisp/emacs-lisp/cl-indent.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/cl-indent.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cl-indent.el --- enhanced lisp-indent mode
 
 ;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Created: July 1987
--- a/lisp/emacs-lisp/cl-macs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/cl-macs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1993, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.02
--- a/lisp/emacs-lisp/cl-seq.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/cl-seq.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cl-seq.el --- Common Lisp features, part 3  -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.02
--- a/lisp/emacs-lisp/cl-specs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/cl-specs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cl-specs.el --- Edebug specs for cl.el -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Keywords: lisp, tools, maint
 
--- a/lisp/emacs-lisp/cl.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/cl.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cl.el --- Common Lisp extensions for Emacs -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.02
--- a/lisp/emacs-lisp/copyright.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/copyright.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; copyright.el --- update the copyright notice in current buffer
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: maint, tools
--- a/lisp/emacs-lisp/crm.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/crm.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; crm.el --- read multiple strings with completion
 
 ;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Sen Nagata <sen@eccosys.com>
 ;; Keywords: completion, minibuffer, multiple elements
--- a/lisp/emacs-lisp/cust-print.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/cust-print.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cust-print.el --- handles print-level and print-circle
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Adapted-By: ESR
--- a/lisp/emacs-lisp/debug.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/debug.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; debug.el --- debuggers and related commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, tools, maint
--- a/lisp/emacs-lisp/derived.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/derived.el	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
 ;; (formerly mode-clone.el)
 
 ;; Copyright (C) 1993, 1994, 1999, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: David Megginson (dmeggins@aix1.uottawa.ca)
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/disass.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/disass.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; disass.el --- disassembler for compiled Emacs Lisp code
 
 ;; Copyright (C) 1986, 1991, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Doug Cutting <doug@csli.stanford.edu>
 ;;	Jamie Zawinski <jwz@lucid.com>
--- a/lisp/emacs-lisp/easy-mmode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/easy-mmode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; easy-mmode.el --- easy definition for major and minor modes
 
-;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr>
 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
--- a/lisp/emacs-lisp/easymenu.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/easymenu.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; easymenu.el --- support the easymenu interface for defining a menu
 
 ;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Keywords: emulations
 ;; Author: Richard Stallman <rms@gnu.org>
--- a/lisp/emacs-lisp/edebug.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/edebug.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; edebug.el --- a source-level debugger for Emacs Lisp
 
 ;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/eldoc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/eldoc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eldoc.el --- show function arglist or variable docstring in echo area
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman <friedman@splode.com>
 ;; Maintainer: friedman@splode.com
--- a/lisp/emacs-lisp/elint.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/elint.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; elint.el --- Lint Emacs Lisp
 
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Peter Liljenberg <petli@lysator.liu.se>
 ;; Created: May 1997
--- a/lisp/emacs-lisp/elp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/elp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; elp.el --- Emacs Lisp Profiler
 
 ;; Copyright (C) 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Barry A. Warsaw
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/ewoc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/ewoc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ewoc.el --- utility to maintain a view of a list of objects in a buffer
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Per Cederqvist <ceder@lysator.liu.se>
 ;;	Inge Wallin <inge@lysator.liu.se>
--- a/lisp/emacs-lisp/find-func.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/find-func.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; find-func.el --- find the definition of the Emacs Lisp function near point
 
 ;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp>
 ;; Maintainer: petersen@kurims.kyoto-u.ac.jp
--- a/lisp/emacs-lisp/find-gc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/find-gc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; find-gc.el --- detect functions that call the garbage collector
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
--- a/lisp/emacs-lisp/float-sup.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/float-sup.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; float-sup.el --- define some constants useful for floating point numbers.
 
 ;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/emacs-lisp/generic.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/generic.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; generic.el --- defining simple major modes with comment and font-lock
 ;;
 ;; Copyright (C) 1997, 1999, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Fri Sep 27 1996
--- a/lisp/emacs-lisp/gulp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/gulp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; gulp.el --- ask for updates for Lisp packages
 
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Sam Shteingold <shteingd@math.ucla.edu>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/helper.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/helper.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; helper.el --- utility help package supporting help in electric modes
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/levents.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/levents.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; levents.el --- emulate the Lucid event data type and associated functions
 
 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
--- a/lisp/emacs-lisp/lisp-mnt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/lisp-mnt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers
 
 ;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/lisp-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands
 
 ;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, languages
--- a/lisp/emacs-lisp/lisp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/lisp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; lisp.el --- Lisp editing commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1994, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, languages
--- a/lisp/emacs-lisp/lmenu.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/lmenu.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; lmenu.el --- emulate Lucid's menubar support
 
 ;; Copyright (C) 1992, 1993, 1994, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Keywords: emulations obsolete
 
--- a/lisp/emacs-lisp/lselect.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/lselect.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; lselect.el --- Lucid interface to X Selections
 
 ;; Copyright (C) 1990, 1993, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
--- a/lisp/emacs-lisp/lucid.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/lucid.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; lucid.el --- emulate some Lucid Emacs functions
 
 ;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
--- a/lisp/emacs-lisp/macroexp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/macroexp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; macroexp.el --- Additional macro-expansion support
 ;;
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: lisp, compiler, macros
--- a/lisp/emacs-lisp/map-ynp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/map-ynp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; map-ynp.el --- general-purpose boolean question-asker
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/pp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/pp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pp.el --- pretty printer for Emacs Lisp
 
 ;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Randal Schwartz <merlyn@stonehenge.com>
 ;; Keywords: lisp
--- a/lisp/emacs-lisp/re-builder.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/re-builder.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; re-builder.el --- building Regexps with visual feedback
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Detlev Zundel <dzu@gnu.org>
 ;; Keywords: matching, lisp, tools
--- a/lisp/emacs-lisp/regexp-opt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/regexp-opt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; regexp-opt.el --- generate efficient regexps to match strings
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Marshall <simon@gnu.org>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/regi.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/regi.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; regi.el --- REGular expression Interpreting engine
 
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com>
 ;; Maintainer:    bwarsaw@cen.com
--- a/lisp/emacs-lisp/ring.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/ring.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; ring.el --- handle rings of items
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: extensions
--- a/lisp/emacs-lisp/rx.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/rx.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; rx.el --- sexp notation for regular expressions
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/shadow.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/shadow.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; shadow.el --- locate Emacs Lisp file shadowings
 
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Terry Jones <terry@santafe.edu>
 ;; Keywords: lisp
--- a/lisp/emacs-lisp/sregex.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/sregex.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; sregex.el --- symbolic regular expressions
 
 ;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bob Glickstein <bobg+sregex@zanshin.com>
 ;; Maintainer: Bob Glickstein <bobg+sregex@zanshin.com>
--- a/lisp/emacs-lisp/syntax.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/syntax.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; syntax.el --- helper functions to find syntactic context
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/emacs-lisp/tcover-ses.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/tcover-ses.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;;; testcover-ses.el -- Example use of `testcover' to test "SES"
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@engineer.com>
 ;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
--- a/lisp/emacs-lisp/tcover-unsafep.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/tcover-unsafep.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;;; testcover-unsafep.el -- Use testcover to test unsafep's code coverage
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@engineer.com>
 ;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
--- a/lisp/emacs-lisp/testcover.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/testcover.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;;; testcover.el -- Visual code-coverage tool
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
--- a/lisp/emacs-lisp/timer.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/timer.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; timer.el --- run a function with args at some time in future
 
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
--- a/lisp/emacs-lisp/tq.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/tq.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tq.el --- utility to maintain a transaction queue
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Scott Draves <spot@cs.cmu.edu>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/trace.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/trace.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; trace.el --- tracing facility for Emacs Lisp functions
 
 ;; Copyright (C) 1993, 1998, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
 ;; Maintainer: FSF
--- a/lisp/emacs-lisp/unsafep.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/unsafep.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;;; unsafep.el -- Determine whether a Lisp form is safe to evaluate
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
--- a/lisp/emacs-lisp/warnings.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lisp/warnings.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; warnings.el --- log and display warnings
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/emacs-lock.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emacs-lock.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; emacs-lock.el --- prevents you from exiting emacs if a buffer is locked
 
 ;; Copyright (C) 1994, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc
+;;   2005, 2006 Free Software Foundation, Inc
 
 ;; Author: Tom Wurgler <twurgler@goodyear.com>
 ;; Created: 12/8/94
--- a/lisp/emulation/crisp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/crisp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; crisp.el --- CRiSP/Brief Emacs emulator
 
 ;; Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
 ;; Keywords: emulations brief crisp
--- a/lisp/emulation/cua-base.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/cua-base.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cua-base.el --- emulate CUA key bindings
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulation convenience cua
--- a/lisp/emulation/cua-gmrk.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/cua-gmrk.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cua-gmrk.el --- CUA unified global mark support
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience cua mark
--- a/lisp/emulation/cua-rect.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/cua-rect.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cua-rect.el --- CUA unified rectangle support
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience CUA
--- a/lisp/emulation/edt-lk201.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/edt-lk201.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards
 
 ;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevingal@onramp.net>
 ;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
--- a/lisp/emulation/edt-mapper.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/edt-mapper.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs
 
 ;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevingal@onramp.net>
 ;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
--- a/lisp/emulation/edt-pc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/edt-pc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards
 
 ;; Copyright (C) 1986, 1994, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevingal@onramp.net>
 ;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
--- a/lisp/emulation/edt-vt100.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/edt-vt100.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals
 
 ;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevingal@onramp.net>
 ;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
--- a/lisp/emulation/edt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/edt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19
 
 ;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kevingal@onramp.net>
 ;; Maintainer: Kevin Gallagher <kevingal@onramp.net>
--- a/lisp/emulation/keypad.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/keypad.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; keypad.el --- simplified keypad bindings
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard convenience
--- a/lisp/emulation/pc-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/pc-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; pc-mode.el --- emulate certain key bindings used on PCs
 
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
--- a/lisp/emulation/pc-select.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/pc-select.el	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 ;;;		     including key bindings.
 
 ;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Staats <michael@thp.Uni-Duisburg.DE>
 ;; Keywords: convenience emulation
--- a/lisp/emulation/tpu-edt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/tpu-edt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT
 
 ;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
--- a/lisp/emulation/tpu-extras.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/tpu-extras.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt
 
 ;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
--- a/lisp/emulation/tpu-mapper.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/tpu-mapper.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file
 
 ;; Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
--- a/lisp/emulation/vip.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/vip.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vip.el --- a VI Package for GNU Emacs
 
 ;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Masahiko Sato <ms@sail.stanford.edu>
 ;; Keywords: emulations
--- a/lisp/emulation/viper-cmd.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/viper-cmd.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; viper-cmd.el --- Vi command support for Viper
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/emulation/viper-ex.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/viper-ex.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; viper-ex.el --- functions implementing the Ex commands for Viper
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/emulation/viper-init.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/viper-init.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; viper-init.el --- some common definitions for Viper
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/emulation/viper-keym.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/viper-keym.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; viper-keym.el --- Viper keymaps
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/emulation/viper-macs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/viper-macs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; viper-macs.el --- functions implementing keyboard macros for Viper
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/emulation/viper-mous.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/viper-mous.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; viper-mous.el --- mouse support for Viper
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/emulation/viper-util.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/viper-util.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; viper-util.el --- Utilities used by viper.el
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
--- a/lisp/emulation/viper.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/viper.el	Sun Feb 12 00:15:44 2006 +0000
@@ -4,7 +4,7 @@
 ;;		 Viper Is also a Package for Emacs Rebels.
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
--- a/lisp/emulation/ws-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/emulation/ws-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs
 
-;; Copyright (C) 1991, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de>
 ;; Version: 0.7
--- a/lisp/env.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/env.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; env.el --- functions to manipulate environment variables
 
 ;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: processes, unix
--- a/lisp/erc/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/erc/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,3 +1,37 @@
+2006-02-07  Michael Olson  <mwolson@gnu.org>
+
+	* ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04,
+	ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate
+	the filenames in DOS.
+
+	* erc-goodies.el: Comment fix.
+
+	* erc-hecomplete.el: Rename from erc-complete.el.  Update
+	commentary.  Use define-erc-module so that it's possible to
+	actually use this.
+	(erc-hecomplete): Rename function from `erc-complete'.
+	(erc-hecomplete): Rename group from `erc-old-complete'.  Docfix.
+
+	* erc-join.el: Rename from erc-autojoin.el.
+
+	* erc-networks.el: Rename from erc-nets.el.
+
+	* erc-services.el: Rename from erc-nickserv.el.
+
+	* erc-stamp.el (erc-insert-aligned): Don't take 3rd argument.  Use
+	the simpler `indent-to' function when
+	`erc-timestamp-right-align-by-pixel' is nil.
+	(erc-insert-timestamp-right): If the timestamp goes on the
+	following line, don't add timestamp properties to the spaces in
+	front of it.
+
+	* erc.el (erc-migrate-modules): New function that eases migration
+	of module names.
+	(erc-modules): Call erc-migrate-modules in the :get accessor.
+	(erc-modules, erc-update-modules): Update for new modules names.
+	(erc-cmd-SMV): Remove, since this does not give useful output due
+	to the version strings being removed from ERC modules.
+
 2006-02-05  Michael Olson  <mwolson@gnu.org>
 
 	* erc-spelling.el (erc-spelling-init): If
@@ -393,7 +427,7 @@
 	where global-mode-string is not a list.  Emacs22 permits this.
 
 
-See ChangeLog.2005 for earlier changes.
+See ChangeLog.05 for earlier changes.
 
     Copyright (C) 2006 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/erc/ChangeLog.01	Sun Feb 12 00:15:44 2006 +0000
@@ -0,0 +1,1046 @@
+2001-12-18  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.176: * Added missing 747 numreply (banned)
+
+2001-12-15  Gergely Nagy  <algernon@debian.org>
+
+	* debian/scripts/install 1.4, debian/rules 1.6:
+	updated to 2.1.cvs.20011215-1
+
+	* debian/changelog 1.12: Debian version 2.1.cvs.20011215-1
+
+2001-12-11  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.175:
+	* applied a nicer version of mhp's patch to remove the last prompt from
+	  saved logs
+
+	* erc-replace.el 1.1: * Initial checkin
+
+2001-12-11  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.174:
+	* fixed bug triggered when reuse-buffer was enabled (the default).
+	  Another silly port type problem. Maybe we should unify that once and for all sometimes...
+
+2001-12-10  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.173: * erc-message-english: New QUIT and s004 entries.
+	* erc-save-buffer-on-part: New variable.
+	* erc-kill-buffer-on-part: New variable.
+	* (erc-server-PART): Use above variables.
+	* (erc-join-channel): Use DEF argument instead of initial input for completing-read.
+
+2001-12-08  Tijs van Bakel  <smoke@wanadoo.nl>
+
+	* erc.el 1.172: added defcustom erc-nick-uniquifier ^ (i prefer _)
+
+2001-12-07  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.11: changelog for version 2.1.cvs.20011208-1
+
+2001-12-07  Tijs van Bakel  <smoke@wanadoo.nl>
+
+	* erc.el 1.171:
+	Added erc-scroll-to-bottom as an erc-insert-hook function.  It still bugs a bit, so please test it, thanks
+
+2001-12-07  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.170: * Fixed silly bug in erc-server-TOPIC (thanks mhp)
+
+	* erc-speak.el 1.17:
+	* Fix non-greedy matching bug. That one somehow swallowed text
+
+	* erc.el 1.169:
+	Fix Emacs20 problem. For now, we disable erc-track-modified-channels-minor-mode in emacs20
+
+2001-12-07  Andreas Fuchs  <asf@void.at>
+
+	* erc-fill.el 1.5:
+	* Fix another stupid one-off error. This time it really works!
+	 (Until I find the next bug. I guess you can hold your breath) (-:
+
+2001-12-06  Andreas Fuchs  <asf@void.at>
+
+	* erc-fill.el 1.4: * Fixed static filling:
+	** No more \ed (continued on next line) lines anymore
+	** Fixed bug with previous version where longer lines wouldn't get
+	   filled correctly (i.e. at all)
+
+2001-12-06  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.10: changelog for 2.1.cvs.20011206-1 added
+
+2001-12-06  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.168:
+	* Don't discard away status when identifying to NickServ
+	* Modify `erc-already-logged-in': check for port, too.
+
+	* erc-fill.el 1.3:
+	* Fix stupid loop non-termination error in erc-fill-static when filling
+	  one-line regions.
+	* Make erc-count-lines return meaningful values
+
+2001-12-05  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.167:
+	* (erc-process-input): Make ' /command' work for quoting /commands
+
+	* erc-speak.el 1.16: see changelog
+
+	* erc-fill.el 1.2: see erc.el changelog
+
+	* erc.el 1.166:
+	* erc-insert-hook: Changed strategy completely, no start end parameters any more.
+	We narrow-to-region now, thats much cleaner.
+	* rename erc-fill-region to erc-fill and change the autoload
+	** You'll probably need to restart Emacs
+
+2001-12-04  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.165:
+	* (erc-send-current-line): Fixed long outstanding bug. XEmacs users with erc-fill-region on erc-insert-hook knew that one a long time.
+
+	* erc.el 1.164: fix order of attack
+
+	* erc.el 1.163: * macroexpanded define-minor-mode for XEmacs
+
+	* erc.el 1.162: First try to make channel tracking mouse sensitive
+
+	* erc.el 1.161: * More erc-message-format conversion.
+	  erc-format-message-english-PART as an example on how to use functions to format message
+	* (erc-format-message): Fallback mechanism to use english catalog if variable is not bound
+
+2001-12-03  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.160: * (erc-iswitchb): Rewrite, docfix.
+	Make it use erc-modified-channels as default if available.
+
+	* erc-menu.el 1.2:
+	* Fixage related to erc-track-modified-channels-minor-mode rewrite
+
+	* erc.el 1.159:
+	* erc-track-modified-channels-minor-mode: Use buffer objects instead of erc-default-target return value for internal state keeping.
+
+	* erc.el 1.158: * Made reconnect behave nicer (erc-process-sentinel)
+	* Rewrote erc-modified-channels-tracking completely.
+	  Its now a minor mode (erc-track-modified-channels-minor-mode)
+	  It uses a list as internal representation now, so all silly string-parsing
+	  related bugs should be gone.
+	  Use (erc-track-modified-channels-minor-mode t) now to toggle this functionality.
+	  Dont set the erc-track-modified-channels-minor-mode variable yourself, use the toggle function
+
+2001-11-29  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.9: final version
+
+2001-11-29  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.157:
+	* (erc-channel-p): Make it work with string and buffer as parameter. buffer.
+	* (erc-format-message): Add a check for functionp. This allows a format-specifier also to be a function name, which gets called with args applied and needs to return the actual format string.
+	* Converted some formats, JOIN, JOIN-you, MODE, ...
+
+2001-11-28  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.156:
+	* (erc-prepare-mode-line-format): Added sanity checks to prevent it from having problems with server buffers where the connection failed
+
+	* erc-bbdb.el 1.7:
+	* (erc-bbdb-JOIN): regexp-quote the fingerhost before searching, some people have really strange characters as their user names
+
+	* erc.el 1.155: Remove a stupid debug like (message ...) call
+
+2001-11-28  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.8: draft of 2.1.cvs.20011128-1
+
+	* debian/rules 1.5: simplify for the all-in-one erc package
+
+	* debian/control 1.3: integrated erc-speak back into erc
+
+	* debian/maint/conffiles 1.3, debian/maint/conffiles.in 1.2, debian/maint/postinst 1.3, 
+	  debian/maint/postinst.in 1.2, debian/maint/prerm 1.3, debian/maint/prerm.in 1.2, 
+	  debian/scripts/install 1.3, debian/scripts/install.in 1.3, debian/scripts/remove 1.3, 
+	  debian/scripts/remove.in 1.2, debian/scripts/startup.erc-speak 1.2:
+	since erc-speak is gone, resurrect the static files, and update them to support the latest erc
+
+2001-11-28  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.154: * (erc-mode): Shouldn't be interactive.
+	* (erc-info-mode): Ditto.
+
+	* erc.el 1.153: * (erc-server-352): Added hopcount parsing.
+	Added call to erc-update-channel-member to fill in channel-members information
+	on /WHO if the channel is joined.
+
+2001-11-27  Mario Lang  <mlang@delysid.org>
+
+	* erc-speedbar.el 1.6: *** empty log message ***
+
+	* erc-speedbar.el 1.5: * (erc-speedbar-expand-user): New function.
+	Used when more information than just the nick name is available about a dude.
+
+	* erc.el 1.152: * Fixed stupid edit,checkin,save cycle error :)
+
+	* erc.el 1.151:
+	* (erc-generate-log-file-name-default): Renamed to -long
+	Doc fix.
+	* (erc-generate-log-file-name-old): Renamed to -long
+	Doc fix.
+	* erc-generate-log-file-name-function: Set default to ...-long
+	Doc fixes
+
+	* erc-speedbar.el 1.4: *** empty log message ***
+
+2001-11-26  Mario Lang  <mlang@delysid.org>
+
+	* erc-speedbar.el 1.3: * Integrated channel names list
+	  what else do we need to replace info buffers???
+	  please test that code and comment on erc-ehlp, thanks
+
+	* erc-speedbar.el 1.2:
+	* Added erc-speedbar-goto-buffer and therefore enable switching to the buffers from speedbar
+
+	* erc-speedbar.el 1.1:
+	I had to check this in, it works !! sort of,, megaalphagammaversion, first version. test, play, submit ideas/patches
+
+2001-11-26  Gergely Nagy  <algernon@debian.org>
+
+	* erc.el 1.150 (erc-mode): moved erc-last-saved-position here
+	moved buffer naming code from here..
+	(erc): ...to here
+	(erc-generate-log-file-name-old): only prepend target if it exists
+
+	made erc-log-insert-log-on-open a defcustom
+
+2001-11-26  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.149:
+	* Applied antifuchs/mhp patches, the latest on erc-help, unmodified
+	* New variable: erc-reuse-buffers default to t.
+	* Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, 
+	  then one can assume thats the same channel/query target again.
+
+2001-11-23  Mario Lang  <mlang@delysid.org>
+
+	* erc-bbdb.el 1.6:
+	* new function erc-BBDB-NICK to handle nickname anotation on a nick-change event of a known record
+
+	* erc.el 1.148: * Remove erc-rename-buffer, its no longer necessary
+	* Remove erc-autoop-*. it was broken, and needed rewrite anyway
+	* write erc-already-logged-in in terms of erc-buffer-list and make the duplicate login check work again
+
+	* erc.el 1.147: * Fixed stupid typo
+
+2001-11-22  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.146: * New local variable, erc-announced-server-name
+	* erc-mode-line-format supports a new symbol, target-and/or-server
+	* The mode-line displays the announced server name now (for autojoin later..., 
+	  greets Adam)
+	* New macro, erc-server-hook-list for a nice way to define the defcustoms of the erc-server-*-hook's
+	  Thanks go to the guy from #emacs who helped with that
+	* erc-fill-region is now autoloaded from erc-fill.el
+	  * erc-fill.el implements a new fill method, erc-fill-static
+	    (setq erc-fill-function 'erc-fill-static)
+	* Some other things I forgot right now
+
+	* erc-bbdb.el 1.5: *** empty log message ***
+
+	* erc-fill.el 1.1: Initial version.
+
+	* erc-complete.el 1.4:
+	Applied antifuchs patch to make completion work with (string= erc-prompt "")
+
+	* erc-complete.el 1.3:
+	added function erc-nick-completion-exclude-myself
+	you can set erc-nick-completion to 'erc-nick-completion-exclude-myself to use it
+
+2001-11-21  Mario Lang  <mlang@delysid.org>
+
+	* erc-bbdb.el 1.4:
+	* Changed usage of 'finger-host to bbdb-finger-host-field
+
+	* erc-bbdb.el 1.3:
+	* Changed WHOIS to use finger-host instead of net field.
+	* Added 'visible as option to erc-bbdb-popup-p to only pop-up the bbdb buffer if a join happened in a visible buffer on any visible frame.
+	* Added (regexp-quote ...) for nickname search in erc-bbdb-JOIN
+
+2001-11-20  Mario Lang  <mlang@delysid.org>
+
+	* erc-bbdb.el 1.2: * Added JOIN support
+
+2001-11-19  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.145:
+	Initial message catalog code. converted erc-action-format usage to use it
+
+	* erc.el 1.144: * erc-play-sound: Added XEmacs related check
+
+	* erc-bbdb.el 1.1: * Initial version, many thanks to Andreas Fuchs
+
+	* erc.el 1.143: * Fixed silly problem with whois/was handling
+
+	* erc.el 1.142: * Renamed prev-rd to erc-previous-read
+	* Removed erc-next-line-add-newlines and s next-line-add-newlines to nil in defun erc by default
+
+	* erc.el 1.141:
+	fixed xemacs compatibility prob with delete, thanks Adam
+
+2001-11-18  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.140: numreplies 301 & 461
+
+2001-11-13  Tijs van Bakel  <smoke@wanadoo.nl>
+
+	* erc.el 1.139:
+	Added code for error reply 421 "Unknown command", to test the new server parsing system.
+	This was really easy!  Thanks ZenIRC guys & delysid :-)
+
+2001-11-13  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.138: * Allow connecting to SSL enabled irc servers.
+	   Ugly hack, but it works for now. Be sure to use the numeric irc port 994 so that erc can recognize what you want
+	  good example is
+	irc server: ircs.segfault.net
+	port: 994
+
+	meet me there, I am still delYsid :)
+
+	* erc.el 1.137: * some more numreply handlers
+	* cleanup in erc-process-away-p
+	* new function erc-display-error-notice
+
+	* erc.el 1.136: * numreply 501 and 221
+
+	* erc.el 1.135:
+	removed obsolete old hook variables. Your functions may break, but it is easy to hook them up to the new hooks.
+	erc-part-hook: use erc-server-PART-hook instead
+	erc-kick-hook: use erc-server-KICK-hook instead
+	and so on
+
+	* erc.el 1.134:
+	fixed serious bug which cause privmsgs vanishing when erc-auto-query was set to nil
+
+	* erc.el 1.133: cleaned up erc-process-filter
+
+	* erc.el 1.132: * 401 and 320 numreplies implemented
+
+	* erc.el 1.131: * Removed old/now obsolete code
+
+	* erc.el 1.130: * Fixed bug in erc-server-MODE
+
+2001-11-12  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.129: fixed it
+
+	* erc.el 1.128:
+	*** We switched over. New server message parsing/handling is running now. Thansk to the zenirc developers for the great ideas I got from the code!!!!! Go and test it, poke at it, bug me on irc about problems
+
+	* erc.el 1.127: *** empty log message ***
+
+2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
+
+	* erc.el 1.125:
+	Fixed bug in erc-get-buffer, now channel names are compared in
+	a case-insensitive way.
+
+2001-11-12  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.124: erc-server-353
+
+2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
+
+	* erc.el 1.123: Fixed docstring for erc-get-buffer.
+	Added erc-process to a lot of calls to erc-get-buffer, so
+	that only the local process is searched.
+
+2001-11-12  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.122: * erc-buffer-filter: do it differently
+
+	* erc.el 1.121: ugly but working fix for mhp's query problem
+
+	* erc.el 1.120: * erc-server-PRIVMSG-or-NOTICE
+	  Now, all the server word replies are finished. Going to numreplies now
+
+	* erc.el 1.119:
+	* debugging fascilities for the transition. C-x 2 C-x o M-x ielm RET erc-server-vectors RET ; to get a list of all server messages currently not handled in the new code. Feel free to pick one and implement it
+
+	* erc.el 1.118: * erc-server-KICK and erc-server-TOPIC. new functions
+	* erc-server-305-or-306 and erc-server-311-or-314
+
+	* erc.el 1.117:
+	* ported PART and QUIT msgs to the new scheme, many to go. but it is a easy task. does someone wanna try and start with numreplies?
+
+	* erc.el 1.116: * erc-server-JOIN
+
+	* erc.el 1.115: * Ported erc-server-INVITE code
+
+	* erc.el 1.114: * erc-server-ERROR and erc-server-MODE
+
+2001-11-11  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.113: * zen
+
+	* erc.el 1.112: * New variable erc-connect-function.
+
+	* erc.el 1.111:
+	* New function erc-channel-p and use it where appropriate
+
+	* erc.el 1.110: * Removed the variable erc-buffer-list completely now
+	* Moved erc-dbuf around a bit
+
+	* erc.el 1.109: * Fix silly change in quit/rename msg handling
+
+	* erc.el 1.108: thanks mhp, fixed
+
+	* erc.el 1.107: * Tijs van Bakel's work from 10th Nov. merged in
+	* My additions to that idea merged in too
+	Basicly, this is a major rewrite, if you are scared and want avoid problems,
+	stay at your current version. It seems fairly stable though.
+	That changed? erc-buffer-name handling was completely rewritten,
+	and erc-buffer-list local variable handling removed.
+	Simplifies alot of code. Poke at it. read the diff. report bug/send patches!
+
+	* erc.el 1.106: * Added variable listing when /set is used without args
+
+2001-11-10  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.105:
+	* Comment/structure cleanup, removal of unnecessary code
+
+	* erc.el 1.104: only some code beautification
+
+	* erc-imenu.el 1.2:
+	remove add-hook call, thats done in erc.el now for autoloadability
+
+	* erc.el 1.103: * Make erc-imenu autoloadable
+
+	* erc.el 1.102:
+	* The long promised erc-mode-line-format handling rewrite
+	   Poke at it, try it, play with it, report bugs
+
+	* erc.el 1.101:
+	some regex-quote fixes, new function erc-cmd-set, and minor things
+
+2001-11-08  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.100:
+	* added second timestamp-format (erc-away-timestamp-format) for marking msgs when being away
+
+	* erc-complete.el 1.2: fixed silly deffun
+
+	* erc.el 1.99: * Rewrote erc-load-irc-script (simplified)
+	* Removed depricated code
+
+	* erc-speak.el 1.15: * reflect changes in erc.el
+
+	* erc.el 1.98:
+	* Moved completion related functions into erc-complete.el
+	  placed an autoload instead into erc.el. That quite cool,
+	  because erc-complete.el only gets loaded when you use
+	  TAB first time in erc.
+
+	* erc-complete.el 1.1: _ Initial checkin
+
+	* erc.el 1.97: * New function: erc-chain-hook-with-args
+	* Changed calls to erc-insert-hook to use it
+
+2001-11-07  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.96: * Patch from Fabien Penso
+	  Make completion case insensitive. try it! its cool
+
+	* erc.el 1.95: * Reduction patch 2
+	  This time, we move the input ring handling into erc-ring.el
+	  Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
+	  And remeber, that you dont need it if you dont use input ring :-)
+
+	* erc-ring.el 1.1: * Initial checkin
+
+	* erc.el 1.94: * The great reduction patch :-)
+	  moved relevant function from erc.el to new file erc-menu.el and erc-imenu.el
+
+	* erc-imenu.el 1.1: nitial version
+
+	* erc-menu.el 1.1: * Initial version
+
+	* erc.el 1.93: * wording change suggested by Benjamin Drieu
+
+2001-11-07  Tijs van Bakel  <smoke@wanadoo.nl>
+
+	* erc.el 1.92: Added Emacs version to /SV
+
+2001-11-07  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.91: * Hookification patch, read the diff
+
+	* erc.el 1.90: too tired for a changelog :)
+
+2001-11-06  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.89:
+	* make erc-cmd-op and erc-cmd-deop take multiple nicknames as argument
+
+2001-11-06  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.7: sync
+
+	* debian/rules 1.4: fixed a typo: PKGDIR, not PKIDR
+
+2001-11-06  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.88:
+	* Changed timestamping when away to use erc-timestamp-format and append the timestamp instead of prepending it..
+	* minor cleanup, s/(if (not /(unless/ and thelike
+
+2001-11-06  Tijs van Bakel  <smoke@wanadoo.nl>
+
+	* erc.el 1.87: Fixed OP and DEOP commands to return T.
+	Added SV say-version command.
+	Added erc-send-message utility function, but it's not used everywhere yet.
+
+2001-11-05  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.86: stupid delYsid, forgot require 'format-spec. good nite
+
+	* erc.el 1.85:
+	* new variable erc-action-format. Some erc-notice-prefix fixes again
+
+	* erc.el 1.84: * erc-minibuffer-privmsg defaults to t
+
+	* erc.el 1.83:
+	* Small fix in relation to the transition to erc-make-notice
+
+2001-11-05  Tijs van Bakel  <smoke@wanadoo.nl>
+
+	* erc.el 1.82:
+	Renamed erc-message-notices to erc-minibuffer-notice, and renamed erc-prevent-minibuffer-privmsg to erc-minibuffer-privmsg, inverting its functionality
+
+	* erc.el 1.81: Added support for channel names starting with & + and !.
+	Also, many changes partially discussed on the mailinglist:
+
+		* erc.el (cl): Add requirement for cl package.
+		(erc-buffer-list): Make this variable global again.
+		(erc-default-face): Fix typo.
+		(erc-timestamp-face): Add face for timestamps.
+		(erc-join-buffer, erc): Add a 'bury option.
+		(erc-send-action): Add timestamp.
+		(erc-command-table): Add /CLEAR, /DEOP, /OP, /Q.
+		(erc-send-current-line): Add timestamp.
+		(erc-send-current-line): Add call to erc-insert-hook.
+		(erc-cmd-clear): New command to clear buffer contents.
+		(erc-cmd-whois): Fix cut'n'paste-o.
+		(erc-cmd-deop): New command to deop a user.
+		(erc-cmd-op): New command to op a user.
+		(erc-make-notice): Moved a lot of duplicate code here.  Perhaps
+		this should also be done for erc-highlight-error.
+		(erc-parse-line-from-server): Now NOTICE will also open a new
+		query, just as PRIVMSG.
+		(erc-parse-line-from-server): Call erc-put-text-property on a
+		channel message/notice first, before concatenating nick and
+		timestamp &c.
+		(erc-message-notices): Add option to display notices in
+		minibuffer.
+		(erc-fill-region): No longer strip spaces in front of incoming
+		messages.
+		(erc-parse-current-line): No longer strip spaces in front of text
+		input by user.
+
+	Hopefully I didn't break too much :(
+
+2001-11-05  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.80:
+	* New function erc-nickserv-identify-autodetect for erc-insert-hook. Added by default currently.
+
+	* erc.el 1.79:
+	* Mini-fix in erc-process-num-reply (= n 353): Added @ as prefix character to make certain channels on opn work again nicely
+
+2001-10-31  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.6: updated to reflect changes
+
+	* debian/scripts/install.in 1.2:
+	moved #PKGFLAG# before -f batch-byte-compile
+
+2001-10-29  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.78:
+	Imenu fixed somehow, added IRC services interactive function for indentify to NickServ. Read the diff
+
+2001-10-26  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.5: sigh. -2
+
+2001-10-25  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.4: updated to reflect changes
+
+	* debian/rules 1.3: handle conffiles.in too
+
+	* debian/maint/conffiles.in 1.1: new file
+
+	* debian/maint/conffiles 1.2: superceded by conffiles.in
+
+	* debian/scripts/startup 1.2: superceded by startup.erc
+
+2001-10-25  Mario Lang  <mlang@delysid.org>
+
+	* debian/scripts/startup.erc-speak 1.1: * Initial version
+
+	* debian/scripts/startup.erc 1.1: * Added and fixes minimal typo
+
+2001-10-25  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.3: updated to reflect changes
+
+	* debian/rules 1.2:
+	modified to be able to build the erc-speak package too
+
+	* debian/control 1.2: added the new erc-speak package
+
+	* debian/README.erc-speak 1.1, debian/maint/postinst.in 1.1, debian/maint/prerm.in 1.1, 
+	  debian/scripts/install.in 1.1, debian/scripts/remove.in 1.1:
+	new file
+
+	* debian/maint/postinst 1.2, debian/maint/prerm 1.2, debian/scripts/install 1.2, 
+	  debian/scripts/remove 1.2:
+	removed, superceded by it's .in counterpart
+
+2001-10-25  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.77: * Fixed some defcustom :type 's
+	* Added erc-before-connect hook which gets called with server port and nick.
+	  Use this hook to e.g. setup a tunnel before actually connecting.
+	  something like (when (string= server "localhost") ...)
+
+2001-10-24  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.76: * Patch by smoke: fix erc-cmd-* commands and add aliases
+
+2001-10-23  Mario Lang  <mlang@delysid.org>
+
+	* erc-speak.el 1.14:
+	* Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, 
+	  especially if you are on more than one channel simultaniously.
+
+	* erc.el 1.75:
+	* Made the completion postfix customizable through erc-nick-completion-postfix
+
+	* erc-speak.el 1.13, erc.el 1.74:
+	* Added erc-prevent-minibuffer-privmsg
+
+	* erc-speak.el 1.12:
+	* Quickish hack to allow exclusion of timestamps from speaking. see erc-speak-filter-timestamps
+
+2001-10-21  Mario Lang  <mlang@delysid.org>
+
+	* erc-speak.el 1.11:
+	* Removed now really obsolete code. Package size reduced by 50%
+
+	* erc-speak.el 1.10:
+	* Very important fix! Now erc-speak is really complete. Messages dont get cut anymore. Be sure to use auditory icons, 
+	  it's reallllly cool now!!!
+
+	* erc-speak.el 1.9: *** empty log message ***
+
+	* erc-speak.el 1.5: * Major simplification. depends on erc.el,v 1.73
+	* Things removed, read diff
+
+2001-10-21  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.2: oops, silly typo
+
+	* debian/changelog 1.1, debian/control 1.1, debian/copyright 1.1, 
+	  debian/maint/conffiles 1.1, debian/maint/postinst 1.1, debian/maint/prerm 1.1, 
+	  debian/rules 1.1, debian/scripts/install 1.1, debian/scripts/remove 1.1, 
+	  debian/scripts/startup 1.1:
+	initial check-in
+
+2001-10-21  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.73:
+	* Changed erc-insert-hook to get two arguments, START and END of the region
+	  which got inserted. CAREFUL! This could break stuff, but it makes the hook
+	  much more useable.
+
+	* erc.el 1.72:
+	* Made erc-smiley a new option, currently set to t to showoff this feature. :)
+
+2001-10-20  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.71: * Add missing erc-mode-hook variable
+	* Add smiley-support (preliminary test)
+
+2001-10-20  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.70:
+	Replaced all occurences of put-text-property with a call to
+	erc-put-text-property.
+	(erc-put-text-property): New function.
+	(erc-tracking-modified-channels): Moved to the front of the file such
+	that it is already defined when the menu is being defined.
+	(erc-modified-channel-string): Ditto.
+
+2001-10-18  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.69: Removed some commentary.  The wiki page is the place to
+	put such information.
+	(erc-fill-prefix): Doc change.
+	(erc-notice-highlight-type): Doc change, now a user option.
+	(erc-pal-highlight-type): Doc change, now a user option.
+	(erc-fool-highlight-type): New option.
+	(erc-keyword-highlight-type): New option.
+	(erc-dangerous-host-highlight-type): New option.
+	(erc-uncontrol-input-line): Doc change.
+	(erc-interpret-controls-p): Doc change, now a user option.
+	(erc-multiline-input): Doc change.
+	(erc-auto-discard-away): Doc change.
+	(erc-pals): Changed from string to regexp.
+	(erc-fools): New option.
+	(erc-keywords): Renamed from erc-highlight-strings.  WATCH OUT:
+	Not backwards compatible change!
+	(erc-dangerous-hosts): Renamed from erc-host-danger-highlight.
+	WATCH OUT: Not backwards compatible change!
+	(erc-menu-definition): Added menu entries for fools, keywords and
+	dangerous hosts.
+	(erc-mode-map): Changed keybindings from C-c <plain ascii> to
+	various C-c <C-ascii> combinations.
+	(erc-dangerous-host-face): Renamed from erc-host-danger-face.
+	WATCH OUT: Not backwards compatible change!
+	(erc-fool-face): New face.
+	(erc-keyword-face): Renamed from erc-highlight-face.  WATCH OUT:
+	Not backwards compatible change!
+	(erc-parse-line-from-server): Fixed highlighting in the cases
+	where (equal erc-pal-highlight-type 'all), added code to handle
+	erc-fool-highlight-type, erc-dangerous-host-highlight-type
+	(erc-update-modes): Replaced erc-delete-string with delete.
+	(erc-keywords): Renamed from erc-highlight-strings, handle
+	erc-keyword-highlight-type.
+	(erc-delete-string): Removed.
+	(erc-list-match): New function.
+	(erc-pal-p): Use erc-list-match.
+	(erc-fool-p): New function.
+	(erc-keyword-p): New function.
+	(erc-dangerous-host-p): Renamed from erc-host-danger-p, use
+	erc-list-match.
+	(erc-directed-at-fool-p): New function.
+	(erc-add-entry-to-list): New function.
+	(erc-remove-entry-from-list): New function.
+	(erc-add-pal): Use erc-add-entry-to-list.
+	(erc-delete-pal): Use erc-remove-entry-from-list.
+	(erc-add-fool): New function.
+	(erc-delete-fool): New function.
+	(erc-add-keyword): New function.
+	(erc-delete-keyword): New function.
+	(erc-add-dangerous-host): New function.
+	(erc-delete-dangerous-host): New function.
+
+2001-10-07  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.68: * irc vs ircd default port fixed
+
+	* erc.el 1.67: * Added topic-change to imenu
+
+	* erc.el 1.66: * More imenu spiffyness
+
+	* erc.el 1.65: * Added imenu support
+
+	* erc.el 1.64:
+	* Fix to /topic to show topic instead of setting it to null :)
+
+2001-10-05  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.63: * First version of erc-rename-buffer
+
+	* erc.el 1.62: * more header-line tricks.
+
+	* erc.el 1.61:
+	* Small fix to do erc-update-mode-line-buffer in erc-update-channel-topic
+
+	* erc.el 1.60: * Added erc-header-line-format
+
+2001-10-04  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.59: * mini-fix, add msgp to auto-query code
+
+	* erc.el 1.58: * Added command-names to completion (erc-command-table)
+	* New variable erc-auto-query. When set, every arriving message to you
+	will open a query buffer for that sender if not already open.
+	* Compatibility function fo non-existing line-beginning|end-position functions in XEmacs.
+
+2001-10-03  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.57:
+	* Removed alot of (progn ...) where they were not necessary
+	* Changed some (if ...) without else part to (when ...)
+	* Some (while ...) to use (dolist ...)
+	* Fix for completion popup generating tracebacks.
+	* New function erc-arrange-session-in-mulptiple-windows
+	* Lots of other stuff, read the diff
+
+2001-10-02  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.56: * Added erc-kill-input and keybinding C-c C-u for it
+
+2001-10-01  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.55: * Another fix to nick-completion
+	* Additional checks in erc-track-modified-channels
+
+2001-09-26  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.54: * Fixed completion (alex)
+	  * Now popup buffer doesnt destroy your window configuration.
+	* Fixed away handling (incomplete)
+
+2001-09-24  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.53: Fixed silly quoting-escape error
+
+2001-09-23  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.52: * Added auto-op support (unfinished)
+	* Added erc-latest-version.
+	* Added erc-ediff-latest-version.
+
+2001-09-21  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.51:
+	* Minor menu additions (invite only mode is now a checkbox)
+
+2001-09-20  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.50:
+	* Fix (erc-cmd-names): This should fix C-c C-n too, hoepfully it was the right fix and doesnt break anything else.
+
+	* erc.el 1.49: * Fixes XEmacs easymenu usage (2nd time).
+
+2001-09-19  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.48:
+	* (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space
+
+	* erc.el 1.47:
+	* Changed menu-definition to use easymenu (hopefully this now works under Xemacs)
+	* Fix for custom problem with :must-match on XEmacs (thanks shapr)
+	* Added /COUNTRY command using (what-domain) from package mail-extr (shapr)
+	* Fix for case-sensitivity problem with pals (they are now all downcased)
+	* Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, 
+	  instead of just displaying it in the minibuffer.
+
+2001-09-10  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.46: Updated erc-version-string
+
+	* erc.el 1.45: Version number change and last read-through...
+
+2001-09-04  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.44: Added some asterisks
+
+2001-08-24  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.43:
+	Fixed hidden channel buffer tracking (sort of), now using switch-to-buffer for advice.
+	This version is unofficially named 2.1prebeta1. Please test it and send
+	fixes to various problems you may encounter so that we can eventually
+	release 2.1 soon.
+
+2001-08-14  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.42:
+	Added function erc-bol and keybinding C-c C-a for it (contributed by Benjamin Rutt <brutt@bloomington.in.us)
+
+2001-08-07  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.41:
+	Checked in lathis code and modified it slightly. Still unsure about set-window-buffer advice, current attempt doesnt seem to work.
+	Removed (nick -> #channel) from mode-line. (CLOSED) and (AWAY...) should still be displayed when appropriate
+
+2001-08-06  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.40:
+	added local-variable channel-list in session-buffers and make /LIST use it.
+	erc-join-channel can now do completion after /LIST was executed
+
+2001-08-05  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.39: Tweaked erc-join-channel and erc-part-from-channel
+
+2001-07-27  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.38: some more defcustom stuff
+
+	* erc.el 1.37: Patch from Henrik Enberg <henrik@enberg.org>:
+	   Adds variables erc-frame-alist and erc-frame-dedicated-p.
+
+	* erc.el 1.36: fixed erc-part-from-channel
+
+	* erc.el 1.35:
+	fixed match-string problem and added interactive topic setting function.
+
+	* erc.el 1.34: fixed silly string-match bug
+
+	* erc.el 1.33:
+	Added erc-join-channel and erc-part-from-channel (interactive prompts), as well as keybindings. C-c C-j #emacs RET is now enough :)
+
+2001-07-27  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.32 (erc-display-line-buffer): Simplified filling.
+	(erc-fill-region): New function.
+
+2001-07-27  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.31: Added redundancy check in output
+
+2001-07-26  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.30 (erc-send-action): Add text-property stuff.
+	(erc-input-action): Removed text-property stuff.
+	(erc-command-table): Corrected command for DESCRIBE.  Still
+	doesn't work though.  No idea what it should do.  Looks like a no op.
+	(erc-cmd-me): Doc change.
+
+2001-07-26  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.29:
+	fixed one occurence of a setq with only one argument (XEmacs didnt like that)
+
+	* erc.el 1.28:
+	Added erc-next-line-add-newlines customisation possibility.
+
+	* erc.el 1.27:
+	added erc-fill-prefix for defining your own way of filling and fixed filling somehow
+
+	* erc.el 1.26:
+	fixed small incompatibility in erc-parse-line-from-server at (and (= n 353) regexp
+
+2001-07-25  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.25:
+	Added erc-filling and filling code to erc-display-line-buffer.
+
+2001-07-08  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.24 (try-complete-erc-nick): Make the ": " part of the
+	expansion
+
+	* erc.el 1.23: require ring
+
+2001-07-08  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.22: *** empty log message ***
+
+2001-07-07  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.21: typo
+
+	* erc.el 1.20: ommit
+	:wq
+
+2001-07-06  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.19 (erc-mode): Call erc-input-ring-setup.
+	(erc-send-current-line): Call erc-add-to-input-ring.
+	(erc-input-ring): New variable.  Currently not buffer local.
+	(erc-input-ring-index): New variable.  Currently not buffer local.
+	(erc-input-ring-setup): New function.
+	(erc-add-to-input-ring): New function.
+	(erc-previous-command): New function.
+	(erc-next-command): New function.
+	(erc-mode-map): Uncommented keybindings for erc-next-command and
+	erc-previous-command.
+
+2001-07-05  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.18 (erc-highlight-strings): Removed debug message.
+
+	* erc.el 1.17 (erc-join-buffer): Changed default to 'buffer.
+	(erc-join-info-buffer): Changed default to 'disable.
+	(erc-nick-completion): Changed default to 'all.
+
+2001-07-04  uid31117  <uid31117@confusibombus>
+
+	* erc.el 1.16: Resolved...
+
+2001-07-03  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.15 (erc-highlight-strings): New option and new function.
+	(erc-parse-line-from-server): Use it.
+	Various empty lines removed.  Various doc strings fixed.
+
+	* erc.el 1.14: Removed more empty lines.
+
+	* erc.el 1.13 (erc-member-string): replaced by plain member
+	Otherwise, lots of deleting of empty lines...  I'm not too happy with that
+	but I feel better when the code is "cleaned up".
+
+2001-07-03  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.12: Ugly hack, but looks nicer when giving commands
+
+	* erc-speak.el 1.4: ugly hack, but looks nicer now
+
+2001-07-03  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.11 (try-complete-erc-nick): New function.
+	(erc-try-complete-nick): New function.
+	(erc-nick-completion): New option.
+	(erc-complete): Call hippie-expand such that erc-try-complete-nick
+	will be called eventually.  Based on erc-nick-completion
+	try-complete-erc-nick will then complete on the nick at point.
+
+2001-07-02  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.10:
+	Insert (erc-current-nick) instead of (erc-display-prompt). good night :)
+
+	* erc.el 1.9:
+	small, but it was anoying, so I just did it (defcustom for erc-join-buffer and erc-join-info-buffer)
+
+2001-06-29  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.8: Use defface to define all faces.
+	Removed some history from the commentary, as well as some other
+	commentary editing.
+
+2001-06-28  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.7: hmm, defcustom for erc-user-full-name
+
+	* erc-speak.el 1.3, erc.el 1.6: *** empty log message ***
+
+2001-06-27  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.5: typo
+
+	* erc.el 1.4: Some more defcustom
+
+	* erc-speak.el 1.2: nothing, really
+
+2001-06-26  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.3: Some defcustom stuff. Still no defgroup though :)
+
+	* erc.el 1.2:
+	Initial change to erc.el (2.0). Mainly list of ideas and features
+	and syntax-table entries.
+
+	* erc-speak.el 1.1.1.1, erc.el 1.1.1.1: Initial Import
+
+	* erc-speak.el 1.1, erc.el 1.1: New file.
+
+    Copyright (C) 2001 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.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;; arch-tag: 306c4b58-f9ae-4f3d-9fd9-db2d743f05a6
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/erc/ChangeLog.02	Sun Feb 12 00:15:44 2006 +0000
@@ -0,0 +1,2607 @@
+2002-12-31  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.398 (erc-split-command):
+	Removed assignment to free variable "continue".
+	(erc-strip-controls): New function.  Takes a string, returns the string with
+	all IRC color/bold/underline/etc. control codes stripped out.
+	(erc-interpret-controls): If variable erc-interpret-controls-p is nil, now
+	uses erc-strip-controls to strip control codes.
+	(erc-ctcp-reply-ECHO): Changed reference and assignment to free variable "s"
+	into reference/assignment to "msg", which appears to be the original author's
+	intent.
+
+	* erc-list.el 1.8 (erc-chanlist):
+	Changed to use the new erc-once-with-server-event function
+	instead of the old macro of the same name.
+
+	* erc-notify.el 1.10 (erc-notify-timer):
+	Changed to use the new erc-once-with-server-event function
+	instead of the old macro of the same name.  Also fixed a bug were variable
+	erc-last-ison was being read from a non-server buffer (thus giving its default
+	value instead of its per-server value).
+
+	* erc.el 1.397 (erc-once-with-server-event):
+	This is now a function.  It was a macro with a
+	bug (the call to gensym happened at byte-compile-time not macro-call-time).
+	(erc-toggle-debug-irc-protocol): Now [return] is bound to this function in
+	the *erc-protocol* buffer.
+
+2002-12-30  Alex Schroeder  <alex@gnu.org>
+
+	* erc-autoaway.el 1.10 (erc-autoaway-idletimer): Doc,
+	ref. erc-autoaway-use-emacs-idle.
+	(autoaway): Doc, explain different idle definitions.  Reestablish
+	the idletimer only when erc-autoaway-use-emacs-idle is non-nil.
+	(erc-auto-set-away): Doc, ref erc-auto-discard-away.
+	(erc-auto-discard-away): Doc, ref erc-auto-set-away.
+	(erc-autoaway-use-emacs-idle): Doc, ref erc-autoaway-mode, and
+	added a note that this feature is currently broken.
+	(erc-autoaway-reestablish-idletimer): Doc.
+	(erc-autoaway-possibly-set-away): Split test such that
+	erc-time-diff is only computed when necessary, add a comment why
+	erc-process-alive is not necessary.
+	(erc-autoaway-set-away): Test for erc-process-alive.
+
+2002-12-29  Alex Schroeder  <alex@gnu.org>
+
+	* erc-autoaway.el 1.9:
+	Changed the order of defcustoms to avoid errors in the :set property
+	of erc-autoaway-idle-seconds.
+
+2002-12-29  Damien Elmes  <erc@repose.cx>
+
+	* erc-track.el 1.42:
+	* (erc-track-get-active-buffer): remove superflous (+ arg 0)
+
+2002-12-29  Alex Schroeder  <alex@gnu.org>
+
+	* erc-autoaway.el 1.8 (erc-autoaway): Moved the defgroup up to the
+	top, before the define-erc-module call.
+	(autoaway): Extended doc.
+	(erc-autoaway-idle-seconds): Use a :set property to handle
+	erc-autoaway-use-emacs-idle.
+	(erc-auto-set-away): Set default to t.  Added doc strings where
+	necessary, reformatted doc strings such that the first line can
+	stand on its own.  This is important for the output of M-x
+	apropos.
+
+2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-auto.in 1.3:
+	added (provide 'erc-auto), which is required for (require 'erc-auto) :)
+
+	* erc.el 1.396 (erc-display-prompt):
+	Set the face property of the prompt to
+	everything but the last character.
+
+	* erc.el 1.395 (erc-send-current-line):
+	Check wether point is in the input line. If
+	not, just beep and do nothing.
+
+2002-12-28  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.394 (erc-bol):
+	Fixed bug when there is only a prompt, and no property
+	change.
+
+	* erc.el 1.393 (erc-display-prompt): Rewrote using a save-excursion
+	and erc-propertize.  No longer use a field for the prompt, but a
+	plain text property called erc-prompt.
+	(erc-bol): Use the erc-prompt text property instead of a field.
+	Return point instead of t.
+	(erc-parse-current-line): No need to call point here, then, since
+	erc-bol now returns point.
+
+	* Makefile 1.11:
+	make ChangeLog .PHONY, thus forcing it always to be rebuilt.
+
+2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.392 (erc-log-irc-protocol):
+	Removed check wether get-buffer-create
+	    returned nil. "The value is never nil", says the docstring.
+
+	* erc.el 1.391: Day Of The Small Changes
+
+	(erc-display-prompt): Make the prompt 'front-sticky, which prevents it
+	    from being modified. It *should* also make end-of-line move to the
+	    end of the field (i.e. the end of the prompt) when point is at the
+	    beginning of the prompt, but it doesn't. Dunno why. :(
+
+2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
+
+	* Makefile 1.10:
+	Added "-f" to "rm" command in rule for target "realclean".
+
+	* erc.el 1.390:
+	New function: erc-log-irc-protocol.  Consolidates nearly duplicate code
+	from functions erc-send-command and erc-process-filter into one function.
+
+	* erc.el 1.389 (erc-toggle-debug-irc-protocol):
+	Removed unneeded argument PREFIX and code
+	which referenced it at end of function.
+	(erc-send-command): Now we only append a newline to the logged copy
+	of output protocol text if it doesn't have one.
+
+2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.388 (erc-toggle-debug-irc-protocol):
+	Display buffer if it's not shown
+	    already, and use view-mode.
+	(erc-toggle-debug-irc-protocol), (erc-send-command),
+	    (erc-process-filter): inhibit-only t to insert into the
+	    *erc-protocol* buffer (view-mode)
+
+2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.387 (erc-mode-map):
+	Removed keybinding for erc-toggle-debug-irc-protocol.
+	(erc-toggle-debug-irc-protocol): Now used erc-make-notice to propertize the
+	face of the enabled/disabled messages in the *erc-protocol* buffer.
+	(erc-send-command): Now outgoing IRC protocol traffic is logged too.
+
+	* erc.el 1.386:
+	Added user-customizable variable erc-debug-irc-protocol.
+	Added function erc-toggle-debug-irc-protocol.
+	(erc-process-filter): Now supports IRC protocol logging.  If variable
+	erc-debug-irc-protocol is non-nil, all IRC protocol traffic is appended
+	to buffer *erc-protocol*, which is created if necessary.
+
+2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.385 (erc-display-prompt):
+	Don't make the prompt intangible; that didn't
+	    make things that much better for the user, but confused ispell,
+	    which checked the prompt when it should check the first word
+
+2002-12-27  Alex Schroeder  <alex@gnu.org>
+
+	* AUTHORS 1.4: fixed resolve's email add
+
+	* AUTHORS 1.3: added damien
+
+	* erc.el 1.384 (erc-truncate-buffer-on-save):
+	Removed documentation that
+	described behaviour now changed.  It used to say "When nil, no
+	buffer is ever truncated."  This is no longer true; even when
+	buffers are NOT truncated on save, they can be truncated, eg. by
+	adding erc-truncate-buffer to the hook.
+	(erc-logging-enabled): New function.
+	(erc-current-logfile): New function.
+	(erc): Use erc-logging-enabled and erc-current-logfile.
+	(erc-truncate-buffer-to-size): Rewrote it, and made sure to use a
+	(save-restriction (widen) ...) such that the truncation actually
+	runs in the whole buffer, not in the last message only (as
+	erc-insert-post-hook will do!).  This should fix rw's
+	out-of-bounds error.
+	(erc-generate-log-file-name-short): Made all but the BUFFER
+	argument optional.  Doc: Mention
+	erc-generate-log-file-name-function.
+	(erc-generate-log-file-name-long): Doc: Mention
+	erc-generate-log-file-name-function.
+	(erc-save-buffer-in-logs): Use erc-logging-enabled and
+	erc-current-logfile.  Doc: Mention erc-logging-enabbled.
+
+	(erc-encode-string-for-target): Only do the real work when
+	featurep mule; else just return the string unchanged.
+
+2002-12-27  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.383:
+	erc-encoding-default: check for (coding-system-p) for older emacs versions
+
+	* erc.el 1.382 (erc-connect): missing ()s added. "don't commit at 2am"
+
+	* erc.el 1.381 (erc-connect):
+	check if (set-process-coding-system) is available before use
+
+2002-12-27  Alex Schroeder  <alex@gnu.org>
+
+	* AUTHORS 1.2: added franl
+
+2002-12-26  Alex Schroeder  <alex@gnu.org>
+
+	* erc-pcomplete.el 1.14 (pcomplete-parse-erc-arguments):
+	Reworked, and fixed a bug that had
+	caused completions to corrupt preceding text under some circumstances.
+
+	* erc.el 1.380 (erc-encoding-default): New.
+	(erc-encode-string-for-target): Use it instead of a hard-coded ctext.
+	(erc-encoding-coding-alist): Doc.
+
+2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.379:
+	Removed fix for bug 658552 recently checked-in, because it doesn't work.
+
+	* erc.el 1.378 (erc-kill-buffer-function):
+	Removed check that connection is up
+	before running erc-kill-server-hook hooks.  Those hooks should use
+	erc-process-alive to avoid interacting with the process.
+
+	* erc.el 1.377:
+	Fixed erc-send-current-line so it no longer assigns the free variable "s", and
+	it doesn't move point to end-of-buffer in non-ERC buffers.  Fixed
+	erc-kill-buffer-function so it doesn't run the erc-kill-server-hook hooks if the
+	server connection is closed.  Fixed bug 658552, which is described in detail at
+	http://sourceforge.net/tracker/index.php?func=detail&aid=658552&group_id=30118&atid=398125
+
+2002-12-26  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.376 (erc-cmd-SMV): Bug, now call erc-version-modules.
+
+	* erc-pcomplete.el 1.13 (erc-pcomplete-version): New.
+
+2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-pcomplete.el 1.12:
+	Fix for bug where you could not complete a nick when there was text following
+	the nick.
+
+2002-12-25  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.375 (erc-already-logged-in): Use erc-process-alive.
+	(erc-prepare-mode-line-format): Use erc-process-alive.
+	(erc-process-alive): Check erc-process for boundp and processp.
+
+	* erc.el 1.374 (erc-kill-buffer-function):
+	Do not check wether the process is
+	alive before running the hook, because there might be functions on
+	the hook that need to run even when the process is dead.  And
+	function that wants to check this, should use (erc-process-alive).
+	(erc-process-alive): New function.
+	(erc-kill-server): Use it.
+	(erc-kill-channel): Use it.
+
+	* erc.el 1.373 (erc-kill-buffer-function):
+	Reverted ignore-error change.
+	ignore-error is dangerous because we might miss bugs in functions
+	on erc-kill-server-hook.
+
+	* erc.el 1.372 (erc-kill-buffer-function): Use memq instead of member
+	when checking process-status.  Added doc string with references to
+	the other hooks.
+	(erc-kill-server): Only send the command when the erc-process is
+	still alive.  This prevents the error: "Process
+	erc-irc.openprojects.net-6667 not running" when killing the buffer
+	after having used /QUIT.
+
+2002-12-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.371 (erc-server-ERROR):
+	Show the error reason, not only the originating host.
+
+	* erc.el 1.370 (erc-kill-buffer-function):
+	(ignore-errors ...) in 'erc-kill-server-hook.
+	    When the process for this server does not exist anymore, the hook
+	    will cause an error, effectively preventing the buffer from being
+	    killed.
+
+2002-12-24  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-notify.el 1.9:
+	Fixed erc-notify-timer so that it passes the correct nick to
+	the functions on erc-notify-signoff-hook.
+
+2002-12-24  Alex Schroeder  <alex@gnu.org>
+
+	* erc-track.el 1.41: Doc
+
+	* erc-track.el 1.40 (erc-make-mode-line-buffer-name): Removed a
+	superfluous if construct around erc-track-showcount-string.
+	(erc-track-modified-channels): Use 1+.
+	Plus some doc and comment changes.
+
+2002-12-23  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.369: Fix (erc-version) string
+
+2002-12-23  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.368:
+	Removed unnecessary assignment to free-variable "p" in erc-downcase.
+
+	* erc.el 1.367:
+	Now /PART reason strings are generated the same way /QUIT reason strings
+	are generated (see variable erc-part-reason).  Also, when a server buffer
+	is killed, a QUIT command is automatically sent to the server.
+
+	* erc.el 1.366:
+	Changed erc-string-no-properties so that it is more efficient.  Now it uses
+	set-text-properties instead of creating and deleting a temporary buffer.
+
+2002-12-21  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.365:
+	erc-kill-input: added a check to prevent a (ding) and an error when
+	    there's nothing to kill (thanks to Francis Litterio, franl on IRC)
+
+2002-12-21  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.364:
+	AWAY notice duplication prevention. erc-prevent-duplicates now set to ("301") by default, and timeout to 60
+
+	* erc.el 1.363: erc-prevent-duplicates: New variable, see docstring
+
+2002-12-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-track.el 1.39:
+	erc-track-modified-channels: Use cddr of cell for old-face. cdr of
+	    cell is '(1 . face-name), i have no idea why :)
+
+2002-12-20  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.362 (erc-current-nick):
+	check the server buffer is active before using
+
+	Also tabified and cleaned up some trailing whitespace
+
+2002-12-15  Mario Lang  <mlang@delysid.org>
+
+	* erc-track.el 1.38: erc-track-count patch by az
+
+2002-12-14  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.361:
+	last-peers: initialise to a cons. thanks to Francis Litterio
+	    <franl@world.std.com> for the patch
+
+	* erc.el 1.360:
+	erc-kill-channel-hook, erc-kill-buffer-hook, (erc-kill-channel):
+	    both hooks now call erc-save-buffer-in-logs, so that query buffers are
+	    saved properly now, and not just channel buffers.
+
+2002-12-13  Alex Schroeder  <alex@gnu.org>
+
+	* erc-track.el 1.37 (erc-unique-channel-names): Fix another #hurd
+	vs. #hurd-bunny bug.
+
+	* erc-match.el 1.17 (match): No longer modify erc-send-modify-hook,
+	since it does not work without a parsed text property, anyway.
+	(erc-keywords): Allow cons cells.
+	(erc-remove-entry-from-list): Deal with cons cells.
+	(erc-keyword-p): Ditto.
+	(erc-match-message): Ditto.
+
+	Moved nil to the beginning of the list, removed :tags for the
+	-type variables:
+	(erc-current-nick-highlight-type): Ditto.
+	(erc-pal-highlight-type): Ditto.
+	(erc-fool-highlight-type): Ditto.
+	(erc-keyword-highlight-type): Ditto.
+	(erc-dangerous-host-highlight-type): Ditto.
+	(erc-log-matches-flag): Moved nil to the beginning.
+
+2002-12-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.359:
+	erc-beg-of-input-line: Don't do (goto-char (beginning-of-line)), since
+	    beginning-of-line always moves point and returns nil. Thanks to
+	    franl on IRC for noting this.
+
+	* erc-stamp.el 1.20:
+	erc-insert-timestamp-left, erc-insert-timestamp-right: Made the
+	    timestamp a 'field named 'erc-timestamp. Now end-of-line and
+	    beginning-of-line will move over the timestamp.
+
+2002-12-10  Damien Elmes  <erc@repose.cx>
+
+	* erc-button.el 1.34 (erc-button-add-button):
+	make the created button rear-nonsticky, to allow
+	cutting and pasting of buttons without worrying about the button properties
+	being inherited by the text typed afterwards.
+
+	* erc.el 1.358: save logfile when killing buffer
+
+2002-12-09  Alex Schroeder  <alex@gnu.org>
+
+	* erc-track.el 1.36 (erc-modified-channels-display): Reworked.
+	(erc-track-face-more-important-p): Removed.
+	(erc-track-find-face): Return only one face.
+	(erc-track-modified-channels): Reworked.
+	(erc-modified-channels-string): Changed from (BUFFER FACE...) to
+	(BUFFER . FACE)
+
+	* erc-stamp.el 1.19 (erc-insert-timestamp-right): Do not assume
+	erc-fill-column is available.
+
+2002-12-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.357:
+	erc-ech-notices-in-minibuffer-flag, erc-minibuffer-notice: Clarified
+	    the difference in the docstrings.
+
+2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.356: erc-noncommands-list: added erc-cmd-SM and erc-cmd-SMV
+
+2002-12-08  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.355 (erc-cmd-SM): New.
+	(erc-cmd-SMV): New.
+
+	* erc.el 1.354 (erc-modes): New.
+
+2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-compat.el 1.9:
+	field-end: use (not (fboundp 'field-end)) instead of (featurep 'xemacs)
+
+2002-12-08  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.353 (erc-version-modules): New.
+
+2002-12-08  Mario Lang  <mlang@delysid.org>
+
+	* debian/changelog 1.19, debian/control 1.7, debian/scripts/startup.erc 1.3:
+	debian release 3.0.cvs.20021208
+
+2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.352 (erc-split-command): Do the right thing with CTCPs.
+
+2002-12-08  Mario Lang  <mlang@delysid.org>
+
+	* erc-stamp.el 1.18: Be a bit more functional
+
+2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-compat.el 1.8:
+	XEmacs doesn't seem to have field-end, so we provide our own version here.
+
+2002-12-08  Mario Lang  <mlang@delysid.org>
+
+	* Makefile 1.9: Small fixes to debrelease target
+
+2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.351:
+	make-obsolete-variable: xemacs doesn't have the WHEN parameter, remove it.
+
+2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-imenu.el 1.5 (erc-create-imenu-index):
+	Use (forward-line 0) instead of
+	  (beginning-of-line) now, sine the latter ignores fields (used in the
+	  prompt).
+
+	* erc.el 1.350:
+	Rewrite of the prompt stuff to use a field named 'erc-prompt:
+
+	erc-prompt: Removed getter and setter functions. The properties were
+	  already set (and overwritten) in erc-display-prompt.
+	(erc-prompt): Add the trailing space here, not all over the code.
+	(erc-display-prompt): Cleaned up a bit. The text-properties now are
+	  valid on the whole prompt. Also, made the prompt 'intangible to
+	  avoid confused users.
+	(erc-bol): Now use the field 'erc-prompt for finding the prompt
+	(erc-parse-current-line): Cleaned up considerably. Uses (erc-bol) now.
+	(erc-load-irc-script-lines): Adjusted for the new (erc-prompt).
+	(erc-save-buffer-in-logs): Adjusted for the new (erc-prompt).
+
+	* erc.el 1.349:
+	erc-uncontrol-input-line: The comment said "Consider it deprecated",
+	so I removed it now.
+	erc-prompt-interactive-input: Marked obsolete as of 1.348
+
+	* erc.el 1.348:
+	erc-smiley, erc-unmorse: Put at the end to separate it from the
+	important parts of erc.el.
+
+2002-12-07  Alex Schroeder  <alex@gnu.org>
+
+	* erc-stamp.el 1.17 (erc-insert-timestamp-right): New algorithm.
+
+2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.347:
+	last-peers, erc-message: Explained what last-peers is used for.
+
+2002-12-07  Alex Schroeder  <alex@gnu.org>
+
+	* erc-page.el 1.3 (erc-cmd-PAGE): New function.
+	(erc-ctcp-query-PAGE): Use the catalog entry for the message, too.
+	(erc-ctcp-query-PAGE-hook): Added custom type.
+	(erc-page-function): Changed custom type from ... function-item to
+	... function.
+	As well as doc strings.
+
+2002-12-06  Alex Schroeder  <alex@gnu.org>
+
+	* erc-page.el 1.2: provide feature at the end
+
+2002-12-06  Brian P Templeton  <bpt@tunes.org>
+
+	* erc-nickserv.el 1.10:
+	Added austnet in erc-nickserv.el (thanks to Damien Elmes
+	<resolve@repose.cx>)
+
+2002-12-05  Mario Lang  <mlang@delysid.org>
+
+	* erc-complete.el 1.13: Add autoload cookie
+
+	* erc-speak.el 1.24: Small fix to make proper voice-changes
+
+2002-12-05  Alex Schroeder  <alex@gnu.org>
+
+	* erc-lang.el 1.1: New
+
+2002-12-03  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.346:
+	erc-mode-map: Put back C-c C-p (PART) and C-c C-q (QUIT)
+
+2002-12-02  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.345:
+	erc-insert-post-hook: Add :options erc-make-read-only, erc-save-buffer-in-logs
+	erc-send-post-hook: Add :options erc-make-read-only
+
+	* erc.el 1.344: erc-insert-hook: Removed ("this hook is obsolescent")
+	erc-insert-post-hook: Added :options '(erc-truncate-buffer)
+
+2002-12-02  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.343: Add missing requires
+
+2002-11-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.342 (erc-quit-reason-normal):
+	Remove v before %s so it's "Version ..." not
+	   "vVersion ..."
+
+2002-11-26  Alex Schroeder  <alex@gnu.org>
+
+	* erc-compat.el 1.7 (erc-encode-coding-string): Add second argument
+		coding-system, and for non-mule xemacsen, use a new defun instead
+		of identity.
+
+	* erc.el 1.341:  (define-erc-module): Use the appropriate group.
+	(erc-port): Changed custom type.
+	(erc-insert-hook): Custom group changed to erc-hooks.
+	(erc-after-connect): ditto
+	(erc-before-connect): ditto
+	(erc-disconnected-hook): ditto
+
+	* erc-button.el 1.33 (erc-button): New group, changed all custom groups
+	from erc to erc-button, but left all erc-faces as-is.
+
+	* erc-track.el 1.35 (erc-track): New group, changed all custom groups
+	from erc to erc-track.
+
+2002-11-26  Mario Lang  <mlang@delysid.org>
+
+	* erc-macs.el 1.1:
+	Macros for erc-victim handling.  Primary idea is to use setf and some fancy things to get nice syntax. have a look
+
+2002-11-26  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.340:
+	pings, erc-cmd-PING, erc-ctcp-reply-PING, catalog entry CTCP-PING:
+	Cleaned up. Removed buffer-local variable pings which stored a list of
+	all sent CTCP PING requests. Now send our full time with the CTCP PING
+	request and interpret the answer.
+
+2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.339: nick-stk: replaced by the local variable current-nick.
+
+2002-11-25  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.338 (erc-send-command): Use erc-encode-string-for-target.
+	(erc-encode-string-for-target): New.
+
+	* erc-compat.el 1.6 (erc-encode-coding-string): Add second argument
+	coding-system, and for non-mule xemacsen, use a new defun instead
+	of identity.
+
+	* erc-nickserv.el 1.9 (erc-nickserv-version): New.
+
+2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* Makefile 1.8:
+	UNCOMPILED: erc-chess.el depends on chess-network.el, which might not
+	be installed. Don't compile it.
+
+	* erc.el 1.337:
+	erc-mode-map: Added C-a as erc-bol (no reason why it shouldn't be),
+	and removed C-c C-p (part channel) and C-c C-q (quite server) as these
+	are a bit drastic in their consequences and easy to mistype.
+
+2002-11-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-track.el 1.34: erc-track-faces-priority-list: Extended list
+
+	* erc.el 1.336:
+	channel-members: Updated docstring: We have a VOICE predicate, too.
+
+	* erc-track.el 1.33 (erc-unique-substrings):
+	Don't shorten a single channel to "#", but
+	always give at least 2 chars (except when there are no two chars).
+
+2002-11-23  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-nickserv.el 1.8:
+	support for BrasNET. Thanks to rw on IRC for the settings.
+
+2002-11-23  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.335: (erc-default-recipients, erc-session-user-full-name)
+		(nick-stk, pings, erc-announced-server-name, erc-connected)
+		(channel-user-limit, last-peers, invitation, away, channel-list)
+		(last-sent-time, last-ping-time, last-ctcp-time, erc-lines-sent)
+		(erc-bytes-sent, quitting, bad-nick, erc-logged-in)
+		(erc-default-nicks): Defvars.
+
+	* erc-compat.el 1.5: Switched tests to iso-8859-1 instead of latin-1.
+
+	* erc-compat.el 1.4 (erc-compat-version): New.
+
+2002-11-22  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.334 (smiley): Smileys are a very small module, now.
+
+2002-11-22  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.333:
+	erc-event-to-hook, erc-event-to-hook-name: eval-and-compile these,
+	    since we need them in a macro. ERC now compiles again!
+
+	* erc-speak.el 1.23:
+	erc-minibuffer-privmsg: Removed setting this variable to nil, since it
+	    was removed from erc.el.
+
+	* erc.el 1.332 (erc-interactive-input-map): Added docstring.
+	(erc-wash-quit-reason): Extended docstring.
+	(erc-server-ERROR): Added docstring.
+	(erc-server-321): buffer-local variable channel-list probably
+	    shouldn't be renamed erc-channel-list - removed FIXME.
+
+	* erc.el 1.331: small cleanup.
+	("was not used anymore" here means "not used in erc/*.el nor in
+	fsbot", thanks to deego for checking that.)
+
+	erc-minibuffer-privmsg: Removed (was not used anymore)
+	(erc-reformat-command): Removed (was not used anymore)
+	(erc-strip-erc-parsed-property): Removed (was not used anymore)
+	(erc-process-ctcp-response): Removed (replaced by ctcp-query-XXX-hook)
+	(erc-send-paragraph): Removed ("Note that this function is obsolete,
+	    erc-send-current-line handles multiline input.")
+	(erc-input-hook): Removed ("This hook is obsolete. See
+	    `erc-send-pre-hook', `erc-send-modify-hook' and
+	    `erc-send-post-hook' instead.")
+	(erc-message-hook): Removed ("This hook is obsolete. See
+	    `erc-server-PRIVMSG-hook' and `erc-server-NOTICE-hook'.")
+	(erc-cmd-default-channel): Removed ("FIXME: no clue what this is
+	    supposed to do." - it was supposed to prepend the default channel
+	    to a command before sending it. E.g. typing "/FOO now!" would send
+	    the IRC command "FOO #mycurrentchannel now!")
+
+	* erc.el 1.330:
+	erc-ctcp-query-PING: Send the whole argument back, not just the first
+	number. This is required for many clients (e.g. irssi, BitchX, ...)
+	which send their ping times in two different numbers for microsecond
+	accuracy.
+
+2002-11-22  Alex Schroeder  <alex@gnu.org>
+
+	* erc-track.el 1.32 (erc-track-shorten-function): Allow nil.
+
+2002-11-21  Alex Schroeder  <alex@gnu.org>
+
+	* erc-track.el 1.31 (erc-unique-channel-names): Fixed bug that appeared
+	if one target name was a substring of another -- eg. #hurd and
+	#hurd-bunny.  Added appropriate test.
+
+2002-11-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-track.el 1.30:
+	erc-unique-channel-names: Don't take a substring of channel that could
+	be longer than the channel, but at most (min (length candidate)
+	(length channel). (thanks to deego for noticing this)
+
+2002-11-19  Mario Lang  <mlang@delysid.org>
+
+	* erc-notify.el 1.8: * (require pcomplete): Only when compiling.
+
+2002-11-19  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-track.el 1.29:
+	erc-track-faces-priority-list: New variable, defines what faces will
+	be shown in the modeline. If set to nil, the old behavior ("all")
+	remains.
+	erc-track-face-more-important-p: new function
+	erc-track-find-face: new function
+
+2002-11-19  Alex Schroeder  <alex@gnu.org>
+
+	* erc-fill.el 1.20 (erc-stamp): Require it.
+
+	* erc-match.el 1.16 (away): devar for the compiler.
+
+	* erc-stamp.el 1.16 (stamp): Moved.
+
+	* erc.el 1.329 (erc-version-string): New version.
+
+	* erc-autoaway.el 1.7 (erc-autoaway-idletimer): Moved to the front of
+	the file.
+
+	* erc-auto.in 1.2: (generated-autoload-file, command-line-args-left):
+	Added defvar without value to silence byte compiler.
+
+	* Makefile 1.7 (realclean): renamed fullclean to realclean.
+	(UNCOMPILED): New list, for erc-bbdb.el, erc-ibuffer.el,
+	erc-speak.el.
+	(SOURCE): Do not compile UNCOMPILED.
+	(release): New target.
+	(ChangeLog): New target.
+	(todo): New target.
+
+	* erc-complete.el 1.12 (erc-match): Require it.
+	(hippie-exp): Require it.
+
+	* erc-ezbounce.el 1.3 (erc): Require it.
+
+	* erc-imenu.el 1.4 (imenu): Require it.
+
+	* erc-nickserv.el 1.7 (erc-networks): Moved up.
+
+	* erc-notify.el 1.7 (pcomplete): Require it.
+
+	* erc-replace.el 1.5 (erc): Require it.
+
+	* erc-sound.el 1.3 (sound): Typo -- define-key in erc-mode-map.
+
+	* erc-speedbar.el 1.10 (dframe): Require it.
+	(speedbar): Require it.
+
+	* erc-track.el 1.28 (erc-default-recipients): devar for the compiler.
+
+	* README 1.1: New file.
+
+2002-11-18  Mario Lang  <mlang@delysid.org>
+
+	* AUTHORS 1.1: File needed for mkChangeLog
+
+	* mkChangeLog 1.1: Original code by mhp
+
+2002-11-18  Alex Schroeder  <alex@gnu.org>
+
+	* erc-button.el 1.32 (erc-button-list): Renamed to erc-list and moved
+	to erc.el.
+
+	* erc.el 1.328 (erc-list): New.
+
+	* erc-track.el 1.27 (erc-make-mode-line-buffer-name): Simplified.
+	(erc-modified-channels-display): Simplified.  Now works with all
+	faces, and fixes the bug that when two faces where used (bold
+	erc-current-nick-face), then no faces was added.
+
+	* erc-track.el 1.26: Lots of new tests.  Moved some defuns around in
+	the file.
+	(erc-all-channel-names): Renamed.
+	(erc-all-buffer-names): New name, now include query buffers as
+	well.
+	(erc-modified-channels-update-inside): New variable.
+	(erc-modified-channels-update): Use it to prevent running display
+	if already inside it.  This prevented debugging of
+	`erc-modified-channels-display'.
+	(erc-make-mode-line-buffer-name): Moved.
+	(erc-track-shorten-names): Don't test using erc-channel-p as that
+	failed with query buffers.
+	(erc-unique-substrings): Move setq i + 1 to the end of the while
+	loop, so that start is used as a default value instead of start +
+	1.
+
+2002-11-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-track.el 1.25:
+	erc-unique-substrings: define this before using it in assert
+
+	* erc.el 1.327:
+	with-erc-channel-buffer: Define *before* using this macro. This
+	hopefully fixes a bug noted on IRC.
+
+	* erc-notify.el 1.6:
+	erc-notify-signon-hook, erc-notify-signoff-hook: New hooks. They're
+	even run when their name suggests!
+
+2002-11-18  Alex Schroeder  <alex@gnu.org>
+
+	* erc-list.el 1.7: Typo.
+
+	* erc-speedbar.el 1.9: Whitespace only.
+
+	* erc.el 1.326 (define-erc-module): Avoid defining an alias if name and
+	alias are the same.
+
+	* erc-ibuffer.el 1.17: URL
+
+	* erc-imenu.el 1.3 (erc-imenu-version): New constant.
+
+	* erc-ibuffer.el 1.16 (erc-ibuffer-version): New constant.
+
+	* erc-ibuffer.el 1.15: File header, comments.
+
+	* erc-fill.el 1.19 (erc-fill-version): New constant.
+
+	* erc-ezbounce.el 1.2 (erc-ezb-version): New constant.
+
+	* erc-complete.el 1.11 (erc-complete-version): New constant.
+
+	* erc-chess.el 1.21 (erc-chess-version): New constant.
+
+	* erc-chess.el 1.20: Whitespace only.
+
+	* erc-bbdb.el 1.20 (erc-bbdb-version): Typo.
+
+	* erc-bbdb.el 1.19 (erc-bbdb-version): New constant.
+	Lots of whitespace changes.  Changes to the header.
+
+	* erc-track.el 1.24 (erc-track-shorten-aggressively): Doc.
+	(erc-all-channel-names): New function.
+	(erc-unique-channel-names): New function.
+	(unique-substrings): Renamed.
+	(erc-unique-substrings): New name
+	(unique-substrings-1): Renamed.
+	(erc-unique-substring-1): New name.  Added lots of tests.
+	(erc-track-shorten-names): Call erc-unique-channel-names instead
+
+	* erc-match.el 1.15 (match): Rewrote a as module.
+
+2002-11-17  Alex Schroeder  <alex@gnu.org>
+
+	* erc-netsplit.el 1.6 (erc-netsplit-version): New.
+	(netsplit): Defined as a module, replacing erc-netsplit-initialize
+	and erc-netsplit-destroy.
+
+2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-track.el 1.23 (erc-track-switch-buffer):
+	define-erc-module defines erc-track-mode,
+	not erc-track-modified-channels-mode.
+
+	* erc.el 1.325:
+	Variables erc-play-sound, erc-sound-path, erc-default-sound,
+	erc-play-command, erc-ctcp-query-SOUND-hook and functions
+	erc-cmd-SOUND, erc-ctcp-query-SOUND, erc-play-sound, erc-toggle-sound
+	moved to erc-sound.el
+
+	Variables erc-page-function, erc-ctcp-query-PAGE-hook and function
+	erc-ctcp-query-PAGE moved to erc-page.el
+
+	* erc-page.el 1.1:
+	erc-page.el: New file. CTCP PAGE support for ERC, extracted from erc.el.
+
+	* erc-sound.el 1.2:
+	defin-erc-module: Typo. Autoload should do erc-sound-mode and "erc-sound".
+
+	* erc-sound.el 1.1:
+	erc-sound.el: New file. Contains all the CTCP SOUND stuff from erc.el.
+
+	* erc.el 1.324 (erc-process-ctcp-request):
+	Removed (old-style CTCP handling)
+	(erc-join-autogreet): Removed (was broken anyways)
+
+2002-11-17  Alex Schroeder  <alex@gnu.org>
+
+	* erc-button.el 1.31 (erc-button-version): New constant.
+
+	* erc-button.el 1.30 (button): rewrote as a module.
+
+2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.323: New functions:
+	(erc-event-to-hook), (erc-event-to-hook-name): Convert an event to the
+	corresponding hook. The latter only returns the name, while the former
+	interns the hook symbol and returns it.
+
+2002-11-17  Alex Schroeder  <alex@gnu.org>
+
+	* erc-replace.el 1.4:
+	Practically total rewrite.  All smiley stuff deleted.
+
+	* erc-track.el 1.22 (track): typo.
+
+	* erc.el 1.322 (define-erc-module): Doc change.
+
+2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-autoaway.el 1.6: Changed to use define-erc-module.
+
+	* erc.el 1.321 (define-erc-module):
+	Make the enable/disable functions interactive.
+
+	* erc.el 1.320 (erc):
+	Don't use switch-to-buffer when we're in the minibuffer,
+	because that does not work. Use display-buffer instead. This leaves
+	two problems: The point does not advance to the end of the buffer for
+	whatever reason, and after leaving the minibuffer, the new window gets
+	buried.
+
+2002-11-17  Alex Schroeder  <alex@gnu.org>
+
+	* erc-stamp.el 1.15 (stamp): Doc change.
+
+	* erc-stamp.el 1.14 (erc-stamp-version): New constant.
+	(stamp): downcase alias name of the mode.
+
+	* erc.el 1.319 (define-erc-module): Added defalias option, renamed
+	parameters again.
+
+	* erc-track.el 1.21: erc-track-modified-channels-mode is now only an
+	alias to erc-track-mode.  Only erc-track-mode is autoloaded.
+	(track): Rewrote call to define-erc-module.
+
+2002-11-16  Mario Lang  <mlang@delysid.org>
+
+	* debian/README.Debian 1.5: * Spelling fix
+
+	* erc-fill.el 1.18: * Fix autoload definition for erc-fill-mode
+
+	* debian/control 1.6, debian/maint/postinst 1.4, debian/maint/prerm 1.4:
+	* Remove /usr/doc -> /usr/share/doc link handling
+
+	* debian/changelog 1.18: * Sync with reality
+
+	* debian/scripts/startup.erc 1.2:
+	* Add /usr/share/emacs/site-lisp/erc/ to load-path
+	* (load "erc-auto")
+
+	* debian/README.Debian 1.4:
+	* Info about the changes since last release updated
+
+	* erc-pcomplete.el 1.11: * Fix emacs/xemacs compatibility
+
+	* debian/scripts/install 1.10: * Dont compile erc-compat, fix ELCDIR
+
+	* debian/control 1.5: * Change maintainer field
+
+	* erc.el 1.318:
+	* (defin-erc-module): Renamed argument mode-name to mname because silly byte-compiler thought we were talking about `mode-name'.
+
+	* Makefile 1.6: * Added debrelease target
+
+	* erc-bbdb.el 1.18, erc-pcomplete.el 1.10, erc-stamp.el 1.13, erc.el 1.317:
+	* (define-erc-module): Added mode-name argument.
+	* Converted erc-bbdb, erc-pcomplete and erc-stamp to new macro.
+	* autoload fixes
+
+	* erc-bbdb.el 1.17:
+	* Create a global-minor-mode (i.e., make it a proper erc-module)
+
+	* erc.el 1.316: * (define-erc-modle): New defmacro
+
+2002-11-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-autoaway.el 1.5 (erc-autoaway-idle-seconds):
+	t in docstrings should be non-nil
+
+2002-11-16  Alex Schroeder  <alex@gnu.org>
+
+	* erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, erc-match.el 1.14, 
+	  erc-menu.el 1.9, erc-ring.el 1.5, erc-track.el 1.20:
+	Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
+
+	* erc-stamp.el 1.12 (erc-insert-away-timestamp-function):
+	New custom type.
+	(erc-insert-timestamp-function): New custom type.
+
+	* erc-fill.el 1.16 (erc-fill-function): Doc, new custom type.
+	(erc-fill-static): Doc.
+	(erc-fill-enable): New function.
+	(erc-fill-disable): New function.
+	(erc-fill-mode): New function.
+
+	* erc-match.el 1.13 (erc-match-enable): add-hook for both
+	erc-insert-modify-hook and erc-send-modify-hook.
+	(erc-match-disable): remove-hook for both
+	erc-insert-modify-hook and erc-send-modify-hook.
+
+2002-11-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-autoaway.el 1.3:
+	- Added a way to use auto-away using emacs idle timers
+	- Renamed erc-set-autoaway to erc-autoaway-possibly-set-away for consistency
+
+2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.315: erc-mode-map: Removed the C-c C-g binding for erc-grab
+
+	* erc.el 1.314:
+	(erc-server-341) Another instance of the channel/chnl problem i didn't
+	see last time
+
+2002-11-14  Alex Schroeder  <alex@gnu.org>
+
+	* erc-compat.el 1.3 (erc-decode-coding-string): typo
+
+2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.313 (erc-server-341):
+	variable name should be chnl not channel, as it is
+	used this way in this function, and the other erc-server-[0-9]* use
+	chnl too.
+
+	* erc-autoaway.el 1.2:
+	Set back on all servers, not just the current one, since we're set
+	away on all servers as well.
+
+	* HISTORY 1.2: Fixed typo (ngu.org => gnu.org)
+
+	* erc-autoaway.el 1.1, erc-fill.el 1.15, erc.el 1.312: erc-autoaway.el:
+	* new file
+
+	erc.el:
+	* Removed auto-discard-away facility (now included in erc-autoaway.el)
+	* (erc-away-p): new function
+
+	erc-fill.el:
+	* (erc-fill-variable): Check wether erc-timestamp-format is bound before
+	                       using it (erc-fill.el does not require erc-stamp).
+
+2002-11-10  Alex Schroeder  <alex@gnu.org>
+
+	* TODO 1.4:
+	TODO: moved it to http://www.emacswiki.org/cgi-bin/wiki.pl?ErcTODO
+
+	* erc.el 1.311 (with-erc-channel-buffer): Rudimentary doc string.
+
+2002-11-09  Alex Schroeder  <alex@gnu.org>
+
+	* erc-button.el 1.28 (erc-nick-popup-alist): Made a defcustom.
+
+	* erc-button.el 1.27 (erc-button-disable): New function.
+	(erc-button-enable): New function, replaces the add-hook calls at top-level.
+	(erc-button-mode): New minor mode.
+
+2002-11-08  Alex Schroeder  <alex@gnu.org>
+
+	* erc-button.el 1.26 (erc-button-entry): Use erc-button-syntax-table.
+
+	* erc.el 1.310, erc-stamp.el 1.10: Doc changes.
+
+	* erc-match.el 1.12 (erc-match-mode): New function, replacing the
+	add-hook.
+	(erc-match-enable): New function.
+	(erc-match-disable): New function.
+	(erc-current-nick-highlight-type): Changed from 'nickname to 'nick
+	to make it consistent with the others.
+	(erc-match-message): Ditto.
+
+	* erc-button.el 1.25 (erc-button-syntax-table): New variable.
+	(erc-button-add-buttons): Use it.
+
+2002-11-06  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.309:
+	1) (bug) ERC pops up a new buffer and window when being messaged
+	   from an ignored person. fixed
+	2) (misfeature) ERC notices the user in the minibuffer when it
+	   ignores something - this can get very annoying, since the
+	   minibuffer is also visible when not looking at ERC buffers.
+	   Added a customizeable variable for this, the default is nil.
+	3) (wishlist) There is no IGNORE or UNIGNORE command.
+	   Added.
+	4) (wishlist) Some IRC clients, notably irssi, allow the user to
+	   ignore "replies" to ignored people. A reply is defined as a
+	   line starting with "nick:", where nick is the nick of an
+	   ignored person. Added that functionaly.
+	Done by Jorgen Schaefer <forcer@forcix.cx>
+
+2002-11-02  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.308 (erc-connect): set-process-coding-system to raw-text.
+
+2002-11-01  Brian P Templeton  <bpt@tunes.org>
+
+	* erc-pcomplete.el 1.9, erc-stamp.el 1.9, erc-track.el 1.19:
+	Fixed more autoloads
+
+	* erc-compat.el 1.2: Added autoload for erc-define-minor-mode
+
+2002-11-01  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.307: * (erc-send-command): will break long messages into
+	a bunch of smaller ones, to prevent them from being truncated by the server.
+	The patch also axes some trailing whitespace. :-) <resolve>
+
+2002-10-31  Alex Schroeder  <alex@gnu.org>
+
+	* erc-pcomplete.el 1.8 (erc-compat): Require.
+	(erc-completion-mode): Use erc-define-minor-mode.
+
+	* erc-track.el 1.18 (erc-compat): Require.
+	(erc-track-modified-channels-mode): Use erc-define-minor-mode.
+
+	* erc-stamp.el 1.8 (erc-compat): Require.
+	(erc-timestamp-mode): Use erc-define-minor-mode.
+
+	* erc-compat.el 1.1: New file with the code for erc-define-minor-mode,
+	erc-encode-coding-string and erc-decode-coding-string.  Essentially
+	all the stuff that cannot be tested for using a simple boundp or
+	fboundp -- eg. because the number of arguments are wrong.
+
+	* erc.el 1.306 (erc-compat): Require.
+	(erc-process-coding-system): Moved to erc-compat.el.
+	(erc-connect): Do not set-process-coding-system.
+	(encode-coding-string): Compatibility code moved to erc-compat.el.
+	(decode-coding-string): Compatibility code moved to erc-compat.el.
+	(erc-encode-coding-string): Compatibility code moved to erc-compat.el.
+	(erc-decode-coding-string): Compatibility code moved to erc-compat.el.
+
+2002-10-27  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.305 (erc-display-line-1): Removed call to
+	erc-decode-coding-string.
+	(erc-parse-line-from-server): Added call to
+	erc-decode-coding-string before anything gets parsed at all.
+	(erc-decode-coding-string): Use undecided coding system.
+
+2002-10-24  Sandra Jean Chua  <sacha@free.net.ph>
+
+	* erc-button.el 1.24, erc.el 1.304:
+	Added LASTLOG command and action for nick-button
+
+2002-10-22  Sandra Jean Chua  <sacha@free.net.ph>
+
+	* erc-pcomplete.el 1.7:
+	Fixed nopruning bug, added /MODE channel (mode) [nicks...] completion - mode not completed yet.
+
+2002-10-16  Sandra Jean Chua  <sacha@free.net.ph>
+
+	* erc-pcomplete.el 1.6:
+	Fixed 'Hi delysid:' bug in SAY completion after realizing that pcomplete on commands already took care of completing the initial nick:
+
+2002-10-15  Mario Lang  <mlang@delysid.org>
+
+	* erc-pcomplete.el 1.5: update from sachac
+
+2002-10-13  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.303 (erc-emacs-time-to-erc-time): Catch when tm is nil.
+
+2002-10-11  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.302:
+	* Fixed `erc-scroll-to-bottom' to scroll to the bottom even when
+	  in the middle of a line. Might also fix the Magic ECHAN Bug[tm]. (-:
+
+2002-10-11  Mario Lang  <mlang@delysid.org>
+
+	* erc-nickserv.el 1.6: Fixed erc-networks for the opn->freenode change
+
+2002-10-08  Mario Lang  <mlang@delysid.org>
+
+	* erc-pcomplete.el 1.4:
+	Make erc-completion-mode work interactively with already joined channel buffers
+
+	* erc-chess.el 1.19: Add autoload cookies
+
+	* erc-notify.el 1.5: Add pcomplete support
+
+	* erc.el 1.301:
+	Remove autoload statments, remove autoload cookie from erc-mode and erc-info-mode
+
+	* erc-fill.el 1.14, erc-match.el 1.11: add/remove autoload cookies
+
+2002-10-06  Alex Schroeder  <alex@gnu.org>
+
+	* erc-pcomplete.el 1.3 (erc-completion-mode): New global minor mode
+	with autoload cookie.
+	(erc-pcomplete-enable): Renamed erc-pcomplete-initialize.
+	(erc-pcomplete-disable): New function.
+
+	* erc-complete.el 1.10: Doc changes.
+
+	* erc-stamp.el 1.7 (erc-stamp-enable): Renamed erc-stamp-initialize.
+	(erc-stamp-disable): Renamed erc-stamp-destroy.
+	(erc-timestamp-mode): Use new names.
+
+	* erc.el 1.300: Removed autload for erc-complete and
+	erc-track-modified-channels-mode -- the autoload cookie should do
+	that instead.
+	(erc-input-message): Doc string, removed binding for erc-complete.
+	(erc-mode-map): Removed binding for erc-complete.
+
+2002-10-03  Mario Lang  <mlang@delysid.org>
+
+	* erc-notify.el 1.4:
+	New functions erc-notify-JOIN and erc-notify-QUIT to catch some common cases (warning, untested)
+
+2002-10-01  Alex Schroeder  <alex@gnu.org>
+
+	* erc-stamp.el 1.6 (erc-timestamp-mode): New function.  Removed call
+	to erc-stamp-initialize at the end.
+
+2002-09-25  Brian P Templeton  <bpt@tunes.org>
+
+	* erc.el 1.299:
+	Added customizable `erc-process-coding-system' variable.
+
+2002-09-22  Brian P Templeton  <bpt@tunes.org>
+
+	* erc-fill.el 1.13:
+	`erc-fill-variable' now does the right thing when `erc-hide-timestamps' is non-nil
+
+2002-09-21  Mario Lang  <mlang@delysid.org>
+
+	* erc-fill.el 1.12:
+	patch from Peter Solodov <peter@alcor.concordia.ca>  (note, its slightly broken still
+
+2002-09-05  Mario Lang  <mlang@delysid.org>
+
+	* erc-pcomplete.el 1.2: Added LEAVE as alias for PART
+
+2002-09-04  Mario Lang  <mlang@delysid.org>
+
+	* erc-pcomplete.el 1.1:
+	By sachac (good work!) keep up doing such things
+
+2002-08-31  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.298:
+	A fix for Bug#133267: now you can put (erc-save-buffer-in-logs) on erc-insert-post-hook to save *every* incoming message.
+
+2002-08-30  Brian P Templeton  <bpt@tunes.org>
+
+	* erc.el 1.297:
+	Changed default value of erc-common-server-suffixes because of the OPN
+	name change
+
+2002-08-28  Mario Lang  <mlang@delysid.org>
+
+	* erc-stamp.el 1.5: Try to reactivate isearch in xemacs
+
+	* erc-stamp.el 1.4:
+	fixes issues related to comparative emacsology and a silly bug
+
+2002-08-27  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.296:
+	New hook erc-send-completed-hook (for robot stuff), changed alexanders email address to reflect reality, little fix to erc-auto-query to get a bit of a speedup
+
+2002-08-22  Mario Lang  <mlang@delysid.org>
+
+	* erc-button.el 1.23:
+	Fixed case-fold-search (thanks sachac), now lambda works in erc-button-alist, added wardwiki+google+symvar+rfc+itime regexps from the wiki
+
+2002-08-19  Mario Lang  <mlang@delysid.org>
+
+	* erc-button.el 1.22:
+	erc-nick-popup-alist: New variable to make erc-nick-popup configurable
+
+2002-08-16  Alex Schroeder  <alex@gnu.org>
+
+	* erc-button.el 1.21 (erc-recompute-nick-regexp): Fixed regexp.
+
+	* erc-button.el 1.20 (erc-button-buttonize-nicks): Changed custom type
+	to integer.
+	(erc-button-add-buttons): Moved button removal code to new
+	function.
+	(erc-button-remove-old-buttons): New function.
+	(erc-button-add-button): Removed use of overlays and used
+	erc-button-add-face instead.
+	(erc-button-add-face): New function to merge faces as text
+	properties.  This should be much faster when lots of buttons
+	appear.
+	(erc-button-list): New helper function.
+
+	* erc.el 1.295 (erc-display-message): Fixed argument list.
+	(erc-display-prompt): Reduced calls to length, use start-open
+	property for XEmacs to prevent a little box of erc-prompt-face at
+	the end of messages other people send.
+	(erc-refresh-channel-members): Fix XEmacs calls to split-string,
+	which may return an empty string at the end of the list.  This
+	would cause hangups in erc-button in re-search-forward loops.
+	(erc-get-channel-mode-from-keypress): Replaced control codes with
+	octal escape sequences.
+
+2002-08-14  Mario Lang  <mlang@delysid.org>
+
+	* erc-button.el 1.19:
+	Try to be compatible to XEmacs regexp-opt. (Im going to quit this job if I find more of those damn differencies
+
+	* debian/README.Debian 1.3, debian/scripts/install 1.9:
+	* Added info to README.Debian
+	* Finished debian/scripts/install
+
+2002-08-13  Mario Lang  <mlang@delysid.org>
+
+	* debian/scripts/install 1.8: First attempt to fix it
+
+	* debian/README.Debian 1.2, debian/changelog 1.17, debian/scripts/install 1.7:
+	changelog: Changed maintainer and added new entry
+	README.Debian: Re-explained the byte-compile issue
+	scripts/install: Exclude erc-bbdb|chess|ibuffer|speedbar from
+	byte-compiling
+
+	* erc-track.el 1.17: Added C-c C-SPC in addition to C-c C-@
+
+	* erc-notify.el 1.3: Little docstring change
+
+2002-08-09  Mario Lang  <mlang@delysid.org>
+
+	* erc-stamp.el 1.3:
+	Change one use of set-text-properties to add-text-properties (tnx Lathi)
+
+2002-08-02  Mario Lang  <mlang@delysid.org>
+
+	* erc-stamp.el 1.2: added erc-timestamp-only-if-changed-flag
+
+2002-07-22  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.294:
+	Removed timestamp related code and moved into erc-stampe.l
+
+	* erc-stamp.el 1.1:
+	Timestamping code moved out of erc.el. Additional, now we can timestamp either on the left or on the right side
+
+2002-07-16  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.293:
+	* Make ctcp ping return its message in the active buffer, instead of the server buffer
+	* Corrected minimal typo in catalog
+	* Added var and variable as alias for /set
+
+2002-07-08  Mario Lang  <mlang@delysid.org>
+
+	* erc-track.el 1.16:
+	* New function erc-track-switch-buffer (by resolve)
+	  Bound to C-c C-SPC, enjoy!
+
+2002-07-08  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.16: New snapshot deb
+
+	* debian/scripts/install 1.6: Rewrote in make.
+	Does not byte-compile erc-speak.el at all, and excludes erc-track.el too, if
+	ran for xemacs.
+
+	* debian/control 1.4: Added dependency on make
+
+	* debian/copyright 1.2: Updated copyright info
+
+	* debian/rules 1.10: Use $(wildcard *.el) instead of a hardcoded list
+
+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  <disumu@x3y2z1.net>
+
+	* erc-menu.el 1.8:
+	* changed how we check if we should activate "Track hidden channels" and
+	  whether it should be selected - fixes a bug Xemacs where whole menu bar
+	  does not work if menu is loaded
+
+	* erc-menu.el 1.7:
+	* added "Disconnect from server", only selectable if erc-connected is non-nil
+
+	* topic is allowed to be set by normal users if channel mode is not +t
+
+	* add " ..." after description if arguments needed after selecting menu item
+
+	* only allow selecting of menu points needing a channel if current buffer is
+	  a channel buffer - done by testing if channel-members is non-nil
+
+	* put erc-match functions in new group "Pals, fools and other keywords"
+
+	* erc.el 1.291:
+	* moved definition of erc-show-my-nick to GUI variables section
+
+	* erc-connected variable now defined with defvar
+	  now set in channel and query buffers, was only in server buffer before
+	  upon disconnect, set erc-connected to nil in all the server's buffers
+
+	* added erc-cmd-GQUIT and its alias erc-cmd-GQ - quit all servers at once
+
+	* added interactive function erc-quit-server, bound to C-c C-q
+
+	* added erc-server-WALLOPS
+
+	* added WALLOPS to english catalog, fixed s461 (was showing message twice)
+
+	* typo fixes, spacing change
+
+2002-06-29  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.290: Use pp-to-string in /set (without args)
+
+	* erc-netsplit.el 1.5:
+	Make /set anonymous-lign set erc-anonymous-login, also report
+	which var was set to which val.
+
+2002-06-28  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-menu.el 1.6: added "Customize ERC"
+
+2002-06-25  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.289: New variable: erc-use-info-buffers, defaults to nil.
+	  This prevents info-buffers from being created/updated.
+	  Set to t if you use :INFO buffers.
+	  (by rw)
+	Delete (erc-display-prompt) from reconnect to avoid clutter
+
+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-insert-mode-command is taken care of by this function as well
+
+2002-06-21  Mario Lang  <mlang@delysid.org>
+
+	* erc-track.el 1.15:
+	Fixed bug where buffer-names suddenly had text-properties.
+
+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  <disumu@x3y2z1.net>
+
+	* erc-match.el 1.10: fixed spelling error
+
+	* erc-track.el 1.14, erc-match.el 1.9: * erc-match.el:
+	  highlight current nickname in its own face (deactivated by default):
+	  - added erc-current-nick-highlight-type, erc-current-nick-face,
+	    erc-current-nick-p
+
+	* erc-track.el:
+	  added support for erc-current-nick-face
+
+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  <disumu@x3y2z1.net>
+
+	* erc.el 1.286:
+	* bugfix: when pasting lines with blank lines in between, remove the blank lines
+	  but send the rest
+
+	* since we know the command, use it when checking what's in erc-hide-list
+	  added check to erc-server-KICK
+
+	* added some blank lines for better readability
+
+2002-06-16  Alex Schroeder  <alex@gnu.org>
+
+	* erc-nickserv.el 1.5 (erc-nickserv-alist): Fixed typo.
+
+2002-06-15  Alex Schroeder  <alex@gnu.org>
+
+	* erc-nickserv.el 1.4 (erc-networks): Added doc string.
+	(erc-nickserv-alist): Added doc string.
+
+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
+
+2002-06-10  Mario Lang  <mlang@delysid.org>
+
+	* erc-nickserv.el 1.3: Added iip support.
+	Added :type for erc-nickserv-passwords custom.
+	Fixed hook usage.
+
+2002-06-07  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-nickserv.el 1.2: * added GalaxyNet
+
+	* erc-nickserv-alist:
+	  - sorting networks alphabetically
+	  - added two more pieces of information in erc-nickserv-alist:
+	    word to use for identification and whether to use the nickname
+
+	* erc-current-network:
+	  - made regex case insensitive, downcase server to match
+	  - uses the new information
+	  - now uses new variable erc-networks instead of doing checking manually
+
+	* added variable erc-networks
+
+	* fixed some indentation, documentation
+
+2002-06-07  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.285: Fix for kill-buffer hook stuff
+
+2002-06-06  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.284: Added /squery command
+
+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
+	  - added secret, moderated, no external send, topic lock, limit, key
+
+	* check that user is in a channel buffer and user is a channel operator
+	  for all op-related actions
+
+	* "Identify to nickserv" needs erc-nickserv-identify defined
+
+	* added "Show ERC version"
+
+	* erc.el 1.283:
+	* added erc-set-channel-limit, erc-set-channel-key, erc-toggle-channel-mode
+
+	* added erc-get-channel-mode-from-keypress, which is binded to C-c m
+	  sends the next character which is typed to one of the 3 new functions
+	  - did not remove erc-invite-only-mode and it's key binding in case
+	    people are used to it, although it probably should be removed...
+
+	* in erc-server-MODE:
+	  added check if tgt equal to user's nick
+	  removed erc-display-line, only using the erc-display-message
+
+	* added s461 to english catalog
+
+	* fixed bug where Xemacs would not quit if erc-quit-reason was
+	  set to erc-quit-reason-various and assoc-default was not defined
+
+2002-06-04  Andreas Fuchs  <asf@void.at>
+
+	* erc-ezbounce.el 1.1, erc-match.el 1.8:
+	* erc-ezbounce.el: Added. Provides support for ezbouncer; automatic login,
+	                   session management implemented. I've contacted the author
+			   about stuff in EZBounce's logging.
+	* erc-match.el: Fixed a stupid mistake where
+	                "*** Your new nick is <foo>" would trigger an error.
+
+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
+	  (require 'erc-nickserv) is now necessary for this to work
+
+	* erc.el 1.281:
+	* results of /COUNTRY now formatted as notice; errors are ignored, 
+	  fixing
+	  bug which made prompt disappear
+
+	* added undefined-ctcp error message to english catalog
+
+	* changed some (when (not erc-disable-ctcp-replies) to use unless instead
+	  and some if's without else statments to use when or use
+
+	* CTCP replies now use erc-display-message, formatted as notices
+
+	* added following to english catalog:
+	  - undefined-ctcp
+	  - CTCP-CLIENTINFO, CTCP-ECHO, CTCP-FINGER, CTCP-PAGE, CTCP-PING,
+	    CTCP-SOUND, CTCP-TIME, CTCP-UNKNOWN, CTCP-VERSION
+	  - s303, s305, s306, s353
+
+	* split erc-server-305-or-306 into erc-server-305 and erc-server-306
+
+	* KICK already had buffer set, using it
+
+	* erc.el 1.280:
+	* erc-format-timestamp now only called from erc-display-message and
+	  erc-send-current-line
+
+	* all instances of erc-display-line with erc-highlight-error
+	  changed to use erc-display-message
+
+	* added following error messages to english catalog:
+	  bad-ping-response, bad-syntax, cannot-find-file, cannot-read-file,
+	  ctcp-request, flood-ctcp-off, flood-strict-mode, no-default-channel,
+	  no-target, variable-not-bound
+
+	* added following server related messages to english catalog:
+	  s324, s329, s331, s332, s333, s341, s406, KICK, KICK-you, KICK-by-you, MODE-nick
+
+	* ignoring server codes 315, 369
+
+	* added erc-server-341, erc-server-406
+
+	* channel topic and mode notices displayed in respective channel buffers if they
+	  exist
+
+	* erc-server-KICK: display the message before removing this channel so that we
+	  can track the kick
+
+	* send parsed to erc-ctcp-query-ACTION-hook so that actions can be checked
+	  by erc-match
+
+	* fixed bug where nil was shown if no reason was given by users on /PART
+
+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  <disumu@x3y2z1.net>
+
+	* erc-button.el 1.18:
+	* made action case insensitive in erc-nick-popup and added a more descriptive
+	  error message
+
+2002-05-30  Brian P Templeton  <bpt@tunes.org>
+
+	* erc.el 1.279:
+	Removed multiple calls of `erc-prompt' in `erc-display-prompt'
+
+2002-05-29  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.278:
+	First step timestampkiller cleanup. I'm tired, do the rest tomorrow.
+
+	* erc.el 1.277:
+	New functionality: Catch channel/server buffer kills through kill-buffer-hook.
+	Currently, it only does a PART if you kill a channel buffer.
+
+2002-05-28  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.276:
+	defvar'ed some buffer-local variables to make elint at least a bit more happy.
+	  Moved comments into docstrings.
+	Changed some instances of member to memq.
+
+	* erc-track.el 1.13, erc.el 1.275:
+	erc.el: (erc-message-type-member): New function, used to test
+	for message type. Require erc-parsed text-property.
+	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  <disumu@x3y2z1.net>
+
+	* CREDITS 1.5: added myself, vain as it sounds ;)
+
+2002-05-25  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.274: * Some small docstring fixes
+	* (erc-display-line): Now takes also a process object in the buffer argument.
+	  Used for easy sending to the server buffer.
+	* Several places: Just pass proc, not (process-buffer proc)
+
+2002-05-24  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.273: Mostly docstring fixes/additions
+
+	* erc-netsplit.el 1.4: Doc fixes, and a new netjoin-done message.
+
+	* erc-fill.el 1.11: Doc fixes, erc-fill custom group, autoloads.
+
+	* erc-netsplit.el 1.3: Fix to erc-netsplit-timer.
+
+	* erc-netsplit.el 1.2: Fixed a silly typo
+
+	* erc-maint.el 1.1: is this really necessary?
+
+	* erc.el 1.272: Added new variable erc-hide-list.
+	It affects erc globally right now, and is used to hide certain IRC type messages like JOIN and PART.
+
+	* Makefile 1.3: Doh, I should really test this before checkin :)
+
+	* Makefile 1.2: Silly cut&paste bug fixed
+
+	* erc-list.el 1.6: Added autoload cookie
+
+	* erc-match.el 1.6: Added missing require erc.
+
+	* erc-notify.el 1.2: Autoload cookies and a -initialize function.
+
+	* erc-chess.el 1.18: Added autoload cookies
+
+	* Makefile 1.1: Finally, we have a Makefile.
+	Primarily used for autoload definition generation right now.
+
+	* erc-auto.in 1.1: First version.
+
+	* erc-track.el 1.12: Added autoload cookie
+
+	* erc-netsplit.el 1.1:
+	New module, used to autodetect and hide netsplits.
+	(Untested, no netsplit happened yet :) )
+
+	* erc-nets.el 1.3: Added some old code I once worked on.
+	Added autoload cookie
+
+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
+
+	* erc.el 1.271:
+	* added new function erc-connection-established which is called after receiving
+	  end of MOTD (does nothing if it's been called before)
+
+	* added new hook erc-after-connect which is called from
+	  erc-connection-established with the arguments server (the announced server)
+	  and nick - which other arguments should be sent??
+
+	* added buffer variable erc-connected which is set to t the first time
+	  erc-connection-established is called, set to nil again if we've been
+	  disconnected
+
+	* set initial user mode
+	  - added custom variable erc-user-mode which can be a string or a function
+	    which returns a string
+	  - new function erc-set-initial-user-mode gets called from
+	    erc-connection-established
+
+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  <disumu@x3y2z1.net>
+
+	* erc.el 1.269:
+	in erc-nickserv-identify: if network is unknown, just use "Nickserv"
+
+	* erc.el 1.268: * fixed some typos
+
+	* timestamping
+	  - ctcp request messages and replies now have timestamp
+	  - timestamps in front of error messages now in timestamp face
+	  - added timestamp to more error messages
+
+	* ctcp reply messages, server ping message updated
+
+	* added variable erc-verbose-server-ping - check this instead of erc-paranoid
+
+	* added whowas on no such nick:
+	  - added variable erc-whowas-on-nosuchnick
+	  - in erc-server-401 do WHOWAS if erc-whowas-on-nosuchnick is non-nil
+
+	* erc.el 1.267: forgot documentaion for erc-nickserv-alist
+
+	* erc.el 1.266: NickServ identification changed and enhanced:
+	- erc-nickserv-identify-autodetect now called from erc-server-NOTICE-hook
+	- now possible to identify automatically without prompt:
+	  - added custom variables erc-prompt-for-nickserv-password and
+	    erc-nickserv-passwords
+	- added erc-nickserv-alist containing the different networks' nickserv details
+	- added function erc-current-network to determine the network symbol
+	- fixed bug where identification on dalnet didn't work, because they now
+	  require NickServ@services.dal.net
+	  now sends to all NickServ with nick@server where possible
+
+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:
+	  - changed erc-fill-column from defvar to defcustom
+	  - in erc-fill-variable: set fill-column to value of erc-fill-column
+
+	* erc.el 1.265: erc.el:
+	* fixed bug where topic wasn't being set when chanel name was provided
+
+	erc-fill.el:
+	* filling with erc-fill-variable now works with custom defined fill width:
+	  - changed erc-fill-column from defvar to defcustom
+	  - in erc-fill-variable: set fill-column to value of erc-fill-column
+
+2002-05-16  John Wiegley  <johnw@gnu.org>
+
+	* erc.el 1.264: whitespace fix
+
+2002-05-15  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el 1.263:
+	* added explanation of empty string working in erc-quit-reason-various-alist
+	* removed the text property from erc-send-message, it caused problems
+	  with /SV (as noticed by gbvb on IRC) and is obviously not needed
+	* when receiving a ctcp query, convert type to uppercase to allow for
+	  "/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  <disumu@x3y2z1.net>
+
+	* erc.el 1.262:
+	- in erc-format-privmessage: `erc-format-timestamp' added to message after
+	  message's text properties are applied so that it doesn't lose its face
+
+	- /quit without reason now works when `erc-quit-reason' is set to
+	  `erc-quit-reason-various' and the empty string "" is defined in
+	  `erc-quit-reason-various-alist'
+
+2002-05-13  Andreas Fuchs  <asf@void.at>
+
+	* erc-bbdb.el 1.16:
+	* Applied Drewies patch to pop-up on nick changes when -popup-type is 'visible
+
+2002-05-12  Andreas Fuchs  <asf@void.at>
+
+	* erc-bbdb.el 1.15, erc.el 1.261:
+	* erc-bbdb.el: pop up the buffer on /whois when erc-bbdb-popup-type is 'visible
+	* erc.el: fix for empty quit reason problem by drewie.
+
+2002-05-12  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.260: disumu nick patch
+	- added erc-show-my-nick (default t)
+	  if t, show nickname like <nickname>
+	  if nil, only show a > character before the message
+	- added faces erc-nick-default-face and erc-nick-msg-face
+	  - nicknames (channel, msgs, notices) are now in bold face by default
+	  - the msg face matches the erc-direct-msg-face color
+
+2002-05-10  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.259 (erc-send-pre-hook): Doc change.
+
+	* CREDITS 1.4: Alexander L. Belikoff is confirmed original author.
+
+2002-05-10  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.258:
+	timestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumu
+
+2002-05-09  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.257: *** empty log message ***
+
+2002-05-06  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.256:
+	New var: erc-echo-notices-in-minibuffer-flag. defaults to t.
+
+2002-05-04  John Wiegley  <johnw@gnu.org>
+
+	* TODO 1.3: *** empty log message ***
+
+2002-05-03  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.255: Copyright notice, version string updates.
+
+2002-05-02  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.254: Comment: dme is David Edmondson
+
+2002-05-01  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.253 (erc-warn-about-blank-lines): New option.
+	(erc-send-current-line): Use it.
+	(erc-quit-reason-various-alist): New option.
+	(erc-quit-reason): New option.
+	(erc-quit-reason-normal): New function.
+	(erc-quit-reason-zippy): New function.
+	(erc-quit-reason-various): New function.
+	(erc-cmd-QUIT): Use them.
+
+2002-04-30  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.252: Version 2.92
+
+	* erc.el 1.251 (erc-send-modify-hook): Default value is nil.
+
+2002-04-27  John Wiegley  <johnw@gnu.org>
+
+	* erc.el 1.250:
+	Don't redisplay the prompt if the ERC buffer is no longer alive.
+
+2002-04-26  John Wiegley  <johnw@gnu.org>
+
+	* erc.el 1.249:
+	Don't call `set-buffer' on old-buf unless the buffer is valid.  It's
+	often not when separate frames are being used.
+
+2002-04-23  Mario Lang  <mlang@delysid.org>
+
+	* erc-button.el 1.17: fixed up erc-nick-regexp
+
+2002-04-22  Brian P Templeton  <bpt@tunes.org>
+
+	* erc.el 1.248:
+	`erc-prompt' may now be a function that returns a string (which is
+	used as the prompt). I don't use Customize but I think customization
+	of it may be broken if it's not a string.
+
+	There is a new `erc-prompt' function that returns the prompt as a
+	string (e.g., returning either the result of `(funcall erc-prompt)' or
+	`erc-prompt').
+
+	This allows for dynamic prompts, such as a LispWorks-like prompt, or
+	one containing simply the current channel name. It was requested by
+	Mojo Nichols (nick michols) in #emacs today, 21-Apr-2002; cf. the
+	#emacs logs at <URL:http://www.tunes.org/~nef/logs/emacs/02.04.21.
+
+2002-04-17  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.247:
+	fix erc-send-current-line to work on empty lines again (without sending the prompt)
+	Fix C-c C-t to not include the nick/time info
+	(both from antifuchs)
+
+	* erc-complete.el 1.9: Fix for xemacs elt behaviour
+
+2002-04-17  John Wiegley  <johnw@gnu.org>
+
+	* erc-chess.el 1.17:
+	Added a missing arg in a call to erc-chess-handler.
+
+2002-04-15  John Wiegley  <johnw@gnu.org>
+
+	* erc-chess.el 1.16: *** empty log message ***
+
+2002-04-14  John Wiegley  <johnw@gnu.org>
+
+	* erc-chess.el 1.15: *** empty log message ***
+
+2002-04-12  John Wiegley  <johnw@gnu.org>
+
+	* erc-chess.el 1.14: *** empty log message ***
+
+	* erc-chess.el 1.12: bug fixes
+
+	* erc-chess.el 1.11: *** empty log message ***
+
+2002-04-12  Mario Lang  <mlang@delysid.org>
+
+	* erc-chess.el 1.6: change order.
+
+	* erc-chess.el 1.5: more fixing.
+
+	Now, the 'match question works. It sends an accept back.
+	But display popup doesnt work..
+
+	* erc-chess.el 1.4: fixup (still far from working)
+
+2002-04-11  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.246:
+	* Added :options entry for erc-mode-hook (erc-add-scroll-to-bottom)
+
+2002-04-11  John Wiegley  <johnw@gnu.org>
+
+	* erc.el 1.245: remove trailing \n from any sent text
+
+	* servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 1.3, 
+	  erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, erc-list.el 1.5, 
+	  erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 1.3, 
+	  erc-speak.el 1.22, erc-speedbar.el 1.8, erc-track.el 1.11, erc.el 1.244:
+	clean whitespace
+
+	* erc.el 1.243: Replaced erc-scroll-to-bottom.
+
+2002-04-11  Mario Lang  <mlang@delysid.org>
+
+	* erc-track.el 1.10:
+	try to fix behaviour when used with different frames.
+
+2002-04-09  Mario Lang  <mlang@delysid.org>
+
+	* erc-chess.el 1.2:
+	fixup release, far from ready for real usage, but it appears to work.
+
+	* erc.el 1.242:
+	speed improvments based on elp-instrument-package RET erc- RET results
+
+	* erc-chess.el 1.1: initial version.
+	please test it
+	Get chess.el from johnw's cvs:
+	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot login
+	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot co chess
+
+	(as usual, blank password)
+
+	Add the resulting dir to your load-path and reqire erc-chess.
+
+	Usage: Just do /chess nickname
+	The remote end much use erc, as no other irc client I know of supports this ...
+
+	See erc-chess-default-display and maybe set it to chess-images or chess-ics1 if you prefer those over chess-plain.
+	Also, see erc-chess-user-full-name to set the name you use in chess games.
+
+2002-04-04  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.241: New hackery latenightwise
+
+	* erc.el 1.240: upupadowndowncase
+
+2002-04-04  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.15: Updated for the new snapshot
+
+	* debian/rules 1.9: Install README.Debian into the package
+
+	* debian/README.Debian 1.1: Initial check-in
+
+2002-04-04  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.239:
+	Fixed that /me in query buffers ended up in server buffer
+
+	* erc.el 1.238: * Implemented joining +k channels
+
+2002-03-14  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.237: New utility function: erc-channel-list
+	minor fix to erc-get-buffer. hopefully that helps shapr
+
+2002-03-12  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.236:
+	New /command: /QUOTE for sending directly to the IRC server
+	Removed erc-fill from erc-insert-modify-hook. To activate filling, simply customize that var.
+
+2002-03-09  Brian P Templeton  <bpt@tunes.org>
+
+	* CREDITS 1.3: *** empty log message ***
+
+2002-03-09  Mario Lang  <mlang@delysid.org>
+
+	* erc-complete.el 1.7:
+	New variable: erc-nick-completion-ignore-case. Defaults to t.
+
+	* erc-track.el 1.9:
+	* erc-track-shorten-name-function can now be set to nil to avoid treating of channel names at all.
+
+2002-03-06  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.14, debian/rules 1.8: update to new snapshot
+
+2002-03-06  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.235:
+	Fixed nasty bug which prevented channel limit from correctly display/handling
+
+	* erc-track.el 1.8: Made shortening code highly customizable.
+	Now, there is the variable erc-track-shorten-function which holds
+	a function which gets called with one argument, CHANNEL-NAMES, which is a list
+	of strings of the channel names.
+	It needs to return a list of strings of the same length with the modified values...
+
+	* erc-track.el 1.7:
+	Added erc-track-shorten-aggressively, default to nil
+	if it is set to t, erc will shorten a bit more.
+	if nil, erc will shorten the name only if it would get shorter than just
+	one char...
+
+	* erc-speak.el 1.21: added iirc to the abbreviation expansion list.
+
+	* erc-track.el 1.6:
+	Added customization variable: erc-track-use-faces. defaults to t.
+
+	* erc-track.el 1.5: *** empty log message ***
+
+	* erc-track.el 1.4:
+	experimental: Added face support to mode-line channel activity tracker.
+	Currently we use the faces used for indicating in the buffer (erc-pal-face for channels with pal acitivity...)
+
+2002-03-05  Mario Lang  <mlang@delysid.org>
+
+	* erc-complete.el 1.6: * added docfixes (thanks ore)
+
+	* erc-track.el 1.3: Fixed channel-name reduction.
+	thanks again alex.
+	Renamed the vars to erc-track-opt-start and erc-track-opt-cutoff.
+
+	* erc.el 1.234: fixed another silly error
+
+	* erc-track.el 1.2: Implemented channel name shortening.
+	Vars erc-track-cutoff says: all channel names longer than this will be shortened.
+	Var erc-track-minimum-channel-length says: dont make names shorten than this.
+	(Thanks go out to kensanata for the nice unique-substrings utility function).
+
+	* erc.el 1.233: silly typo corrected
+
+	* erc.el 1.232:	* erc.el 1.232: * New varialbe: erc-common-server-name-suffixes
+	  This alist can be used to change the server names displayed in mode-line
+	  to a shorter version..
+	* New function: erc-shorten-server-name (uses var above)
+	* Changed erc-prepare-mode-line to use erc-shorten-server-name.
+
+2002-02-25  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.231:
+	CTCP handling rewritten. Seems to work. please test and report probs.
+
+2002-02-24  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.230:
+	Fixed emacs20 backward compatibility (new defun/alias: erc-propertize)
+
+2002-02-22  Mario Lang  <mlang@delysid.org>
+
+	* erc-button.el 1.15: *** empty log message ***
+
+2002-02-21  Mario Lang  <mlang@delysid.org>
+
+	* erc-button.el 1.14, erc.el 1.229:
+	minor fixup related to read-only prompts and command renaming.
+
+2002-02-21  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.228: * modify `erc-remove-text-properties-region' to work.
+	  Could even be a little faster now. (-:
+
+2002-02-21  Mario Lang  <mlang@delysid.org>
+
+	* erc-ring.el 1.3:
+	fixed erc-replace-command to behave right when text is read-only.
+	Also, use erc-insert-marker and (point-max) now.
+
+	* erc.el 1.227: * Made erc-prompt read-only
+	* new function: erc-make-read-only. Can be used on erc-insert-post-hook and erc-send-post-hook to ensure read-only buffer text too
+
+2002-02-19  Mario Lang  <mlang@delysid.org>
+
+	* erc-list.el 1.4: added comment to docstring
+
+	* erc-speak.el 1.20: minor updates, use erc-nick-regexp now
+
+	* erc.el 1.226:
+	ensure that erc-timer-hook is called inside the server-buffer.
+
+2002-02-19  Andreas Fuchs  <asf@void.at>
+
+	* erc-match.el 1.4:
+	* Probably fixed the "number-char-or-marker-p: nil" bug.
+
+2002-02-19  Mario Lang  <mlang@delysid.org>
+
+	* erc-notify.el 1.1: Initial release.
+
+	* erc.el 1.225: added #303 handling
+	moved timer and added an arg (erc-current-time)
+
+	* erc-list.el 1.3, erc.el 1.224:
+	slightly changed the erc-once-with-server-event macro
+
+	* erc-button.el 1.13: erc-button-alist: doc fix and custom type fix
+
+2002-02-18  Mario Lang  <mlang@delysid.org>
+
+	* erc-list.el 1.2, erc.el 1.223: new macro: erc-once-with-server-event
+	erc-list.el: use it
+
+	* erc-match.el 1.3:
+	Minor fix related to hook call method change (-until-seccess now)
+
+	* erc.el 1.222: fixed ctcp behaviour abit (with auto-query on)
+
+	* erc-list.el 1.1: ChanList mode.
+	Load it, and type M-x erc-chanlist RET
+	Demonstrates how the new hook system can be nicely used.
+
+	* erc.el 1.221:
+	new hook: erc-default-server-hook. This one gets called if we dont have anything defined for a certain IRC server message.
+	New function: erc-default-server-handler. (used by above hook).
+	New function: erc-debug-missing-hooks: Used by above hook to save a list of unimplemented server messages.
+	New function: erc-server-buffer, erc-server-buffer-p.
+	Various places: use it.
+	Minor fixup.
+
+	* erc-button.el 1.12: fix regexp to not buttonize ~user@host hostnames
+
+2002-02-17  Mario Lang  <mlang@delysid.org>
+
+	* erc-complete.el 1.5, erc.el 1.220: Eliminated erc-command-table
+	Upcased the command defuns (erc-cmd-join is now erc-cmd-JOIN)
+	Fixed erc-complete to not require erc-command-table.
+	Implemented erc-cmd-HELP
+	  (You have to try that, its tooo coool!)
+	  e.g. /help auto-q
+	fixed autoloads for erc-add-pal and so on to be interactive.
+
+2002-02-17  Andreas Fuchs  <asf@void.at>
+
+	* erc-match.el 1.2:
+	* Fix unfunctional code in `erc-get-parsed-vector-type'.
+
+	* erc-bbdb.el 1.13, erc-button.el 1.11, erc-match.el 1.1, erc.el 1.219:
+	* Be careful: MANY changes ahead. I won't go into too much details.
+
+	* erc.el, new file erc-match.el: split out all pattern-matching code.
+	* erc.el: removed all defcusts for erc-{...}-highlight-props. They are
+	  quite useless, anyway.
+	* moved erc-add-entry-to-list and -remove- over to erc-match. changed
+	  their arg list.
+	* erc.el: add autoloads for erc-{add,delete}-{keyword,pal,fool,dangerous-host}
+	* erc.el: erc-server-PRIVMSG-or-NOTICE:
+	  - remove all the highlighting crap
+	  - add a (when (eq s nil) ...) so that untreated CTCP messages don't
+	    get misdisplayed.
+	* erc.el: erc-mark-message: removed this function, it's useless
+	* erc.el: minor bugfixes.
+
+	* erc-match.el: first checkin. This file now contains all the pattern
+	  matching stuff. there is now another defcust group, erc-match,
+	  containing all match related stuff (erc-keywords, ...)
+	* erc-match.el: added functionality to log matching lines. Quite
+	  customizable, check out the docstring of defun erc-log-matches
+	* erc-match.el: added functionality to make foolish messages
+	  invisible/intangible. This could replace erc-ignore-list
+	  sometime. it's more powerful right now, anyway.
+	* erc-match.el erc-text-matched-hook: new hook. run when Text matches
+	  anything (pal, fool, etc.).
+
+	* erc-button.el: Make nick buttonization customizable.
+	* erc-button.el: Give nick buttonization a lower priority so that it
+	  does not break url buttons.
+
+	* erc-bbdb.el: Add \n to the separators by which we split nicknames.
+
+2002-02-17  Mario Lang  <mlang@delysid.org>
+
+	* TODO 1.2: Added item
+
+2002-02-17  Brian P Templeton  <bpt@tunes.org>
+
+	* CREDITS 1.2, erc.el 1.218: Added invisible timestamp support.
+
+2002-02-16  Gergely Nagy  <algernon@debian.org>
+
+	* debian/changelog 1.13, debian/rules 1.7, debian/scripts/install 1.5:
+	updated to new snapshot
+
+2002-02-16  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.217:
+	Fixed channel limit format overflow in mode-line display.
+	(Having to use floats if integers are to large is quite strange, isn't it?)
+
+	* TODO 1.1: TODO list created.
+	Add comments and expand it.
+
+	* erc.el 1.216:
+	Fixed bug in query buffer handling (only happend in mixed-case situations)
+
+	* erc.el 1.215: shapr checkdoc patch #1
+	massive docfixes! yay, keep going!
+
+2002-02-15  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.214: various other fixes
+	make s301 a catalog entry
+
+2002-02-15  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.213: * erc-server-NICK and erc-server-INVITE: fixed to use
+	  `erc-display-message'. These I missed in the first checkin.  I
+	  didn't say it in the last log message, but please test these.
+
+	* erc-fill.el 1.7, erc.el 1.212:
+	* erc.el: updated many functions to use `erc-display-message'. Now, we
+	  should go for getting highlighting out of
+	  erc-server-PRIVMSG-or-NOTICE. The part I want to attack has been
+	  marked.
+	* erc-fill.el: updated static filling to leave the erc-parsed property alone.
+
+2002-02-15  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.211:
+	first step, new function: erc-display-message
+
+	* erc.el 1.210: added numreply 379 and 405.
+
+	* erc.el 1.209: stupid typo fixed
+
+	* erc.el 1.208:
+	Finally renamed erc-frame-dedicated-p to erc-frame-dedicated-flag
+	Removed usage of erc-interpret-controls from info buffer drawing (major speedup)
+	Other speedups based on the results from elp.
+	ERC is now about 300%-500% faster in some situations with very full channels!!!!!
+
+2002-02-14  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.207:
+	* erc-downcase now downcases {}|^ with []\~ -- 'stolen' from zenirc.
+	* various checkdoc fixes. Just the upper third of the file, but that
+	  should help a little, too. (-: Again, if you have any writing
+	  skills, take out that dusty keyboard and tap it to the beat of M-x
+	  checkdoc!
+
+2002-02-14  Gergely Nagy  <algernon@debian.org>
+
+	* erc.el 1.206 (erc-format-privmessage):
+	fix it, so timestamp-coloring works again (patch from antifuchs)
+
+2002-02-14  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.205: Many fixes based on M-x checkdoc RET.
+	If you have write access, and some english knowledge, help document erc too!
+	M-x checkdoc RET, and follow the instructions.
+
+	* erc-button.el 1.10, erc-ibuffer.el 1.13: minor fixes
+
+	* erc.el 1.204: Use nreverse instead of reverse.
+	Use eq instead of equal where possible.
+	Rewrote erc-get-buffer to not use find-if (find-if does very deep function-call nesting, which isnt good ina  defun which is called so often)
+
+2002-02-13  Mario Lang  <mlang@delysid.org>
+
+	* erc-button.el 1.9, erc.el 1.203:
+	In erc.el, new hook: erc-channel-members-changed-hook.
+	erc-button.el: Now highlight all nicknames. uses regexp-opt.
+
+2002-02-04  Mario Lang  <mlang@delysid.org>
+
+	* erc-nets.el 1.1:
+	Database of irc networks. Use erc-server-select to interactively select one.
+
+	* erc.el 1.202: * erc-format-nick-function: New variable.
+	* (erc-format-nick): The default for above var. Just return the nick.
+	* (erc-format-@nick): Prefix NICK with @ or + if OP or VOICE.
+	* Removed erc-track-modified-channels related code and moved into erc-tracke.l
+	   Its auto-loaded now
+
+	* erc-track.el 1.1: Split code from erc.el
+
+2002-02-01  Mario Lang  <mlang@delysid.org>
+
+	* erc-ibuffer.el 1.12:
+	* erc-target now uses erc-port-to-string
+
+	* servers.pl 1.1:
+	Script to convert mircs servers.ini to a elisp salist kind of thing.
+	(development tool, it doesnt help you much as a user)
+
+	* erc.el 1.201:
+	* erc-display-line-buffer: renamed to erc-display-line-1
+	* erc-port-equal: New function.
+	* erc-normalize-port: Used by erc-port-equal
+	* minor docstring fixes
+
+2002-02-01  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.200:
+	* erc-already-logged-in-p: compare ports is more robust now.
+
+	* erc-button.el 1.8: * Add buttonization to erc-send-modify-hook, too
+
+2002-01-31  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.199:
+	Use insert-before-markers instead of insert in erc-display-line-buffer
+	This fixed point@column 0 problem and gives us some speedup! yay
+
+	* erc-ibuffer.el 1.11, erc.el 1.198: minor fixes
+
+	* erc.el 1.197:
+	* (erc-line-beginning-position): Renamed to erc-beg-of-input-line.
+	* (erc-line-end-position): Renamed to erc-end-of-input-line.
+	* erc-multiline-input-p: Variable removed.
+
+	* erc.el 1.196:
+	Minor docstring fixes (using M-x checkdoc-current-buffer)
+	  If you find time, and you are native english speaker, do that too!!
+
+	* erc.el 1.195: fixed macro-invokation
+
+2002-01-31  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.194: * erc-with-all-buffers-of-server: use erc-list-buffers
+	* erc-process-away, erc-{save,kill}-query-buffers: use it.
+	* erc-cmd-away-all: new command. Set away/back on all servers.
+
+	* erc.el 1.193:
+	* Fix last multiline bug in erc-send-distinguish-noncommands.
+
+2002-01-31  Mario Lang  <mlang@delysid.org>
+
+	* erc-ibuffer.el 1.10, erc.el 1.192: minor fixes
+
+2002-01-30  Mario Lang  <mlang@delysid.org>
+
+	* erc-ibuffer.el 1.9, erc-menu.el 1.3, erc-speak.el 1.19, erc.el 1.191:
+	Renamed erc-track-modified-channels-minor-mode to erc-track-modified-channels-mode (at least, its a bit shorter)
+	Added docstring to erc-server-hooks (through the macro)
+	Minor docfix in obsolete hook
+
+2002-01-30  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.190:
+	* erc-send-current-line: fix behaviour where buffer changes.
+	* erc-mark-message: fix stupid face bug. highlighting of pals should work now.
+
+	* erc-ring.el 1.2, erc.el 1.189:
+	* new hooks: erc-send-pre-hook, erc-send-modify-hook, erc-send-post-hook
+	* erc-send-this: new variable
+	* erc-noncommands-list: new constant.
+	* erc-send-distinguish-noncommands: use it. (First filter function for sending! yay!)
+	* erc-send-current-line: nearly completely rewritten.
+	  - now handles multiline input. (yay!)
+	  - now uses the three hooks from above.
+	* erc-process-line: new arg, no-command: don't process this line as a command.
+
+2002-01-30  Mario Lang  <mlang@delysid.org>
+
+	* erc-bbdb.el 1.12, erc-button.el 1.7, erc-speak.el 1.18, erc.el 1.188:
+	hook handling rewrite phase 1.
+
+2002-01-30  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.187: * Rework erc-server-PRIVMSG-or-NOTICE
+	* New function: erc-is-message-ctcp-p
+	* New function: erc-format-privmessage
+	* New function: erc-mark-message
+	* erc-server-PRIVMSG-or-NOTICE: use them.
+
+2002-01-30  Mario Lang  <mlang@delysid.org>
+
+	* CREDITS 1.1, HISTORY 1.1:
+	Initial checkin.
+
+2002-01-29  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.186: * erc-put-text-properties: make OBJECT optional
+	* erc-put-text-property: same
+	* erc-server-PRIVMSG-or-NOTICE: use them.
+	* Make erc-display-line-buffer: add the "\n" even when the string would be invisible.
+	* same: make the \n invisible, too (:
+
+2002-01-29  Mario Lang  <mlang@delysid.org>
+
+	* erc-ibuffer.el 1.8, erc.el 1.185:
+	Rewrote channel tracking using window-configuration-change-hook instead of defadvices.
+
+2002-01-28  Andreas Fuchs  <asf@void.at>
+
+	* erc-fill.el 1.6, erc.el 1.184:
+	* Macro define-erc-highlight-customization: Ease up defining
+	  erc-{fool,pal,..}-highlight-props defcusts.
+	* defcusts:
+	  - erc-fool-highlight-props
+	  - erc-pal-highlight-props
+	  - erc-dangerous-host-highlight-props
+	  - erc-keyword-highlight-props
+
+	  Customizable to either nil or "Hide message".
+	* erc-string-invisible-p: check for invisible chars in string
+	* erc-display-line-buffer: use it.
+	* erc-put-text-properties: put a list of props into a piece of text.
+	* erc-server-PRIVMSG-or-NOTICE: use it; set appropriate
+	  highlight-props for entire incoming message. This set of changes
+	  allows you to e.g. auto-ignore fools.
+
+2002-01-28  Mario Lang  <mlang@delysid.org>
+
+	* erc-ibuffer.el 1.7:
+	Added highlight detection support to the Mark column.
+	Now p, k, f, and d indicate pal, keyword, fool and dangerous-host related activity.
+
+	* erc.el 1.183:
+	Highlight tracking finished. All necessary info should now be in erc-modified-channels.
+
+	* erc.el 1.182, erc-ibuffer.el 1.6, erc-speedbar.el 1.7:
+	Added highlight tracking to track-modified-channels
+	   no display code yet, the info is just kept in erc-modified-channels
+	Added erc-modified column to ibuffer
+	speedbar update
+
+	* erc-ibuffer.el 1.5: Added erc-members column
+
+	* erc-ibuffer.el 1.4: *** empty log message ***
+
+2002-01-28  Andreas Fuchs  <asf@void.at>
+
+	* erc-bbdb.el 1.11:
+	* Fix a slight typo. The hook function should be called in
+	  erc-server-376-hook (-:
+
+2002-01-28  Mario Lang  <mlang@delysid.org>
+
+	* erc-ibuffer.el 1.3: *** empty log message ***
+
+2002-01-27  Mario Lang  <mlang@delysid.org>
+
+	* erc-ibuffer.el 1.2: Fixup, it sort of works now. Try it
+
+	* erc-ibuffer.el 1.1: Initial version
+
+2002-01-26  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.181: *** empty log message ***
+
+2002-01-25  Andreas Fuchs  <asf@void.at>
+
+	* erc-bbdb.el 1.10: * fix two bad things:
+	  - fix the "proc trick": pass proc as an arg through
+	    ...-insinuate-... to ...-show-entry
+	  - hook highlighting into the 376 hook. This one is bound to get
+	    called (-:
+	* We now only append to hooks only.
+	* Highlighting of changing records gets updated automatically.
+
+2002-01-25  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.180: *** empty log message ***
+
+2002-01-25  Andreas Fuchs  <asf@void.at>
+
+	* erc-bbdb.el 1.9: * nearly complete rewrite of erc-bbdb:
+	  -  Removed code duplication in erc-bbdb-NICK and -JOIN.
+	  -  Made erc-bbdb-show-entry more general and intelligent.
+	  -  erc-bbdb-insinuate-entry is now erc-bbdb-insinuate-and-show-entry
+	     (note the different arglist!):
+	  -  erc-search-name-and-create now creates "John Doe" users if name
+	     is not specified.
+	  -  No sign of "mail" anywhere anymore. It's all finger-host. (-:
+	  -  erc-bbdb-popup-p is now called erc-bbdb-popup-type.
+	  -  New customize values:
+	     . erc-bbdb-irc-channel-field     channel field name
+	     . erc-bbdb-irc-highlight-field   (see below)
+	     . erc-bbdb-auto-create-on-nick-p auto-create record on join
+
+	* Highlighting based on BBDB is now here! Specify which type of
+	  highlighting a person in the BBDB (whose nick you know) and have
+	  fun! Read help to erc-bbdb-init-highlighting for details. Changes:
+	  -  new function erc-bbdb-init-highlighting: gets called on server
+	     connect.
+	  -  new function erc-bbdb-highlight-record: highlights a person's
+	     nick names.
+
+2002-01-24  Andreas Fuchs  <asf@void.at>
+
+	* erc-button.el 1.6:
+	* Fix the erc-button-alist regexp for EmacsWiki stuff. delYsid's version
+	  is better (-:
+
+	* erc-button.el 1.5: * Added an Ewiki: specifier to the url-regexp.
+	  <nickname> EmacsWiki: EmacsIRCClient tells you <bla>
+	  should highlight "EmacsWiki: EmacsIRCClient" and allow you to
+	  browse to the wiki when the button is activated.
+	* new custom: erc-emacswiki-url.
+	* new function: erc-browse-emacswiki: use it.
+
+2002-01-23  Mario Lang  <mlang@delysid.org>
+
+	* erc-bbdb.el 1.8:
+	erc-bbdb-NICK: Added regexp-quote around fingerhost search.
+
+2002-01-10  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.179:
+	* Channel saving/killing on quit from server implemented:
+	 - defcust erc-save-queries-on-quit: Save server's channel buffers on quitting from server
+	 - defcust erc-kill-queries-on-quit: Kill server's channel buffers on quitting from server
+	 - Macro erc-with-all-buffers-of-server: Run a form inside all the server's query buffers
+	 - Functions erc-{kill,save}-query-buffers: use it.
+	* Added indent-tabs-mode: t to Local Variables section.
+
+2002-01-07  Andreas Fuchs  <asf@void.at>
+
+	* erc-replace.el 1.2: * fix stupid documentation errors.
+
+2002-01-07  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.178:
+	* (toplevel): Revert previous change. This resulted ina  recursive load...
+	   You have to put (require 'erc-button) into your .emacs for now
+
+2002-01-05  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.177:
+	* Added require for erc-button. This is devel. so I need testers :)
+
+	* erc-button.el 1.4: * Added proper file headers (GPL).
+
+2002-01-04  Mario Lang  <mlang@delysid.org>
+
+	* erc-button.el 1.3: * erc-button-alist: Added entry for finger
+
+	* erc-button.el 1.2: * Removed bogus usage of :button-keymap.
+	P
+	   Does anyone know what this was supposed to do anyway?
+
+	* erc-button.el 1.1: * Initial version.
+	* This module allows a way of buttonizing text in IRC buffers.
+	  Default it is used for URLs, but other things could be added.
+	  see if you can find another use, erc-button-alist
+
+See ChangeLog.01 for earlier changes.
+
+    Copyright (C) 2002 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.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;; arch-tag: a6779d5e-99fa-442b-98cf-90e73eb2c272
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/erc/ChangeLog.03	Sun Feb 12 00:15:44 2006 +0000
@@ -0,0 +1,2151 @@
+2003-12-30  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.595 (erc-cmd-HELP):
+	Changed to prefer giving help for erc-cmd-* functions over
+	   similarly-named Elisp functions (e.g., erc-cmd-LIST vs. list).
+
+2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.594 (erc-query-buffer-p): Added this function.
+
+2003-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.593 (erc-cmd-SV): Use erc-emacs-build-time.
+
+	* erc-compat.el 1.15: erc-emacs-build-time: New variable.
+
+	* erc.el 1.592 (erc-cmd-SAY):
+	Reintroduced the feature where the spaces between
+	"/SAY" and the rest of the line were being sent with the message.
+
+2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.591 (erc-server-buffer-p):
+	Fixed a bug where this function sometimes would return
+	    nil when it should return t.
+
+2003-12-27  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.590 (erc-generate-new-buffer-name):
+	Really fixed a bug where ERC would reuse
+	    a connected server buffer when erc-reuse-buffers is non-nil.
+	(erc-cmd-JOIN): Now we tell the user when he attempts to join the same
+	    channel twice on the same server.
+
+	* erc.el 1.589 (erc-generate-new-buffer-name):
+	Fixed a bug where ERC would reuse a connected server buffer when erc-reuse-buffers is non-nil.
+
+	* erc.el 1.588 (erc-cmd-SAY):
+	Fixed a bug where the spaces between "/SAY" and the rest of the
+	    line were being sent with the message.
+
+	* erc-list.el 1.15: Fixed another typo.
+
+	* erc-list.el 1.14: Fixed a typo.
+
+	* erc-list.el 1.13:
+	Added text to the top of the channel list buffer describing the keybinding for
+	function erc-chanlist-join-channel.
+
+	* erc-list.el 1.12: Minor appearance changes.  No functional change.
+
+	* erc-list.el 1.11:
+	Implemented function erc-chanlist-join-channel.  Added variable
+	erc-chanlist-channel-line-regexp.  Got rid of function
+	erc-chanlist-pre-command-hook.  Changed the logic for how channel lines are
+	highlighted.
+
+2003-12-26  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-list.el 1.10:
+	Removed a bunch of unused code.  No semantic change.
+
+	* erc-list.el 1.9: Added lots of functionality.
+
+2003-12-15  Mario Lang  <mlang@delysid.org>
+
+	* erc-track.el 1.58, erc.el 1.587:
+	New custom type erc-message-type, use it in erc-hide-list and erc-track-exclude-types
+
+2003-12-14  Alex Schroeder  <alex@gnu.org>
+
+	* erc-track.el 1.57 (track-when-inactive): New module.
+	(erc-track-visibility): New option.
+	(erc-buffer-activity): New variable.
+	(erc-buffer-activity-timeout): New variable.
+	(erc-user-is-active): New function.
+	(erc-buffer-visible): New function.
+	(erc-modified-channels-update): Replace get-buffer-window call
+	with call to erc-buffer-visible.
+	(erc-track-modified-channels): Ditto.
+
+2003-12-14  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc-track.el 1.56 (erc-modified-channels-update):
+	Force update of modeline.  Makes sure
+	that the tracked channels disappear in other buffers too.
+
+2003-12-06  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc.el 1.586 (define-erc-module):
+	New optional argument LOCAL-P.  If non-nil, then
+	mode will be created as buffer-local rather than a global mode.
+	(erc-cmd-CTCP): Fix indentation from last commit.
+
+	* erc-compat.el 1.14 (erc-define-minor-mode):
+	Deal with :global and :group keywords.
+
+	* erc-nickserv.el 1.13 (erc-current-network):
+	Make server regex more permissive.
+
+	* erc.el 1.585 (erc-cmd-CTCP):
+	Don't add a space to end of command when ARGS are
+	empty.  This fixes a bug whereby requests of the form "VERSION " were
+	being sent, and ignored.
+
+2003-11-27  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc-log.el 1.9: From Adrian Aichner <adrian@xemacs.org>
+	* erc-log.el (erc-log-file-coding-system): Use 'binary
+	coding-system under XEmacs (instead of 'emacs-mule).
+	* erc-log.el (erc-w32-invalid-file-characters): Removed as no
+	longer needed.
+	* erc-log.el (erc-generate-log-file-name-long): Use
+	`convert-standard-filename', which exists in XEmacs too.
+
+2003-11-16  Mario Lang  <mlang@delysid.org>
+
+	* erc-identd.el 1.1: Code provided by johnw, thanks!
+
+2003-11-09  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc.el 1.584 (erc-latest-version): Clean up docstring.
+	Remove requirement for w3, wrap REQUIRE statement in IGNORE-ERRORS.
+	Update viewcvs url to correct location.
+	(erc-ediff-latest-version): Make sure that we find the uncompiled
+	erc.el, error if not.
+
+2003-11-07  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.583: Add more info to /sv
+
+2003-11-06  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.582: Added optional argument BUFFER to erc-server-buffer-p.
+
+2003-11-04  Mario Lang  <mlang@delysid.org>
+
+	* AUTHORS 1.6: Add sachac
+
+2003-11-02  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc.el 1.581 (erc-server-366):
+	chnl is 4th element of parsed, not fifth.
+	(erc-channel-end-receiving-names): Pass correct number of arguments
+	to delete-if-not.
+
+	* erc.el 1.580 (erc-update-current-channel-member):
+	 Use erc-downcase when comparing
+	nick entries.  Cleanup indentation.
+
+2003-11-01  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc-sound.el 1.4: Added a (provide 'erc-sound) line.
+
+	* erc.el 1.579 (erc-cmd-NAMES): send to TGT, not CHANNEL.
+
+2003-10-29  Sandra Jean Chua  <sacha@free.net.ph>
+
+	* erc-pcomplete.el 1.21, erc.el 1.578, CREDITS 1.6:
+	Merged Jeremy Maitin-Shepard's patch for time-sensitive nick completion.
+
+2003-10-27  Mario Lang  <mlang@delysid.org>
+
+	* Makefile 1.19, debian/changelog 1.24:
+	New Debian package 4.0.cvs.20031027
+
+2003-10-25  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.577: Fix typo tuncate->rruncate
+
+2003-10-24  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.80: From Stephan Stahl <stl@isogmbh.de>:
+	 * (erc-dcc-send-block): Kill buffer if transfer completed correctly.
+
+2003-10-22  Mario Lang  <mlang@delysid.org>
+
+	* erc-track.el 1.55 (erc-track-disable):
+	Do not deactivate all advices for `switch-to-buffer',
+	just disable the erc specific one. (Bug#217022).
+
+2003-10-18  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc-log.el 1.8 (erc-log-file-coding-system): New variable.
+	(erc-save-buffer-in-logs): Use it.
+
+2003-10-17  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.576 (erc-interpret-mirc-color): New boolean defcustom
+
+	* erc.el 1.575: Do not use -nowait on darwin (thanks johnw)
+
+2003-10-15  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc.el 1.574 (define-erc-module):
+	Set erc-FOO-mode appropriately in erc-FOO-enable
+	and erc-FOO-disable.
+
+2003-10-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-autoaway.el 1.12 (erc-mode):
+	Reset idletime on connect. Fixes an annoying bug which
+	flooded the server with aways on reconnect.
+	(erc-autoway-reset-idletime): Accept optional args so we can hook it
+	onto erc-server-001-hook.
+
+2003-10-10  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.573 (erc-hide-list): Add a nice defcustom type
+
+2003-10-08  Mario Lang  <mlang@delysid.org>
+
+	* Makefile 1.18, debian/changelog 1.23, debian/control 1.8:
+	Debian snapshot 20031008
+
+	* erc-speedbar.el 1.11:
+	Patch from Eric M. Ludlam <eric@siege-engine.com>:
+	 - (erc-install-speedbar-variables): Add functions list (needs new speedbar?)
+	 - (erc-speedbar-buttons): Add doc.  Clear the buffer
+	 - (erc-speedbar-sort-channel-members): New function.
+	 - (erc-speedbar-expand-channel): Call new sort function.  Change some visuals.
+	 - (erc-speedbar-insert-user): Change some visuals based on channel data.
+	 - (erc-speedbar-line-text, erc-speedbar-item-info): New functions
+	Add proper elisp file header.
+
+2003-10-02  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc-match.el 1.22 (erc-match-syntax-table): New variable.
+	(erc-match-current-nick-p): Use it.
+
+	* erc.el 1.572 (erc-quit-reason-zippy, erc-part-reason-zippy): Use
+	`erc-replace-regexp-in-string' rather than
+	`replace-regexp-in-string'.
+	(erc-command-indicator-face): New face, used to show commands if
+	`erc-hide-prompt' is nil and `erc-command-indicator' is non-nil.
+	(erc-command-indicator): Clean up doc-string.
+	(erc-display-prompt): New optional argument FACE, use this rather
+	than `erc-prompt-face' to fontify the prompt if non-nil.
+	(erc-send-current-line): Pass in `erc-command-indicator-face' to
+	`erc-display-prompt'.
+
+	* erc-compat.el 1.13 (erc-replace-regexp-in-string): New function.
+	Alias for `replace-regexp-in-string' on Emacs 21.
+	Argument massaging for `replace-in-string' for XEmacs.
+
+2003-09-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.571 (erc-keywords): Removed. Wasn't used by anything.
+
+2003-09-25  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc.el 1.570: ERC-HIDE-PROMPT: add custom group
+	ERC-COMMAND-INDICATOR: new variable.
+	ERC-COMMAND-INDICATOR: new function.
+	ERC-DISPLAY-PROMPT: new argument, PROMPT, used to override default
+	prompt.
+	ERC-SEND-CURRENT-LINE: pass ERC-COMMAND-INDICATOR to ERC-DISPLAY-PROMPT.
+
+2003-09-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.569 (erc-parse-line-from-server):
+	Ignore empty lines as required by RFC.
+
+2003-09-17  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.568: Add lag time calculation
+
+2003-09-13  Mario Lang  <mlang@delysid.org>
+
+	* Makefile 1.17, debian/README.Debian 1.7, debian/changelog 1.22:
+	New debian release
+
+	* erc-notify.el 1.22:
+	Call erc-notify-install-message-catalogs on load, not on module init
+
+	* erc.el 1.567 (erc-update-modules):
+	Use `load' instead of `require'.  XEmacs appears
+	to have the NOERROR arg only sometimes... Strange
+
+	* erc.el 1.566: No fboundp if we have a defvar
+
+	* erc.el 1.565: Properly defvar erc-ping-handler
+
+2003-09-11  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.564 (erc-setup-periodical-server-ping):
+	check if erc-ping-handler is
+	    bound before referencing it
+
+2003-09-10  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.563 (erc-cmd-NICK):
+	Warn about exceeded NICKLEN if we know it.
+
+	* erc.el 1.562: Make erc-server-PONG obey erc-verbose-server-ping.
+	Cancel old `erc-ping-handler' timer when restablishing connection in the same
+	buffer.
+
+	* debian/changelog 1.21, Makefile 1.16: New debian snapshot
+
+	* erc-dcc.el 1.79, erc-xdcc.el 1.6:
+	Use new function erc-dcc-file-to-name to convert spaces to underscores
+
+	* erc-xdcc.el 1.5: Add autoload for erc-xdcc-add-file
+
+2003-09-08  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.78: indent fixes and copyright update
+
+	* erc.el 1.561:
+	erc-send-ping-interval: New defcustom which defaults to 60.
+	Every 60 seconds, we send PING now.
+	This should fix the "connection silently lost" bug.
+	Please test this change extensively, and report problems.
+
+2003-09-07  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.560 (erc-default-coding-system):
+	Test for undecided and utf-8
+	before setting.
+
+2003-09-01  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.559 (erc-modules): Add some more symbols to the set
+
+	* erc.el 1.558 (erc-modules):	* erc.el 1.558 (erc-modules): Add :greedy t to the set in 
+
+	* erc-dcc.el 1.77:
+	More autoloads which make dcc autoload upon ctcp dcc query received.
+
+	* erc-dcc.el 1.76 (erc-cmd-DCC): Add Autoload.
+	(pcomplete/erc-mode/DCC): Ditto, makes DCC autoloadable just by using
+	completion.
+	Also only offer "send" if fboundp make-network-process.
+
+	* erc-autojoin.el 1.6: Update copyright
+
+	* erc-autojoin.el 1.5 (erc-autojoin-add):
+	Only add the channel if it is not already there.
+
+	* erc-notify.el 1.21:
+	Use `define-erc-module' instead of old `erc-notify-initialize'.
+	Now defines the global minor mode erc-notify-mode, and should also
+	be controllable via `erc-modules' with symbol `notify'.
+
+	* erc.el 1.557 (erc-modules):
+	Fix paren-in-column-zero bug in docstring.
+	Add a sort of bogus, but still better :type.
+	Add autojoin and netsplit by default.
+	(erc-update-modules): Dont barf with an error if `require' fails.
+	We can still error out if the mode is not defined.
+
+2003-08-31  Andreas Fuchs  <asf@void.at>
+
+	* erc.el 1.556:
+	* make 353 (NAMES reply) output go into the appropriate channel buffer
+	  (if it exists) or into the active erc buffer (if not).
+
+2003-08-29  mtoledo  <mtoledo@confusibombus>
+
+	* erc.el 1.555:
+	Added the variable erc-echo-notices-in-current-buffer to make possible display notices in the current buffer (queries to nickserv/chanserv/memoserv). Defaults to nil so nothing changes from what we have today.
+
+2003-08-29  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.554: Fix typo in varname which led to a compiler warning
+
+	* AUTHORS 1.5: Added lawrence
+
+2003-08-27  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.75:
+	Set process and file-coding system to 'binary (for Windows)
+
+	* erc-stamp.el 1.30: Rename custom group erc-timestamp to erc-stamp.
+
+2003-08-07  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc-fill.el 1.23 (erc-fill-disable):
+	Remove erc-fill, not erc-fill-static from
+	erc-insert-modify-hook.
+
+2003-08-05  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.553 (erc-send-current-line):
+	Now we display the prompt for previously entered commands
+	    based on the value of customization variable erc-hide-prompt.  This change is
+	    closely related to revision 1.552 by wencem.
+
+2003-08-04  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc.el 1.552 (erc-send-current-line):
+	If we're sending a command, don't display
+	the prompt.
+
+2003-08-04  Damien Elmes  <erc@repose.cx>
+
+	* erc-track.el 1.54: patch from David Edmondson (dme AT dme DOT org)
+
+	This patch makes button 3 on the erc-track buffer names in the
+	modeline show the selected buffer in another window. It's analogous to
+	button 2 which shows the buffer in the current window.
+
+2003-07-31  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.551 (erc-display-line-1):
+	Fixed bad indentation on one line.  No semantic change.
+
+2003-07-29  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc-match.el 1.21:
+	Quote open paren in docstring of erc-text-matched-hook
+
+	* erc.el 1.550: Anchor match only at beginning in erc-ignored-user-p.
+
+	* erc-button.el 1.47: New variable erc-button-wrap-long-urls.
+	Modified erc-button-add-buttons:
+	  New optional argument REGEXP.
+	  If we're buttonising a URL and erc-button-wrap-long-urls is
+	  non-nil, try and wrap them
+
+	Modified erc-button-add-buttons-1:
+	  Pass regexp to erc-button-add-buttons.
+
+2003-07-28  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.549 (erc-network-name):
+	Improved docstring.  Removed an unnecessary call to erc-server-buffer.
+
+2003-07-28  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.548: By lawrence:
+	(erc-ignored-user-p): Use anchored regexp.
+	(smiley): Fix missing quote in `remove-hook' call.
+
+2003-07-26  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-nets.el 1.4, erc-nickserv.el 1.12, erc.el 1.547:
+	Changed all references to Openprojects into references to Freenode.
+
+2003-07-25  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.546:
+	Now variable erc-debug-irc-protocol is defvar'ed instead of defcustom'ed.
+	Made the docstring clearer too.
+
+	* erc.el 1.545: Fixed a wrong-type-argument error from window-live-p.
+
+2003-07-15  Damien Elmes  <erc@repose.cx>
+
+	* erc-log.el 1.7 (erc-log-setup-logging):
+	set buffer-file-name to "", as (basic-save-buffer)
+	    will prompt for a buffer name before invoking hooks. the buffer-file-name
+	    will be overridden by (erc-save-buffer-in-logs) anyway - the main danger
+	    of doing this is write-file-contents hooks. Let's see if anyone complains.
+	(erc-save-buffer-in-logs): return t, so that further write hooks are not run
+
+2003-07-09  Damien Elmes  <erc@repose.cx>
+
+	* erc-dcc.el 1.74 (erc-dcc-open-network-stream):
+	-nowait still crashes emacs cvs - disable for now
+
+2003-07-02  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.544 (erc): Minor docstring modification.
+
+2003-07-01  Damien Elmes  <erc@repose.cx>
+
+	* erc-match.el 1.20 (erc-match-current-nick-p):
+	match only on word boundaries
+
+	* erc-log.el 1.6 (erc-log-setup-logging):
+	not sure how this crept in again - make sure we set
+	    buffer-file-name to nil, since otherwise it is not possible to open
+	    previous correspondence in another buffer while a conversation is open
+
+2003-06-28  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.543 (erc-network-name):
+	Now makes some intelligent guesses if the server didn't tell
+	    us the network name.
+
+2003-06-28  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.542 (erc-default-coding-system): Use utf-8 as the default
+	encoding for outgoing stuff and undecided as the default for
+	incoming stuff.
+	(erc-coding-sytem-for-target): New.
+	(erc-encode-string-for-target): Use it.
+	(erc-decode-string-from-target): Use it.  Removed the flet
+	erc-default-target hack and documented the dynamically bound
+	variable `target' instead.
+
+2003-06-25  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.541 (erc-log-irc-protocol):
+	Now we keep point on the bottom line of the window
+	    displaying the *erc-protocol* buffer if it is at the end of the
+	    *erc-protocol* buffer.
+
+	* erc.el 1.540:
+	Added some text to the docstring for variable erc-debug-irc-protocol.
+
+2003-06-23  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-dcc.el 1.73 (erc-dcc-auto-mask-p):
+	Fixed a docstring typo that caused a load-time error.
+
+	* erc-dcc.el 1.72 (erc-dcc-auto-mask-p):
+	Changed reference to undefined variable erc-dcc-auto-mask-list
+	    to erc-dcc-auto-masks.
+	Changed default value of variable erc-dcc-auto-masks to nil and added text to its
+	    docstring.
+
+	* erc-notify.el 1.20 (erc-notify-timer and erc-notify-QUIT):
+	Added network name to notify_off message.
+
+	* erc.el 1.539 (erc-network-name):
+	Now returns the name of the IRC server if the network name
+	    cannot be determined.
+
+	* erc-notify.el 1.19 (erc-notify-JOIN and erc-notify-NICK):
+	Added argument ?m to call to erc-display-message.
+
+	* erc-dcc.el 1.71 (erc-dcc-do-LIST-command):
+	Fixed a bug where I assumed (plist-get elt :type)
+	    returns a string -- it really returns a symbol.
+
+	* erc-notify.el 1.18 (erc-notify-timer):
+	Now we include the network name in the notify_on message.
+
+	* erc.el 1.538:
+	New function: erc-network-name.  Returns the name of the network that the
+	    current buffer is associate with.  Not every server sends the 005 messages
+	    that enable the network name to be known.  If the network name is
+	    not known, the string "UNKNOWN" is returned.
+
+	* erc-dcc.el 1.70 (erc-dcc-chat-setup):
+	Added a comment.  Fixed a bug where a DCC CHAT buffer has no
+	    prompt when it first appears.
+
+	* erc-dcc.el 1.69 (erc-dcc-chat-parse-output):
+	Now a DCC chat buffer displays the nick using
+	    erc-nick-default-face just like in a channel buffer.
+
+2003-06-22  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.537 (erc-display-prompt):
+	Fixed incorrect indentation.  No semantic change.
+
+	* erc.el 1.536 (erc-strip-controls):
+	Minor change to regexp that matches IRC color control
+	    codes.  I was seeing usage as follows: ^C07colored text^C^C04other color.
+	    Now we strip a ^C followed by zero, one, or two digits.  Before this change,
+	    we stripped a ^C followed by one or two digits.
+
+	* erc-dcc.el 1.68 (erc-dcc-do-LIST-command):
+	Improved format of output of /DCC LIST.  Now the
+	    "Size" column for a DCC GET includes the percentage of the file that has
+	    been retrieved.
+	(erc-dcc-do-GET-command): Now it works if erc-dcc-default-directory is set.
+
+2003-06-19  Damien Elmes  <erc@repose.cx>
+
+	* erc-log.el 1.5:
+	* added quickstart information to the comments up the top
+
+2003-06-16  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.535:
+	Default to open-network-stream on MS Windows. (thanks lawrence)
+
+2003-06-11  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.534 (erc-process-input-line):
+	refactor so that wrong-number-of-arguments is
+	    caught when using do-not-parse-args - this lets do-not-parse-args
+	    commands display help messages on incorrect syntax in a uniform manner.
+	    This no longer raises a bad-syntax error - was this a catch-all to stop a
+	    backtrace? Does it belong?
+	(erc-cmd-APPENDTOPIC): the correct way to display help when you want to
+	    accept an abitrary string is to (signal 'wrong-number-of-arguments nil).
+	    This fixes a bug where people could not /at topics with a space in them.
+
+2003-06-09  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.533:
+	Re-add the last few changes which weren't merged for some reason.
+
+	* erc.el 1.532 (erc-cmd-APPENDTOPIC): show help when given no arguments
+
+	Patch from MrBump. Fixes problem with erc-set-topic inserting ^C characters
+	into the topic. Also removes dependency on CL.
+
+2003-06-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.531:
+	Added comment to explain (eval-after-load "erc" '(erc-update-modules)).
+
+2003-06-01  Mario Lang  <mlang@delysid.org>
+
+	* erc-pcomplete.el 1.20: Add completion for /unignore
+
+2003-05-31  Alex Schroeder  <alex@gnu.org>
+
+	* erc-compat.el 1.12 (erc-encode-coding-string): The default binding,
+	if encode-coding-string was not available, must be a defun that
+	takes multiple arguments.  Did that.
+
+2003-05-30  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.530:
+	Add handlers for 313 and 330 (by arne@rfc2549.org, thanks)
+
+2003-05-30  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.529:
+	patch from MrBump to make /mode #foo +b work again (erc-cmd-BANLIST only
+	temporarily changes them now)
+
+2003-05-29  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.528 (erc-select):
+	server is now defaulted with erc-compute-server.
+	A few cosmetic fixes.
+	(erc-default-coding-system): Renamed from erc-encoding-default.
+	(erc-encoding-default): Renamed to erc-default-coding-system.
+	(erc-encoding-coding-alist): Documentation updated to cover regexps.
+	(erc-encode-string-for-target): Now considers keys of
+	erc-encoding-coding-alist to be regexps.  Rely on erc-compat
+	wrt. MULE support.
+	(erc-decode-string-from-target): New function.
+	(erc-send-current-line): eq -> char-equal fix.
+	(erc-server-TOPIC): topic is now decoded with
+	erc-decode-string-from-target.
+	(erc-parse-line-from-server): Line from server is no longer decoded
+	here.
+	(erc-server-PRIVMSG-or-NOTICE): Message from a user is decoded here,
+	sspec -> sender-spec for clarity.  Cosmetic if -> when fix.
+	(erc-server-TOPIC): sspec -> sender-spec
+	(erc-server-WALLOPS): Ditto.
+
+	* erc-compat.el 1.11 (erc-decode-coding-string):
+	Now requires coding-system as an argument.
+
+2003-05-15  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.527:
+	erc-part|quit-hook is only run on a part|quit directed to our nick, reflect that in the docstring to avoid confusion
+
+2003-05-01  Andreas Fuchs  <asf@void.at>
+
+	* erc-truncate.el 1.3:
+	* erc-truncate-buffer-to-size: use fboundp. Scheme takes its toll...
+
+2003-05-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-truncate.el 1.2: remove require of erc-log
+	(erc-truncate-buffer-to-size): use erc-save-buffer-in-logs when it's
+	there, else, dont.
+
+2003-04-29  Andreas Fuchs  <asf@void.at>
+
+	* erc-log.el 1.4, erc-truncate.el 1.1, erc.el 1.526: erc.el:
+		* erc-cmd-QUIT: Remove references to code in erc-log.el, to
+		  not force autoloading of erc-log.el
+		* erc-server-PART: ditto.
+		* erc-quit-hook: new hook, run when /quit command is
+		  processed.
+		* erc-cmd-QUIT: use it.
+		* erc-part-hook: new hook, run then PART message is
+		  processed.
+		* erc-cmd-PART: use it.
+		* erc-connect-pre-hook: new hook, run before connection to IRC
+		  server is started.
+		* erc: use it.
+		* erc-max-buffer-size: Move truncation variables and functions
+		  to erc-truncate.el
+		* erc-truncate-buffer-on-save: moved to erc-log.el
+		* erc-initialize-log-marker: new function.
+	erc-log.el:
+		* erc-truncate-buffer-on-save: New defcust here; from erc.el
+		* erc-truncate-buffer-on-save: Put it in group `erc-log'
+		* erc-log-channels-directory: Remove trailing slash from
+		  default value.
+		* Add functions to erc-connect-pre-hook, erc-part-hook and
+		  erc-quit-hook to avoid getting autoloaded.
+
+	erc-truncate.el:
+		* Contains the truncation functions and defcusts from erc.el.
+		* define-erc-module clause added; new erc-truncate-mode.
+
+2003-04-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.525 (erc):
+	Check wether erc-save-buffer-in-logs is bound, too
+
+	* erc.el 1.524 (erc):
+	Check wether erc-logging-enabled is bound before using it - not
+	everyone is using erc-log.el!
+
+2003-04-28  Andreas Fuchs  <asf@void.at>
+
+	* erc-log.el 1.3:
+	* while we're at it, remove the (declare (ignore ignore)) statements.
+
+	* erc-log.el 1.2:
+	* add autoload statement for erc-log-mode/etc. Sorry for the delay.
+
+	* erc-log.el 1.1, erc.el 1.523: * erc.el:
+		- move variables and functions to erc-log.el:
+			 defgroup `erc-log'
+	                 defcustom `erc-log-channels-directory'
+			 defcustom `erc-log-insert-log-on-open'
+			 defcustom `erc-generate-log-file-name-function'
+			 defun `erc-save-buffer-in-logs' (autoloads from erc-log.el)
+	 		 defuns `erc-generate-log-file-name-*'
+			 defun `erc-current-logfile'
+			 defun `erc-logging-enabled' (autoloads from erc-log.el)
+		- erc-truncate-buffer-to-size: fix for double-saving bug when
+		  writing out truncated buffer contents. Thanks, lawrence mitchell <wence@gmx.li>!
+		- erc-remove-text-properties-region: Fix case for read-only text.
+		- erc-send-current-line: update insert-marker before calling the hooks.
+		                         also, wrap (erc-display-prompt) so that it doesn't toggle
+					 buffer-modified-p.
+		- erc-interpret-controls: remove /very/ old commented-out function
+		- erc-last-saved-position: make it a marker
+		- erc: use it.
+
+	* erc-log.el: (thanks, lawrence mitchell <wence@gmx.li>!)
+		- Move logging code from erc.el here
+		- define-erc-module log: add; minor mode erc-log-mode is the
+		  same as adding the `erc-save-buffer-in-logs' to
+		  erc-send-post-hook and `erc-insert-post-hook'.
+		- erc-w32-invalid-file-characters: add.
+		- erc-enable-logging: add.
+		- erc-logging-enabled: use it.
+		- erc-logging-enabled: autoload.
+		- erc-save-buffer-in-logs: fix for truncating saved buffer with read-only text.
+		- erc-save-buffer-in-logs: use erc-last-saved-position.
+		- erc-save-buffer-in-logs: fix saving half-written messages on
+		  the prompt when saving the log file. (simply uses
+		  erc-insert-marker as an upper bound for saving).
+
+2003-04-27  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.522:	* erc.el 1.522: erc-modules: added 
+
+2003-04-27  Alex Schroeder  <alex@gnu.org>
+
+	* Makefile 1.15 (UNCOMPILED): Added erc-compat.el.
+	(clean): Remove .elc files, too.
+	Patch by Hynek Schlawack <hynek+erc@hys.in-berlin.de>
+
+2003-04-22  Damien Elmes  <erc@repose.cx>
+
+	* erc-button.el 1.46:
+	erc-button-keymap: set the parent keymap to erc-mode-map
+
+2003-04-20  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.521:
+	erc-official-location: shouldn't the official location be the base URL of erc?
+
+	* erc.el 1.520:
+	erc-modules: updated the docstring to make the semantics clearer
+
+2003-04-19  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.519:
+	Fix problem where % in NOTICE produced errors (from mmc)
+
+2003-04-18  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.518 (erc-toggle-debug-irc-protocol):
+	moved a reference to 'buf' inside the let
+	    statement which defines it. it's difficult to tell what the original
+	    intentions were here - at the moment the debug window is displayed when
+	    toggling either way.
+
+	* README 1.3, erc.el 1.517:
+	(erc-update-modules: added a condition in for erc-nickserv -> erc-services
+
+	* erc-pcomplete.el 1.19:
+	- that change to erc-update-modules making it require the modules first means
+	  we don't need any special case handling here, so i reverted the previous
+	  change
+
+	* erc.el 1.516:
+	- don't require 'erc-auto, since windows users don't have access to make.
+	  instead, we handle it in (erc-update-modules)
+
+2003-04-17  Damien Elmes  <erc@repose.cx>
+
+	* README 1.2, Makefile 1.14:
+	Updated Makefile and documentation to reflect the new release
+
+	* erc.el 1.515:
+	- note the previous change also updated the release number to erc 4.0!
+	(erc-connect): fix a bug introduced by the previous release
+
+	* erc.el 1.514:
+	fixed about 20 instances of (message (format ...)) which will break if the
+	format returns a string with %s in it
+
+	* erc.el 1.513: erc-error-face: make it red, not pink
+
+	* erc-pcomplete.el 1.18:
+	since pcomplete is autoloaded via erc-completion-mode, and completion is in
+	erc-modules by default, we remove completion when pcomplete is added
+
+	* erc.el 1.512 (define-erc-module): no need for delete, use delq
+
+	* erc-members.el 1.5 (erc-nick-channels):
+	(erc-person-channels) takes one arg
+	(erc-format-user): again, they all take an arg
+
+	* erc.el 1.511:
+	- require erc-auto when loading, so the default `erc-modules' can be loaded.
+	  this makes erc-auto no longer a convenience but a necessity - all the name
+	  of user friendliness.
+	(define-erc-module): the enable and disable routines now update erc-modules
+	    accordingly
+	erc-modules: new variable controllig the modules which erc has loaded/will
+	    load. when customising, it will automatically enable modules. it won't
+	    automatically disable modules which are removed, yet.
+	(erc-update-modules): enable all modules in `erc-modules'
+
+	* erc-dcc.el 1.67 (erc-dcc-open-network-stream):
+	use the -nowait equiv if available
+	erc-dcc-server-port: removed
+	erc-dcc-port-range: allows a range of values, so you can have more than one
+	    dcc
+	(erc-dcc-server): support erc-dcc-port-range
+	(erc-dcc-chat): use OCHAT for outgoing chat for now. we need to fix the
+	    issues with allowing more than one chat with the same person
+
+	* erc.el 1.510:
+	erc-log-channels: removed; set the directory to start logging
+	(erc-directory-writeable-p): create directory if it doesn't exist, check if
+	    it's writeable
+	(erc-logging-enabled): don't reference erc-log-channels
+
+2003-04-07  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.509 (erc):
+	but when inserting the contents of a previous logfile, use the logfile
+	    name, not ""!
+
+	* erc.el 1.508 (erc):
+	set buffer-file-name to "", since we have a custom saving function and
+	    it's not needed. this enables one to open a log file with previous
+	    correspondence, while talking to the person at the same time
+
+2003-03-29  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.507 (erc-prepare-mode-line-format):
+	Now strips all text properties from the target before
+	    putting it in the mode line.  Keeps the mode line looking consistent.
+	(erc-channel-p): Improved docstring.
+
+2003-03-28  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.506 (erc-generate-log-file-name-with-date): New function.
+	(erc-generate-log-file-name-function): Make it available.
+
+2003-03-24  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.505:
+	Fix erc-prompt and erc-user-mode custom :type (Closes: #185794)
+
+2003-03-20  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.504:
+	erc-server-hook-list: correct documentation of ordering of (proc parsed)
+
+2003-03-16  Alex Schroeder  <alex@gnu.org>
+
+	* erc-track.el 1.53 (erc-modified-channels-string):
+	Make it a risky-local-variable.
+
+2003-03-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-track.el 1.52 (erc-track-modified-channels):
+	Use (point-min) if we don't find a
+	parsed-property, so it won't error out with nil...
+
+2003-03-16  Damien Elmes  <erc@repose.cx>
+
+	* erc-track.el 1.51 (erc-track-switch-buffer):
+	removed call to erc-modified-channels-update, as
+	    this is done correctly on buffer switching in both emacs and xemacs now
+
+2003-03-15  Damien Elmes  <erc@repose.cx>
+
+	* erc-track.el 1.50 (erc-find-parsed-property):
+	simplified a little, so it shouldn't return nil anymore
+
+	* erc.el 1.503: erc-send-post-hook: document narrowing which occurs
+
+2003-03-14  Alex Schroeder  <alex@gnu.org>
+
+	* erc-track.el 1.49 (erc-find-parsed-property): New function.
+	(erc-track-modified-channels): Use it instead of relying on
+	point-min.
+
+2003-03-12  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.502:
+	Fix erc-set-topic to accept a channel name as first word
+
+2003-03-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-dcc.el 1.66:
+	Small patch (<10 lines, also slightly modified by Jorgen Schäfer) from
+	David Spreen <netzwurm@debian.org> to add hostmask-authentication to
+	DCC auto-accept.
+
+	erc-dcc-auto-mask-list: New variable
+	(erc-dcc-handle-ctcp-send): Check erc-dcc-auto-mask-list
+	(erc-dcc-auto-mask-p): New function
+	erc-dcc-send-request: Docstring now mentions erc-dcc-auto-mask-list
+
+2003-03-10  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-ring.el 1.11 (erc-clear-input-ring):
+	New function.  Erases the contents of the input ring for
+	   the current ERC buffer.
+
+2003-03-08  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.501:
+	(erc-display-line-1) and (erc-send-current-line): Now these functions reset erc-insert-this
+	    to t as soon as possible after consuming the value of that variable.  See the comments in
+	    the code for the strange symptom this fixes.
+	(erc-bol): Changed to call point-at-eol instead of line-end-position.  This increases XEmacs
+	    portability, since XEmacs doesn't have line-end-position.  Patch suggested by Scott Evans
+	    on the ERC mailing list.
+
+2003-03-04  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.500: banlist*: patch from mrbump to avoid using cl packages
+
+2003-03-04  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.499:
+	Changed erc-noncommands-list from a constant to variable, so that users can
+	    add their own erc-cmd-* functions to the list.  Improved the docstring too.
+
+2003-03-02  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.498 (erc-server-353):
+	Now the output of "/NAMES #channel" appears in the currently
+	    active ERC buffer, even if the user is not a member of #channel.
+
+	* erc.el 1.497 (erc-cmd-DEOP):
+	Fixed a syntax error: invalid read syntax ")" caused by my last change.
+
+2003-03-01  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.496 (erc-cmd-DEOP):
+	Fixed a wrong-type-argument error caused by calling split-string
+	    on a list instead of on a string.  Removed the call to split-string entirely,
+	    because it wasn't needed.
+
+	* erc.el 1.495 (erc-cmd-HELP):
+	Changed to use intern-soft instead of intern.  Now "/HELP floob"
+	    doesn't create a void function symbol erc-cmd-FLOOB.
+
+2003-02-25  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.494 (erc-cmd-SERVER):
+	remove erroneous references to line, use server instead
+
+2003-02-23  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.493 (erc-toggle-debug-irc-protocol):
+	Fixed a bug where the global value of
+	    kill-buffer-hook was being modified instead of the buffer-local value.
+
+2003-02-22  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.492 (erc-cmd-KICK):
+	Now supports any number of words in the REASON string.  Examples
+	    of the /KICK command are:
+	      /KICK franl You don't belong here
+	      /KICK franl Bye
+	      /KICK franl
+	      /KICK #channel franl Go away now
+	      /KICK #channel franl Bye
+	      /KICK #channel franl
+
+2003-02-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-stamp.el 1.29 (erc-insert-timestamp-right):
+	Make the timestamp rear-nonsticky, so
+	C-e works at the beginning of the next line.
+
+2003-02-16  Andreas Fuchs  <asf@void.at>
+
+	* erc-stamp.el 1.28:
+	* s/choose/choice/ in customize options, as kensanata requested.
+
+2003-02-15  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.491 (erc-toggle-debug-irc-protocol):
+	Now if the *erc-protocol* buffer is killed,
+	    logging is turned off.  Prior to this change, the buffer would come back
+	    into existence (generally unbeknownst to the user) after being killed.
+
+2003-02-11  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.490 (erc-send-current-line):
+	we can't inhibit everything here when not connected,
+	    as the user will expect commands like /server still to work. the
+	    erc-cmd-handler should recover from errors instead
+
+2003-02-10  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.489:
+	* we now run erc-after-connect on 422 (no motd) messages as well as the motd
+	  messages
+	(erc-login): revert the previous change
+
+	* erc.el 1.488 (erc-login): register that we're connected
+
+2003-02-10  Mario Lang  <mlang@delysid.org>
+
+	* erc-members.el 1.4: * Provide erc-members
+	* Fix excessive )
+	* Comment out broken self-tests
+
+2003-02-07  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.487 (erc-connect):
+	notify the user we're trying to connect when using asych
+	    connections
+
+	* erc.el 1.486 (erc-connect): support an asyncronous connection
+	(erc-process-sentinel): ditto
+
+	* erc-track.el 1.48:
+	* advise switch-to-buffer in the case of xemacs, since it doesn't have
+	  window-configuration-change-hook
+
+	* erc.el 1.485 (erc-send-current-line):
+	if not connected, refuse to send either a message or
+	    a command
+
+	* erc.el 1.484: (erc-save-buffer-in-logs):
+	    - check for a sensibile region before saving the buffer. if the
+	      connection process is killed early on, there is not a sensible region
+	      to save
+	    - don't set buffer-file-name on save. we don't need it, and it means we
+	      can now find-file a log while an existing query is open with that
+	      user
+
+	* erc.el 1.483 (erc-process-input-line):
+	when displaying the help for a function, if no
+	    documentation exists, don't fall over
+	(erc-cmd-SAY): new function for quoting lines begining with /
+	(erc-server-NICK):
+	    - fix a bug where the "is now known as" message doesn't appear on newly
+	      created /query buffers
+	    - when a user changes their nick, update the query to point to the new
+	      nick
+
+	* erc.el 1.482 (erc-send-current-command):
+	don't reject multi-line commands. since
+	    multiline-p is used as the no-command arg to erc-process-current-line,
+	    multi-line text is never interpreted as a command. i believe this is the
+	    correct behavior - it allows people to post the output of things like df
+	    (sans header). if you want to change this, please provide a rationale
+	    in the changelog
+
+	* erc.el 1.481 (erc-send-current-line):
+	only match the first line when determining if a
+	    multi-line command is allowed
+
+2003-02-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-bbdb.el 1.21 (erc-bbdb-highlight-record):
+	Use alternate strings, not character
+	classes to split the nick-field.
+
+2003-02-06  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.479 (erc-process-sentinel):
+	Now we set erc-connected to nil every time we disconnect
+	    from a server, not just when an unexpected disconnect happens.
+
+	* erc.el 1.478 (erc-connected):
+	Removed redundant defvar of this variable.  Improved the
+	    docstring.
+	(erc-login): Changed to send a correct RFC2812 USER message (see section
+	    3.1.3 of RFC2812 for the documentation of the semantics of each argument
+	    of the USER message.
+
+2003-02-02  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.477 (erc-cmd-NOTICE): fix from mrbump
+
+2003-01-31  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.476 (erc-cmd-JOIN):
+	Now we only send one JOIN command to the server when a channel
+	    key is provided.
+
+2003-01-30  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.475 (erc-remove-channel-member):
+	Fixed so that it runs erc-channel-members-changed-hook
+	    with the channel buffer current, as is documented in the docstring for variable
+	    erc-channel-members-changed-hook: "The buffer where the change happened is
+	    current while this hook is called."
+
+2003-01-28  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.474:
+	(erc-ignored-user-p),(erc-cmd-IGNORE),(erc-cmd-UNIGNORE): Now nicks are ignored
+	    on a per-server basis.  Now, erc-ignore-list is only valid in server
+	    buffers!  Do not reference it in channel buffers.
+
+	* erc.el 1.473 (erc-cmd-IGNORE):
+	Now says "Ignore list is empty" if it erc-ignore-list is empty
+	    instead of showing an empty list.
+
+2003-01-25  Alex Schroeder  <alex@gnu.org>
+
+	* erc-nickserv.el 1.11 (services): Defined a module
+
+2003-01-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.472 (erc-process-ctcp-query):
+	Display recipient of CTCP query if it's not
+	our current nick.
+
+	* erc.el 1.471 (erc-cmd-WHOIS):
+	Accept an optional second argument SERVER.
+
+2003-01-25  Alex Schroeder  <alex@gnu.org>
+
+	* erc-stamp.el 1.27 (stamp): erc-add-timestamp must always be added
+	with the APPEND parameter -- not only when adding it on the right.
+
+2003-01-24  Alex Schroeder  <alex@gnu.org>
+
+	* erc-members.el 1.3 (erc-channel-members-changed-hook): Obsolete, use
+	erc-members-changed-hook instead.  When it is set, add its content
+	to erc-members-changed-hook.
+	(erc-update-channel-member): Obsolete, use erc-update-member
+	instead.  Defalias to that effect.
+	(erc-remove-channel-member): New and already obsolete.  Use
+	erc-remove-nick-from-channel instead.
+	(erc-update-channel-info-buffer): Obsolete, use ignore instead.
+	Yes, these have to go.
+	(erc-channel-member-to-user-spec): Obsolete, use erc-format-user
+	instead.
+	(erc-format-user): New.
+	(erc-ignored-reply-p): New, use it.
+
+	* erc-members.el 1.2:
+	Further along the way.  Any function from erc.el that uses
+	channel-members should end up in this file, rewritten to use
+	erc-members.
+
+	(erc-person): Call erc-downcase before getting
+	something from the hash.
+	(erc-nick-in-channel): Checking wether erc-process must be used is
+	unnecessary -- this will be done in erc-person.
+	(erc-nick-channels): New.
+	(erc-add-nick-to-channel, erc-update-member): Call erc-downcase
+	before putting something into the hash.
+	(erc-buffer-list-with-nick): New.
+	(erc-format-nick, erc-format-@nick): New, backwards incompatible.
+	Must check for other places that call these!
+	(erc-server-PRIVMSG-or-NOTICE): Use the new version.
+
+	* erc-compat.el 1.10 (view-mode-enter): defalias to view-mode, if
+	view-mode-enter is not fboundp and view-mode is -- as is the case
+	in XEmacs.  We need view-mode-enter in erc-match.el.
+
+2003-01-23  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.470 (erc-default-server-handler):
+	Minor performance improvement: allow the lambda
+	    expression to be byte-compiled.
+
+2003-01-23  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.469 (erc-cmd-BANLIST):
+	in the absence of a fill-column, use the screen width
+
+2003-01-22  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.468:
+	patch from MrBump to delay fetching the banlist until /bl is run, so we don't
+	fetch it when joining a channel anymore
+
+	* erc-ring.el 1.10:
+	* instead of adjusting hooks when loaded, provide (erc-ring-mode). you'll
+	  need to run (erc-ring-mode 1) now to get the ring
+	* (erc-previous-command), (erc-next-command):
+	    - check if the ring exists and create it if necessary
+	    - don't do anything if the ring is empty
+
+	* erc-pcomplete.el 1.17:
+	Put "how to use" documentation in the comments up the top
+
+2003-01-21  Alex Schroeder  <alex@gnu.org>
+
+	* erc-autojoin.el 1.4 (erc-autojoin-version): New.
+
+	* erc-autojoin.el 1.3 (erc-autojoin-add): Added body.
+	(erc-autojoin-remove): Added body.
+	(erc-autojoin): Provide it.
+
+2003-01-21  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.467: erc-cmd-*: removed a bunch of references to force
+
+2003-01-21  Alex Schroeder  <alex@gnu.org>
+
+	* erc-autojoin.el 1.2 (erc-autojoin-channels-alist): More doc.
+
+2003-01-20  Alex Schroeder  <alex@gnu.org>
+
+	* erc-autojoin.el 1.1:
+	new, based on resolve's mail, and the stuff on the wiki
+
+	* erc-members.el 1.1: new
+
+2003-01-19  Mario Lang  <mlang@delysid.org>
+
+	* debian/README.Debian 1.6, debian/changelog 1.20, debian/scripts/install 1.11, 
+	  debian/scripts/startup.erc 1.4, Makefile 1.13:
+	Prepare for 20030119 debian package
+
+	* erc-dcc.el 1.65: <rant>
+	* (erc-decimal-to-ip): Since XEmacs decides that return a completely
+	and utterly wrong number from string-to-number if it is larger than
+	the integer boundary, instead of sanely converting the thing to
+	a float, we now (concat dec ".0").
+	</rant>
+
+	* erc.el 1.466:
+	* (erc-log-irc-protocol): Use erc-propertize, not propertize
+
+2003-01-19  Alex Schroeder  <alex@gnu.org>
+
+	* erc-button.el 1.45 (erc-button-add-buttons): Added regexp-quote for
+	the list case, too.
+
+2003-01-19  Damien Elmes  <erc@repose.cx>
+
+	* erc-dcc.el 1.64 (erc-dcc-member): fix for case where a prop is nil
+
+	* erc-dcc.el 1.63 (erc-dcc-member):
+	fix for xemacs's version of plist-member
+
+2003-01-19  Mario Lang  <mlang@delysid.org>
+
+	* erc-notify.el 1.17: Delete empty strings from the ison-list
+
+	* erc-track.el 1.47:
+	* (erc-track-switch-buffer): Call erc-modified-channels-update here.
+
+	* erc-track.el 1.46: * toplevel: require 'erc-match
+
+	* erc-track.el 1.45: * (erc-track-mode): Make autoload interactive
+
+	* erc-button.el 1.44: * (button): Make the autoload interactive
+
+	* erc.el 1.465:
+	* (erc-mode): Comment out the case-table stuff, breaks xemacs
+	* (erc-downcase): Revert.
+
+	* erc-dcc.el 1.62:
+	* (erc-dcc-handle-ctcp-send): Use erc-decimal-to-ip on the ip we get...
+
+	* erc-speak.el 1.25:
+	Eliminate reference to erc-nick-regexp, which no longer exists
+
+2003-01-19  Alex Schroeder  <alex@gnu.org>
+
+	* erc-stamp.el 1.26 (erc-timestamp-right-column): New, default nil.
+	(erc-insert-timestamp-right): Use it, if non-nil.  Verbose
+	doc string.
+
+2003-01-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.464 (erc-downcase): Use the old behavior in non-CVS Emacs.
+
+	* erc.el 1.463 (erc-cmd-QUIT): Remove &rest. The correct fix follows.
+	(erc-cmd-GQUIT): Pass "" to erc-cmd-QUIT.
+	(erc-mode): Use the case-table only in CVS Emacs. See comment.
+
+	* erc.el 1.462 (erc-cmd-QUIT): make reason optional.
+
+	* erc.el 1.461 (erc-cmd-GQUIT): Fixed typo.
+
+2003-01-17  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.460:
+	* (erc-current-logfile): call expand-file-name, so that downcase doesn't mess up ~
+
+	* erc.el 1.459: * (erc-mode): Define a proper case-table.
+	* (erc-downcase): just call downcase for now, lets see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
+
+	* erc-button.el 1.43: * (erc-button-add-buttons): regex-quote the nick
+
+2003-01-17  Alex Schroeder  <alex@gnu.org>
+
+	* erc-button.el 1.42 (button): erc-channel-members-changed-hook no
+	longer has erc-recompute-nick-regexp.
+	(erc-button-alist): Use channel-members instead of
+	erc-nick-regexp.
+	(erc-button-add-buttons): Split some code into
+	erc-button-add-buttons-1, and now handle strings, lists, and
+	alists.  Regular expressions in lists and alists are enclosed in
+	< and >.
+	(erc-button-add-buttons-1): New.
+	(erc-nick-regexp): Deleted.
+	(erc-recompute-nick-regexp): Deleted.
+
+	* erc-button.el 1.41: Remove require cl again.
+	(erc-mode-map): No longer bind widget-backward and widget-forward.
+	(erc-button-alist): Explain why byte-compiling makes no sense, and
+	remove all calls to byte-compile.
+	(erc-button-keymap): Define it the standard way, without exposing
+	the list nature of the keymap.
+	(erc-button-marker-list): Deleted.
+	(erc-button-add-buttons): Simplify.  In particular, create the
+	button using the real callback, instead of using the intermediate
+	erc-button-push, and only store the data as described for
+	erc-button-alist.
+	(erc-button-remove-old-buttons): Simplify.  No more list munging.
+	Instead, just remove all the properties that we add in
+	erc-button-add-button.
+	(erc-widget-press-button): Deleted.
+	(erc-button-click-button): New, for mouse clicks.  Moves point to
+	where the mouse is, and calls erc-button-push.
+	(erc-button-push): Instead of matching again, just use the
+	erc-callback and erc-data properties at point to do the right
+	thing.
+	(erc-button-entry): Deleted.
+	(erc-button-next): Use error instead of the beep plus message
+	combo.
+
+2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-autoaway.el 1.11 (erc-autoaway-set-back):
+	Don't pass a force argument to erc-cmd-GAWAY.
+
+	* erc.el 1.458 (erc-cmd-AWAY): Removed usage of the force variable.
+
+2003-01-17  Alex Schroeder  <alex@gnu.org>
+
+	* erc-button.el 1.40 (button):
+	erc-recompute-nick-regexp is no longer added to
+	erc-channel-members-changed-hook unconditionally, but only if
+	erc-button-mode is enabled, and if it is disabled, it is removed
+	again.
+	(erc): Require cl for delete-if.
+	(erc-button-remove-old-buttons): Rewrote using delete-if to
+	prevent exceesive consing.  Having the marker list is still ugly,
+	so another solution needs to be found.
+
+2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.457 (erc-banlist-store):
+	Don't assume there's always a setter in the banlist reply.
+
+2003-01-17  Alex Schroeder  <alex@gnu.org>
+
+	* erc-button.el 1.39 (erc-button-url-regexp): Changed regexp according
+	to a suggestion by Max Froumentin <mf@w3.org>.
+
+2003-01-17  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.456:
+	fix erc-remove-channel-member again to not error out on nil as first arg...
+
+	* erc.el 1.455: * (erc-occur): New function
+
+2003-01-17  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.454: erc-banlist-*: return nil so further hooks are called
+
+	* erc.el 1.453 (erc-server-368):
+	supress "end of ban list" messages - use /listbans now
+
+	* erc.el 1.452 (erc-send-current-line):
+	removed the check for leading whitespace again - the
+	    only time we want to prohibit multi-line commands is if / is the first
+	    thing on the line
+	(erc-get-arglist): new defun for reading a function's arglist which should
+	    work with older copies of emacs. we use help-function-arglist if it's
+	    available, though, since that has support for reading subrs, etc
+
+	* erc.el 1.451 (erc-cmd-JOIN): fixed (again)
+
+	* erc.el 1.450: * fixed call to erc-cmd-NICK when connecting
+	* support for listing bans and mass unbanning, again thanks to MrBump
+
+	* erc.el 1.449 (erc-set-topic):
+	patch from MrBump (Mark Triggs, mst@dishvelled.net) to strip
+	    control chars and topic attribution in C-c C-t
+
+2003-01-16  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.448:
+	* (erc-remove-channel-member): Do not use delq, modify the list using setcdr like delq does.
+	In theory, this should be way faster since the list doesnt get traverse two times.
+	Measurement didn't show any real difference though :(, this system is flawed for channels with >300 users it seems...
+	Also moved some defcustoms up.
+
+2003-01-16  Brian P Templeton  <bpt@tunes.org>
+
+	* erc.el 1.447: moved misplaced paren
+
+2003-01-16  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.446 (erc-cmd-UNIGNORE):
+	reference argument directly - no string matching
+
+	* erc.el 1.445 (erc-extract-command-from-line):
+	hmm, thinko in the canonicalisation. should
+	    be fixed
+
+2003-01-16  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.444 (erc-send-current-line):
+	Changed the regexp used to match /COMMANDs so that leading
+	    whitespace is taken into account.
+
+2003-01-16  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.61: * (erc-dcc-do-SEND-command): Fix it
+
+	* erc-ezbounce.el 1.4, erc-lang.el 1.2: Arglist changes...
+
+	* erc.el 1.443: Various docstring fixes and additions.
+
+	* erc-notify.el 1.16:
+	* (erc-cmd-NOTIFY): Change the function arglist to (&rest args)
+
+	* erc-netsplit.el 1.8: * (erc-cmd-WHOLEFT): Has no args...
+
+2003-01-16  Damien Elmes  <erc@repose.cx>
+
+	* erc-fill.el 1.22:
+	erc-fill-column: default to 78, so things like docstrings don't get wrapped
+	    in an ugly manner
+
+2003-01-16  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.442:
+	* (erc-cmd-default): Take a substring, now /mode works again.
+	* (erc-cmd-AWAY): Put do-not-parse-args t
+	* (erc-cmd-GAWAY): Ditto, and fix it.
+	* (erc-cmd-CTCP): Switch to argument system.
+	* (erc-cmd-KICK): Do the same.
+
+2003-01-15  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.60:
+	* (erc-cmd-DCC): Fixed for the new scheme, simplified.
+	* (erc-dcc-do-CHAT-command): Ditto.
+	* (erc-dcc-do-CLOSE-command): Ditto.
+	* (erc-dcc-do-LIST-command): Ditto.
+
+2003-01-15  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.441:
+	erc-error-face: setting a background doesn't work so well with multi-line
+	    messages, so we don't. fg colour is negotiable ;-)
+	(erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it
+	(erc-send-current-line): allow multi-line messages provided they don't start
+	    with a slash - there's no need to prohibit them if the slash isn't the
+	    first character
+
+	* erc.el 1.440: * bad-syntax now reports like incorrect-args
+	* bunch of extra cmds fixed, nick, sv etc.
+
+	* erc.el 1.439 (erc-cmd-HELP): fixed
+	(erc-extract-command-from-line): when deterimining canon-defun, make sure we
+	    have a valid symbol
+	(erc-cmd-KICK): fixed
+
+	* erc.el 1.438:
+	* removed duplicate do-no-parse-args properties for the defaliased defuns
+	(erc-process-input-line): show function signature when incorrect args
+	(erc-extract-command-from-line): canonicalise defaliases before extracting
+	    plist
+	(erc-cmd-CLEAR): fixed
+	(erc-cmd-UNIGNORE): fixed again
+
+	* erc.el 1.437 (erc-cmd-SET): fixed
+	(erc-cmd-UNIGNORE): fixed
+	(erc-process-input-line): report when incorrect arguments are provided to a
+	    command, and show the command's docstring
+
+	* erc.el 1.436 (erc-cmd-APPENDTOPIC): fixed
+	(erc-process-input-line): more informative error message than 'bad syntax'
+
+2003-01-15  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.435: * (erc-cmd-IGNORE): fixed
+
+	* erc.el 1.434: * (erc-cmd-NAMES): fixed
+
+	* erc.el 1.433:
+	* (erc-cmd-CLEARTOPIC): Simplify, fix doc, make interactive
+
+2003-01-15  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.432 (erc-cmd-JOIN):
+	correct invite behavior, and document it.
+
+2003-01-15  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.431: * (erc-cmd-PART): Put 'do-not-parse-args t
+
+2003-01-15  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.430 (erc-cmd-JOIN): new cmd argument syntax
+	(erc-process-input-line): check if (erc-extract-command-from-line) returned a
+	    list, and apply if that's the case
+
+	* erc.el 1.429:
+	erc-cmd-*: remove optional force and references to `force' in the code
+	(erc-cmd-AMSG): call erc-trim-string, not trim-string
+
+2003-01-15  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.428:
+	* (erc-cmd-CLEARTOPIC): LINE is now ARGS and already parsed.
+	Set erc-cmd-TOPIC to 'do-not-parse-args for now.
+	(comment: I think we should have 'first, so that only first word is parsed...
+	 Or we could autodetect erc-channel-p in the parser before that somehow...)
+
+	* erc.el 1.427: * (erc-cmd-OP): LINE is PEOPLE now, and already parsed.
+
+	* erc-notify.el 1.15:
+	* (erc-cmd-NOTIFY): Arg LINE is now ARGS, and already parsed.
+
+2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-stamp.el 1.25 (erc-insert-timestamp-right):
+	Prefer erc-fill-column to window-width,
+	because on wide screens the timestamp could wander off too far to the
+	right.
+
+2003-01-15  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.426: This is the "everything is suddenly broken!" release
+	You know, this is CVS, you can still go back, and wait until the transition
+	is finished, but here is patch one, which basicly breaks every command
+	which is typed on the prompt.
+	Hit me, we can still revert, but something needs to be done about this.
+	* (erc-extract-command-from-line): intern-soft the function here.
+	If the function symbol has a property 'do-not-parse-args, operate as before,
+	otherwise, split the arguments prior to calling the command handler.
+	* (erc-process-input-line): Updated to accomodate the change above.
+	* (erc-send-distinguish-noncommands): Ditto.
+	* (erc-cmd-NAMES): Ditto.
+	* (erc-cmd-ME): Put 'do-not-parse-args property.
+
+	* erc-dcc.el 1.59:nick:	* erc-dcc.el 1.59: * erc-dcc-list: Renamed 
+	* (erc-dcc-member). Treat :nick as either a nick!user@host or nick,
+	do appropriate comparisons, simplified.
+	* (erc-dcc-list-add): New functions
+	various callers of (cons (list ...) erc-dcc-list) updated.
+	Other stuff I'm to bored to document now
+
+2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-stamp.el 1.24 (erc-insert-timestamp-right):
+	Removed redundant code that overrid the
+	window-width. Now substracts (length string) from every found
+	indentation positions.
+
+2003-01-14  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.425:
+	* (erc-cmd-AMSG): Remove useless call to erc-display-message.
+
+	* erc-dcc.el 1.58:
+	* erc-dcc-chat/send-request: New variables, control how to treat
+	incoming dcc chat or send requests. Can be set to 'ask, which behaves
+	like it did before, 'auto, which accepts automatically, and
+	'ignore, which ignores those type of requests completely.
+	* (erc-cmd-CREQ): New user-level command.
+	* (erc-cmd-SREQ): Ditto.
+
+	* erc.el 1.424: * (erc-cmd-AMSG). New command.
+
+	* erc-xdcc.el 1.4: * (erc-xdcc): delete empty strings from ARGS
+
+	* erc-dcc.el 1.57: * erc-dcc-ipv4-regexp: New constant
+	* (erc-ip-to-decimal): Use it.
+	* erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:	* erc-dcc-host: :type
+	* (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE.
+	* Some docstring/comment fixes.
+
+	* erc-stamp.el 1.23:
+	* (erc-insert-timestamp-right): Subtract (length string) from
+	POS in any case, otherwise, linewrap occurs.
+
+	* erc-dcc.el 1.56:
+	* Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), 
+	  and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it!
+	* Added :start-time plist property/value to GET handling so that we can calculate elapsed-time.
+	* Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...)
+
+2003-01-13  Mario Lang  <mlang@delysid.org>
+
+	* erc-xdcc.el 1.3:
+	* erc-xdcc-help-text: New variable which makes replies to the originator
+	much more flexible.
+	* erc-xdcc-help-format: Removed.
+	* (erc-xdcc-help): Handle the new variable.
+	* (erc-xdcc): Simplified
+
+	* erc-xdcc.el 1.2: * erc-xdcc-handler-alist: New variable.
+	* (erc-xdcc): Move code for list and send sub-commands into
+	* (erc-xdcc-help): New function.
+	* (erc-xdcc-list): New function.
+	* (erc-xdcc-send): New function.
+
+2003-01-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.423 (erc-server-JOIN):
+	Oops, send MODE command only when *we* joined a channel.
+
+	* erc.el 1.422:
+	Fixing ERCs behavior wrt IRCnet's !channels have a different name for
+	JOIN than in reality (e.g. you can join !forcertest or !!forcertest
+	and really get to !ABCDEforcertest)
+
+	(erc-cmd-JOIN): Removed erc-send-command MODE.
+	(erc-server-JOIN): Ask for MODE now.
+
+2003-01-12  Damien Elmes  <erc@repose.cx>
+
+	* erc-dcc.el 1.55:
+	(erc-dcc-get-filter), (erc-dcc-get-file): store size as a string, not an
+	    integer. check size > 0 for the case where a size wasn't provided, since
+	    string-to-int will return 0 on an empty string
+
+2003-01-12  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.54: * Use RAWFILE arg with find-file-noselect
+	* Fix alist/plist conversion left-over
+	* Add verbose-info about sending blocks.
+
+2003-01-11  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.53: * (pcomplete-erc-mode/DCC): Fixes
+
+	* erc-xdcc.el 1.1: Initial version.
+
+	* erc-pcomplete.el 1.16:
+	* (erc-pcomplete): Fix so that cycle-completion works again.
+	* (pcomplete-parse-erc-arguments): If there is a space after the last word
+	before point, we need to return a "" arg, and it's position.
+
+	* erc-dcc.el 1.52: Fix to pcomplete/erc-mode/DCC
+
+	* erc-dcc.el 1.51: * (pcomplete/erc-mode/DCC): New function
+
+	* erc-dcc.el 1.50: *** empty log message ***
+
+	* erc-dcc.el 1.49: Move code around, just basic changes
+
+2003-01-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-stamp.el 1.22 (erc-insert-timestamp-right):
+	Check wether erc-fill-column is
+	available before using it. Else default to fill-column or if
+	everything else fails, the window width of the current window. For the
+	fill-columns, use them directly as the starting position for the
+	timestamp.
+
+2003-01-11  Andreas Fuchs  <asf@void.at>
+
+	* erc-stamp.el 1.21:
+	erc-insert-timestamp-right: use correct window's window-width. If
+	                  buffer is not in a window, use erc-fill-column.
+
+2003-01-11  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.48:	* erc-dcc.el 1.48: * (erc-dcc-do-LIST-command): Fix 
+
+	* erc-dcc.el 1.47:
+	* buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed
+	  Keep This info in erc-dcc-member :sent and :confirmed plist values
+	* :	* :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer 
+	* erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-conntected, which now prints a msg...
+
+	* erc-dcc.el 1.46:
+	* (erc-dcc-chat-accept): Renamed from erc-dcc-chat. Callers updated.
+	* (erc-dcc-chat): Renamed from erc-dcc-chat-request.
+	Callers updated, and interactive form added.
+	* (erc-dcc-server-accept): No longer do any type-specific stuff.
+	* (erc-dcc-chat-sentinel): Call erc-dcc-chat-setup if event is "open from "
+	from here, otherwise call erc-dcc-chat-close.
+
+	* (
+
+	* erc-dcc.el 1.45: *** empty log message ***
+
+	* erc-dcc.el 1.43: Moved some functions around.
+	Doc string fixes.
+	"/dcc send nick filename" works now
+
+2003-01-11  Alex Schroeder  <alex@gnu.org>
+
+	* erc.el 1.421 (erc-send-command): Fixed flood protect message.
+
+	* erc-button.el 1.38 (erc-button-syntax-table): Make `-' a legal nick
+	constituent.
+
+2003-01-10  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.42: Some more steps toward dcc send.
+
+2003-01-10  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-notify.el 1.14 (erc-notify-timer):
+	Changed to make it IRC-case-insensitive when comparing nicks.
+	(erc-notify-JOIN): Changed to make it IRC-case-insensitive when comparing nicks.
+	(erc-notify-NICK): Changed to make it IRC-case-insensitive when comparing nicks.
+	(erc-notify-QUIT): Changed to make it IRC-case-insensitive when comparing nicks.
+	(erc-cmd-NOTIFY): Now "/notify -l" lists the nicks on your notify list.  Now
+	    when you remove a nick from your notify list, you no longer recieve a spurious
+	    signoff notification for that nick.  Changed to make it IRC-case-insensitive when
+	    comparing nicks.
+
+	* erc.el 1.420 (erc-ison-p):
+	Fixed so it calls erc-member-ignore-case instead of member.
+
+	* erc.el 1.419 (erc-member-ignore-case):
+	New function.  Just like member-ignore-case, but obeys
+	    the IRC protocol case matching rules.
+
+2003-01-10  Damien Elmes  <erc@repose.cx>
+
+	* erc-dcc.el 1.41:
+	(erc-dcc-do-GET-command), (erc-dcc-get-file): use the plist syntax, this
+	    fixes dcc get again
+
+2003-01-10  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.418: erc-complete-functions: New variable.
+	erc-mode-map: Bind \t to 'erc-complete-word
+	erc-complete-word: New function.
+
+	* erc-pcomplete.el 1.15 (erc-pcomplete-mode):
+	Use new erc-complete-functions
+	(erc-pcomplete): Check that we're in the input line, else return nil.
+
+	* erc-button.el 1.37 (erc-button-mode): Use new erc-complete-functions
+	erc-button-old-tab-command: Removed.
+	(erc-button-next-or-old): Removed
+	(erc-button-next): check that we're not in the input line, else just return nil.
+
+2003-01-10  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.40: cleanup
+
+	* erc-dcc.el 1.39:
+	* (erc-dcc-chat-request): No longer use erc-send-ctcp-message.
+
+	* erc-dcc.el 1.38:
+	* (erc-dcc-no-such-nick): Also call delete-process if we have a peer already
+
+	* erc-dcc.el 1.37:
+	* (erc-dcc-no-such-nick): New function, server event handler for event 401.
+	If we send a CTCP message requesting something dcc related, we set up an
+	entry in erc-dcc-list before sending the request (for the server proc object
+	for listening conns for example).  But if that nick does not exist
+	on that server, we now nicely cleanup erc-dcc-list again.
+
+2003-01-09  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.36: Moved code around a bit, and doc fixes
+
+	* erc-dcc.el 1.35: *** empty log message ***
+
+	* erc-dcc.el 1.34: Rename erc-dcc-plist to erc-dcc-list
+
+2003-01-09  Damien Elmes  <erc@repose.cx>
+
+	* erc-dcc.el 1.33 (erc-dcc-server (erc-dcc-chat-setup):
+	use erc's (erc-setup-buffer) to determine how to
+	    display new DCC windows
+	(erc-dcc-chat-buffer-killed): buffer-local hook for DCC buffers to close the
+	    process
+	(erc-dcc-chat-close): code common to a killed buffer or a disconnection from
+	    the other side
+	(erc-dcc-chat-sentinel): use (erc-dcc-chat-close)
+	(erc-dcc-server-accept): use (erc-log) instead of (message)
+
+	* erc.el 1.417:
+	(erc), (erc-setup-buffer): factor out window generation code so DCC can use
+	    it too
+
+	* erc-dcc.el 1.32:
+	(erc-dcc-do-CLOSE-command), (erc-dcc-do-LIST-command): work with erc-dcc-plist
+
+	* erc-dcc.el 1.31:
+	erc-dcc-alist: became erc-dcc-plist, so we can more easily grab particular
+	    properties
+	dcc catalog: unify use of DCC: and [dcc] (either's fine, but let's be
+	    consistent)
+	(erc-dcc-member): takes an arbitrary list of constraints now
+	(erc-dcc-proc-member): removed, as (erc-dcc-member) can be used for this
+	(erc-dcc-do-CHAT-command): use the catalog to show the user what's going on
+	(erc-dcc-chat-server): removed
+	(erc-dcc-server): takes name sentinel and filter arguments, can be used for
+	    both send and chat now
+
+	.. this release means all send/get support is broken until we fix up the
+	things that still expect to be using an alist. this include /dcc list, /dcc
+	close
+
+2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-ring.el 1.9 (erc-previous-command):
+	If you have a partially typed input line and press M-p,
+	    you lose what you typed.  Now we save it so you can come back to it.
+
+2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-ring.el 1.8 (erc-add-to-input-ring): s/nullp/null/
+
+2003-01-09  Damien Elmes  <erc@repose.cx>
+
+	* erc-ring.el 1.7 (erc-add-to-input-ring):
+	set up the ring if it's not already setup
+
+	* erc-dcc.el 1.30 (erc-dcc-member): case insensitive match of nicknames
+	(erc-dcc-do-CHAT-command): echo what we're doing (at least for now)
+
+2003-01-09  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.29: (temporarily) fix erc-process setting...
+
+	* erc-dcc.el 1.28: * (erc-dcc-chat-send-line): Removed
+
+	* erc.el 1.416:
+	Check if target is stringp (we can now also have 'dcc as value...)
+
+	* erc-dcc.el 1.27 (erc-dcc-chat-send-input-line):
+	New function, used for
+	erc-send-input-line-function.
+	Use erc-send-current-line now.
+
+	* erc-dcc.el 1.26: evt to elt...
+
+	* erc-dcc.el 1.25: Remove () from a var (how silly!)
+
+	* erc-dcc.el 1.24: * (erc-dcc-get-host): Use format-network-address.
+	* (erc-dcc-host): Change semantic.  If erc-dcc-host is set, use it.
+	Otherwise, try to figure out the host by calling erc-dcc-get-host.
+	* (erc-dcc-server-port): New variable.
+	* erc-dcc-chat-log: Renamed to erc-dcc-server-accept
+
+	* erc-dcc.el 1.23 (erc-dcc-do-CHAT-command):
+	Change arg of call to erc-dcc-chat-request from elt to nick
+
+2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.415 (erc-send-current-line):
+	Now rejects multi-line commands (i.e., lines that
+	    start with "/" and contain newlines).
+
+2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-button.el 1.36:
+	Functionality to use TAB to jump to the next button:
+
+	(erc-button-next-or-old): New function.
+	(erc-button-next): New function.
+	erc-button-keymap: added erc-button-next
+	erc-button-old-tab-command: New variable.
+	define-erc-module button: Add and remove 'erc-button-next-or-old as
+	appropriate.
+
+2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.414:
+	New variable: erc-auto-reconnect (defaults to t).  If non-nil, ERC will
+	    automatically reconnect to a server after an unexpected disconnection.
+	(erc-process-sentinel): Changed to refer to variable erc-auto-reconnect.
+
+2003-01-08  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.413:
+	* erc-send-input-line-function: New variable, used for dispatch...
+
+2003-01-08  Damien Elmes  <erc@repose.cx>
+
+	* erc-dcc.el 1.22 (erc-dcc-chat-sentinel):
+	check event type before killing process
+	(erc-dcc-chat-log): new, handles the setup of dcc chats for incoming
+	    connections
+	(erc-dcc-chat): use (erc-dcc-chat-setup)
+	(erc-dcc-chat-setup): code common to incoming and outgoing DCC chats
+	(erc-dcc-chat-request): request a DCC chat with another user
+	(erc-dcc-proc-member): locate a member in erc-dcc-alist by process
+
+	The very first ERC to ERC DCC chat was held between delysid and resolve today!
+
+2003-01-08  Mario Lang  <mlang@delysid.org>
+
+	* erc-track.el 1.44 (erc-all-buffer-names):
+	Check for erc-dcc-chat-mode too
+
+2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-ring.el 1.6, erc.el 1.412 (erc-kill-input):
+	Resets erc-input-ring-index to nil, so that invoking this
+	    command conceptually puts you after your most recent input in the input
+	    history.
+	(erc-previous-command and erc-next-command): Changed so that history movement
+	    is more intuitive.  Also preserves the blank input line that marks the
+	    place after the newest command in the history ring (i.e., you'll see a
+	    blank command once every trip around the ring in either direction).
+
+2003-01-08  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.21 (erc-dcc-chat): Add docstring
+	Add self-test.
+	Fix error if /dcc chat nick doesnt find the nick
+
+2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
+
+	* Makefile 1.12:
+	Changed so that "make" works correctly under Cygwin.  Before this change, the
+	pathname passed to Emacs on the command line under Cygwin had the form
+	"/cygwin/c/...", which prevented emacs from finding the file.  Now the pathname
+	has the form "c:/...".  This works for any drive letter.
+
+2003-01-08  Mario Lang  <mlang@delysid.org>
+
+	* erc-button.el 1.35: reindent some code, and add TODO to comments
+
+	* erc-dcc.el 1.20: *** empty log message ***
+
+	* erc-dcc.el 1.19: Make dcc-chat-ended a notice
+	Remove now bogus comment
+
+2003-01-08  Damien Elmes  <erc@repose.cx>
+
+	* erc-dcc.el 1.18 (erc-pack-int): from erc-packed-int
+	(erc-unpack-int): new
+
+	* erc-dcc.el 1.17 (erc-unpack-str): added
+
+2003-01-08  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.411 (erc-server-482):
+	New handler, handles KICK reply if you're not channel-op
+
+	* erc-dcc.el 1.16: Document SEND in erc-dcc-alist.
+	Move sproc, parent-proc and file into erc-dcc-alist
+
+	* erc-dcc.el 1.15: stubs
+
+	* erc-dcc.el 1.14 (erc-dcc-get-host):
+	Change :iface to :local since Kim committed it now to CVS emacs
+
+	* erc-dcc.el 1.13 (erc-dcc-get-host):
+	New function, requires the not-yet-in-CVS-emacs local-address.patch to process.c.
+	Some other minor additions
+
+2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.410 (erc-cmd-IGNORE):
+	Now returns t to prevent "Bad syntax" error.
+	(erc-cmd-UNIGNORE): Now returns t to prevent "Bad syntax" error.
+	(erc-server-PRIVMSG-or-NOTICE): Capitalized first word in message to user.
+
+	* erc.el 1.409 (erc-scroll-to-bottom):
+	Temporarilly bind resize-mini-windows to nil so that
+	    users who have it set to a non-nil value will not suffer from premature
+	    minibuffer shrinkage due to the below recenter call.  I have no idea why
+	    this works, but it solves the problem, and has no negative side effects.
+
+2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc-dcc.el 1.12:
+	erc-dcc-ctcp-query-chat-regexp: The IP is not really an IP, but a
+	number (no . allowed there).
+	(erc-dcc-send-ctcp-string): use let* here to avoid cluttering up the
+	match data.
+	Also, use erc-decimal-to-ip to get the IP.
+	(erc-ip-to-decimal): Removed some pasted ERC timestamps
+	(erc-decimal-to-ip): New function.
+	erc-dcc-chat-mode-map: Return map in the initialization.
+
+2003-01-07  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc-match.el 1.19 (erc-match-fool-p):
+	Changed to call erc-match-directed-at-fool-p instead of
+	     erc-directed-at-fool-p.
+
+2003-01-07  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.11 (erc-cmd-DCC):
+	Change (cond ... (t nil)) to (when ...)
+
+	* erc-dcc.el 1.10: Use erc-current-nick-p
+
+2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.408:
+	erc-join-buffer: Added 'window-noselect to docstring and :type.
+	erc-auto-query: Added 'window-noselect to :type.
+	(erc): Treat erc-join-buffer being 'window-noselect appropriately.
+
+	* erc.el 1.407 (erc-current-nick-p): New function.
+	(erc-nick-equal-p): New function.
+	(erc-already-logged-in), (erc-server-JOIN), (erc-auto-query),
+	(erc-server-PRIVMSG-or-NOTICE): Use erc-current-nick-p.
+	(erc-update-channel-member): Use erc-nick-equal-p.
+
+	* erc-match.el 1.18 (erc-match-current-nick-p):
+	Renamed from erc-current-nick-p
+	(erc-match-pal-p): Renamed from erc-pal-p
+	(erc-match-fool-p): Renamed from erc-fool-p
+	(erc-match-keyword-p): Renamed from erc-keyword-p
+	(erc-match-dangerous-host-p): Renamed from erc-dangerous-host-p
+	(erc-match-directed-at-fool-p): Renamed from erc-directed-at-fool-p
+	(erc-match-message): Use erc-match-TYPE-p instead of erc-TYPE-p
+
+	* erc.el 1.406:
+	Support for IRCnets' "nick/channel temporarily unavailable"
+
+	(erc-nickname-in-use): New function (mostly copied from erc-server-433).
+	(erc-server-433): Use erc-nickname-in-use
+	(erc-server-437): New function.
+	erc-server-hook-list: Added (437 erc-server-437).
+
+2003-01-07  Mario Lang  <mlang@delysid.org>
+
+	* erc-fill.el 1.21: Add autoload cookie
+
+	* erc-notify.el 1.13:
+	Now also pass SERVER argument to signon/off hooks, and provide a erc-notify-signon/off function for echo-area printing
+
+	* erc-notify.el 1.12 (erc-notiy-QUIT):
+	Change use of delq to delete, delq does not work with strings
+
+2003-01-06  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.405 (erc-ctcp-query-VERSION):
+	v%s -> %s, so we are no longer vVersion...
+
+2003-01-06  Mario Lang  <mlang@delysid.org>
+
+	* erc.el 1.404: Small change to erc-ison-p, and fixme tag
+
+2003-01-06  Francis Litterio  <franl@users.sourceforge.net>
+
+	* erc.el 1.403 (erc):
+	Fixed bug where variable "away" would be nil in new channel buffers
+	       even if the user is away when joining the channel.
+	(erc-strip-controls): Fixed a bug where erc-strip-controls accidentally
+	       removed all text properties from the string.
+
+2003-01-06  Mario Lang  <mlang@delysid.org>
+
+	* erc-dcc.el 1.9:
+	Some stub functions, some code, nothing really works yet
+
+	* erc.el 1.402 (erc-ison-p): New function
+
+	* erc-dcc.el 1.8: Some functions which will be needed for dcc send
+
+	* erc-dcc.el 1.7 (erc-ip-address-to-decimal):
+	New function, thanks lawrence
+
+	* erc-dcc.el 1.6: Again, simplify code, fix stuff, DCC CHAT works now
+
+	* erc-dcc.el 1.5: Many fixes, chat nearly works now
+
+	* erc-netsplit.el 1.7: Also detect fast netsplit/joins
+
+	* erc-dcc.el 1.4: some more fixes
+
+	* erc-dcc.el 1.3: Fixup stage 1, now dcc get works
+
+	* erc-dcc.el 1.2: make /dcc LIST work
+
+	* erc-dcc.el 1.1:
+	Initial checkin, dont use it!  its really far from complete.  Hackers: help!
+
+	* erc-notify.el 1.11:
+	New function erc-notify-NICK, and added signon/off hooks which were missing
+
+2003-01-05  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el 1.401 (erc-truncate-buffer-to-size):
+	set inhibit-read-only to t for the
+	deletion. This is usually done by the function calling the hook, but
+	not if it's called interactively. Also, rewrote some weird if/if
+	combination.
+
+	* erc-track.el 1.43 (erc-track-shortennames):
+	Documentation fix (erc-all-buffers is really
+	erc-all-buffer-names)
+
+	These changes make server buffers be tracked as well, as there are
+	quite a few interesting things going on there (e.g. CTCP etc.)
+	(erc-all-buffer-names): Check for (eq major-mode 'erc-mode) instead of
+	erc-default-recipients.
+	(erc-track-modified-channels): Don't require a default target (e.g.,
+	this-channel being non-nil)
+
+2003-01-03  Damien Elmes  <erc@repose.cx>
+
+	* erc.el 1.400:
+	erc-auto-query: can now be set to a symbol to control how new messages should
+	    be popped up (or not popped up, as the case may be)
+	(erc-query): new function which handles the bulk of what (erc-cmd-QUERY) did
+	    previously
+	(erc-cmd-QUERY): use (erc-query)
+	(erc-auto-query): use (erc-query)
+
+	* erc.el 1.399 (erc-current-logfile):
+	Downcase result of log generation function, as IRC is
+	case insensitive. Fixes problems where "/query user" results in a different
+	log file to a query from "User". Avoided adding an extra flag to control this
+	behavior - if you think this was the wrong decision, please correct it and
+	I'll remember it for next time.
+
+See ChangeLog.02 for earlier changes.
+
+    Copyright (C) 2003 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.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;; arch-tag: 808865e1-3cce-4c5b-9997-95a8b7a9d384
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/erc/ChangeLog.04	Sun Feb 12 00:15:44 2006 +0000
@@ -0,0 +1,2080 @@
+2004-12-29  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-goodies.el (erc-interpret-controls-p): Changed docstring to
+	reflect the new meaning if this is set to 'remove.
+	(erc-controls-interpret): Rephrased docstring to be more accurate.
+	(erc-controls-strip): New function that behaves like the
+	recently-removed erc-strip-controls -- it removes all IRC color
+	and highlighting control characters.
+	(erc-controls-highlight): Changed to support the new 'remove value
+	that variable erc-interpret-controls-p might have.
+
+2004-12-28  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-ibuffer.el, erc-list.el, erc-page.el, erc-speedbar.el:
+	Changed all calls to erc-interpret-controls (which no longer
+	exists) to call erc-controls-interpret (the new name of the same
+	function).
+
+2004-12-28  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-goodies.el (erc-controls-interpret): Added this function to
+	replace the recently-removed erc-interpret-controls.  Also added
+	a (require 'erc) to solve a byte-compile problem.
+
+2004-12-28  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-controls-interpret): Added this function to replace
+	the recently-removed erc-interpret-controls.
+
+2004-12-27  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-truncate.el (erc-truncate-buffer-to-size): Check for
+	logging even better (via lawrence).
+
+2004-12-26  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-truncate.el (erc-truncate-buffer-to-size): Much saner
+	logging detection (via lawrence).
+
+2004-12-25  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-goodies.el (erc-controls-highlight): Treat single C-c
+	correctly.
+
+2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-goodies.el, erc.el: Deleted IRC control character processing
+	and implemented a sane version in erc-goodies.el as a module.
+
+	* erc.el (erc-merge-controls, erc-interpret-controls,
+	erc-decode-controls, erc-strip-controls, erc-make-property-list,
+	erc-prepend-properties): Removed.
+
+	(erc-interpret-controls-p, erc-interpret-mirc-color, erc-bold-face
+	erc-inverse-face, erc-underline-face, fg:erc-color-face0,
+	fg:erc-color-face1, fg:erc-color-face2, fg:erc-color-face3,
+	fg:erc-color-face4, fg:erc-color-face5, fg:erc-color-face6,
+	fg:erc-color-face7, fg:erc-color-face8, fg:erc-color-face9,
+	fg:erc-color-face10, fg:erc-color-face11, fg:erc-color-face2,
+	fg:erc-color-face13, fg:erc-color-face14, fg:erc-color-face15,
+	bg:erc-color-face1, bg:erc-color-face2, bg:erc-color-face3,
+	bg:erc-color-face4, bg:erc-color-face5, bg:erc-color-face6,
+	bg:erc-color-face7, bg:erc-color-face8, bg:erc-color-face9,
+	bg:erc-color-face10, bg:erc-color-face11, bg:erc-color-face2,
+	bg:erc-color-face13, bg:erc-color-face14, bg:erc-color-face15,
+	erc-get-bg-color-face, erc-get-fg-color-face,
+	erc-toggle-interpret-controls): Moved.
+
+	* erc-goodies.el (erc-beep-p, irccontrols, erc-controls-highlight,
+	erc-controls-propertize): New.
+
+2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit.
+	 Moved some functions from erc.el to erc-goodies.el, and
+	transformed them to erc modules in the process.
+	- imenu autoload stuff moved. I don't know why it is here at all.
+	- Moved: scroll-to-bottom, make-read-only, distinguish-noncommands,
+	smiley,   unmorse, erc-occur (the last isn't a module, but still
+	moved)
+	(erc-input-line-position, erc-add-scroll-to-bottom,
+	erc-scroll-to-bottom, erc-make-read-only, erc-noncommands-list,
+	erc-send-distinguish-noncommands, erc-smiley, erc-unmorse,
+	erc-occur): Moved from erc.el to erc-goodies.el.
+	(smiley): Module moved from erc.el to erc-goodies.el.
+	(scrolltobottom, readonly, noncommands, unmorse): New modules.
+
+2004-12-20  Diane Murray <disumu@x3y2z1.net>
+
+	* erc.el: (erc-format-away-status): Use `a', not `away' - that's
+	why it's there.
+	(erc-update-mode-line-buffer): The values of `mode-line-process'
+	and `mode-line-buffer-identification' are normally lists.
+	Conform.
+
+2004-12-18  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: (erc-process-ctcp-query, erc-process-ctcp-reply): Display
+	message in the active window, not the server window.
+
+2004-12-16  Edward O'Connor <ted@oconnor.cx>
+
+	* erc-track.el (erc-track-position-in-mode-line): Check for
+	'erc-track-mode variable with boundp. From Adrian Aichner
+	<adrian@xemacs.org>.
+
+2004-12-16  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-upcase-first-word): New function. The old way used
+	in erc-send-ctcp-message would eat consecutive whitespace etc.
+	(erc-send-ctcp-message, erc-send-ctcp-notice): Use it.
+
+2004-12-15  Edward O'Connor <ted@oconnor.cx>
+
+	* erc.el (erc-send-ctcp-message): Fix braino with my previous
+	patch. It always helps to C-x C-s before `cvs commit'.
+
+2004-12-15  Edward O'Connor <ted@oconnor.cx>
+
+	* erc.el (erc-send-ctcp-message): Only upcase the ctcp command,
+	and not the entire message. Revision 1.707 had broken /me.
+	Shouting is bad! :)
+
+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 <disumu@x3y2z1.net>
+
+	* erc-backend.el: (def-edebug-spec): Only run this if 'edebug is
+	available.
+
+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
+	following changes fix the bug and simplify the mode-line handling
+	considerably.  (erc-mode-line-format): Now defined as a string
+	which will be formatted using `format-spec' and take the place of
+	`mode-line-buffer-identification' in the mode line.
+	(erc-header-line-format): Now defined as a string to be formatted
+	using `format-spec'.
+	(erc-prepare-mode-line-format): Removed.
+	(erc-format-target, erc-format-target-and/or-server,
+	erc-format-away-status, erc-format-channel-modes): New functions.
+	Basically the old `erc-prepare-mode-line-format' split apart.
+	(erc-update-mode-line-buffer): Set
+	`mode-line-buffer-identification' to the formatted
+	`erc-mode-line-format', set `mode-line-process' to ": CLOSED" if
+	the connection has been terminated, and set `header-line-format'
+	(if it is bound) to the formatted `erc-header-line-format', then
+	do a `force-mode-line-update'.
+
+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 <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,
+	erc-truncate.el: (erc-buffers, erc-coding-systems, erc-display,
+	erc-mode-line-and-header, erc-ignore, erc-query,
+	erc-quit-and-part, erc-paranoia, erc-scripts, erc-old-complete,
+	erc-list, erc-networks, erc-nicklist, erc-pcomplete, erc-replace,
+	erc-truncate): New customization groups.  (erc-join-buffer,
+	erc-frame-alist, erc-frame-dedicated-flag, erc-reuse-buffers): Use
+	'erc-buffers as `:group'.  (erc-default-coding-system,
+	erc-encoding-coding-alist): Use 'erc-coding-systems as `:group'.
+	(erc-hide-prompt, erc-show-my-nick, erc-prompt,
+	erc-input-line-position, erc-command-indicator, erc-notice-prefix,
+	erc-notice-highlight-type, erc-interpret-controls-p,
+	erc-interpret-mirc-color, erc-minibuffer-notice,
+	erc-format-nick-function): Use 'erc-display as `:group'.
+	(erc-mode-line-format, erc-header-line-format,
+	erc-header-line-uses-help-echo-p, erc-common-server-suffixes,
+	erc-mode-line-away-status-format): Use 'erc-mode-line-and-header
+	as `:group'.
+	(erc-hide-list, erc-ignore-list, erc-ignore-reply-list,
+	erc-minibuffer-ignored): Use 'erc-ignore as `:group'.
+	(erc-auto-query, erc-query-on-unjoined-chan-privmsg,
+	erc-format-query-as-channel-p): Use 'erc-query as `:group'.
+	(erc-kill-buffer-on-part, erc-kill-queries-on-quit,
+	erc-kill-server-buffer-on-quit, erc-quit-reason-various-alist,
+	erc-part-reason-various-alist, erc-quit-reason, erc-part-reason):
+	Use 'erc-quit-and-part as `:group'.
+	(erc-verbose-server-ping, erc-paranoid, erc-disable-ctcp-replies,
+	erc-anonymous-login, erc-show-channel-key-p): Use 'erc-paranoia as
+	`:group'.
+	(erc-startup-file-list, erc-script-path, erc-script-echo): Use
+	'erc-scripts as `:group'.
+	(erc-nick-completion, erc-nick-completion-ignore-case,
+	erc-nick-completion-postfix): Use 'erc-old-complete as `:group'.
+	(erc-chanlist-progress-message, erc-no-list-networks,
+	erc-chanlist-frame-parameters, erc-chanlist-hide-modeline,
+	erc-chanlist-mode-hook): Use 'erc-list as `:group'.
+	(erc-server-alist, erc-networks-alist): Use 'erc-networks as
+	`:group'.
+	(erc-settings): Use `defvar' instead of `defcustom' since this is
+	only a draft which doesn't work.
+	(erc-nicklist-window-size): Use 'erc-nicklist as `:group'.
+	(erc-pcomplete-nick-postfix,
+	erc-pcomplete-order-nickname-completions): Use 'erc-pcomplete as
+	`:group'.
+	(erc-replace-alist): Use 'erc-replace as `:group'.
+	(erc-speak-filter-timestamp): Use 'erc-speak as `:group'.
+	(erc-max-buffer-size): Use 'erc-truncate as `:group'.
+
+2004-12-12  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-scroll-to-bottom): Go to the end of the buffer
+	before recentering. This allows editing multiple lines more
+	conveniently in CVS Emacs. This also undos a change by antifuchs
+	who said this goto-char would mess up redisplay. Extensive testing
+	couldn't reproduce that problem.
+
+2004-12-12  Brian Palmer <bpalmer@gmail.com>
+
+	* erc.el (erc-send-ctcp-message): upcase the ctcp message (so that
+	version becomes VERSION, for example).
+	(erc-iswitchb): Make the argument optional in non-interactive
+	invocation, so erc-iswitchb can be substituted directly for
+	iswitchb in code.
+
+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 <disumu@x3y2z1.net>
+
+	* erc-track.el (erc-track-position-in-mode-line): New customizable
+	variable.  (erc-track-remove-from-mode-line): New function.
+	Remove `erc-modified-channels-string' from the mode-line.
+	(erc-track-add-to-mode-line): New function.  Add
+	`erc-modified-channels-string' to the mode-line using the value of
+	`erc-track-position-in-mode-line' to determine whether to add it
+	to the beginning or the end of `mode-line-modes' (only available
+	with GNU Emacs versions above 21.3) or to the end of
+	`global-mode-string'.
+	(erc-track-mode, erc-track-when-inactive-mode): Use the new
+	functions.
+
+2004-12-11  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: (erc-cmd-BANLIST): Use (buffer-name) and not
+	(erc-default-target) for the buffer name - buffer names are case
+	sensitive.
+
+2004-12-11  Brian Palmer <bpalmer@gmail.com>
+
+	* erc.el (erc-message-type): Added the message "MODE" to the known
+	erc-message-type widget, so that (for example) people can tell
+	erc-track-exclude-types to ignore mode changes. The others tag
+	also needed to be made an inline list, so that it's merged with
+	the given constants, instead of being inserted as a list.
+
+2004-12-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-track.el, erc.el: Update to get ERC look nicely in CVS Emacs.
+
+	* erc.el (erc-mode-line-format): When on CVS emacs, use the new
+	format.
+
+	* erc-track.el (track module): When on CVS emacs, modify
+	mode-line-modes instead of global-mode-string. The latter is way
+	to far too the right.
+
+2004-11-18  Mario Lang <mlang@delysid.org>
+
+	* Makefile, debian/changelog: debian release 20041118-1
+
+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
+	usage.
+
+2004-10-29  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* AUTHORS: Added self.
+
+2004-10-17  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-list.el: Added local variables for this file.
+	(erc-list-version): New.
+	(erc-cmd-LIST): Take &rest rather than &optional arguments, as was
+	done in revision 1.21.  Allow for input when called interactively.
+	(erc-prettify-channel-list, erc-chanlist-toggle-sort-state): Use
+	`unless' instead of when not.
+
+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
+	the server buffer if it's the first MOTD sent upon connection.
+	This is to avoid the problem of having the MOTD of one server
+	showing up in another server's buffer if it took a while to get
+	connected.
+	(004): Fixed to show the user modes and channel modes correctly.
+	(303): Now displays the nicknames returned by ISON instead of the
+	user's nickname.
+	(367, 368): Moved up into 300's section of the code.  Added
+	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 <disumu@x3y2z1.net>
+
+	* erc.el (erc-process-sentinel): Use CPROC instead of
+	`erc-process' in debug message.  Should fix a bug where an error
+	saying "Buffer *scratch* has no process" would occur when
+	disconnected.
+	(erc-cmd-SV): Check for X toolkit after checking for more specific
+	features.  (erc--kill-server): Set `quitting' to non-nil so that
+	we don't automatically reconnect.
+
+2004-10-05  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: (erc-ignored-user-p): Don't require regexes to match the
+	beginning.
+
+2004-09-11  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: group erc: Moved to 'applications (patch by bojohan)
+
+2004-09-08  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-button.el: (erc-button-remove-old-buttons): Remove 'keymap
+	not 'local-map.
+
+2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-backend.el: JOIN response handler: Typo fix of the last
+	commit.
+
+2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-backend.el: JOIN response handler: Run `erc-join-hook'
+	without arguments as specified in the docstring.
+
+2004-08-27  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-send-current-line): Removed unused variable SENTP.
+
+2004-08-19  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: ERC-SEND-COMPLETED-HOOK used to be run when the prompt
+	was already displayed. We restore this behavior (thanks to bojohan
+	and TerryP for noticing). We also fix the docstring of
+	ERC-SEND-COMPLETED-HOOK, since the hook is (and used to be) called
+	even if nothing was sent to the server.
+	(erc-send-completed-hook): Fixed docstring.
+	(erc-send-current-line): Add incantation for
+	erc-send-completed-hook.
+	(erc-send-input): Remove incantation for erc-send-completed-hook.
+
+2004-08-18  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-backend.el: response-handler 368: Use s368, not s367.
+
+2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-scroll-to-bottom): Don't scroll when we're not
+	connected anymore.
+
+2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-backend.el, erc.el: Handle /mode #emacs b output without
+	errors and such. First, handle unknown format specs gracefully
+	(that is, give a useful error). Then, provide handlers for the
+	banlist replies.
+
+	* erc-backend.el: New handler for 367 and 368. Removed from default
+	handler.
+
+	* erc.el: Provide english catalog for s367 and s368.
+	(erc-format-message): Give an error message when we don't find an
+	entry.
+
+2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-fill.el: erc-fill-variable could be confused about really
+	long nicks. We put an upper limit on the length of the fill prefix.
+	(erc-fill-variable): Adjust fill-prefix.
+	erc-fill-variable-maximum-indentation: New variable.
+
+2004-08-17  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-send-input): Fixed a bug where this function
+	referenced variable "input" instead of variable "str".
+
+2004-08-16  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-list.el (erc-chanlist-highlight-line): Fixed a bug where
+	this function failed to set the correct face for highlighting the
+	current line.
+
+2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-fill.el (erc-fill-variable): Don't fuck up when the
+	looking-at didn't work.
+
+2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-send-single-line): Call the hooks to change the
+	appearance for something only if we actually inserted something,
+	doh.
+	(erc-display-command): Display the prompt outside of the area that
+	set the text properties on.
+
+2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: Refactored erc-send-current-line. This should fix some
+	dormant bugs, and make the whole thing actually readable. Yay.
+	Some changes in behavior were made. Whitespace at the end of lines
+	sent is not removed anymore, but that shouldn't bother anyone.
+	Additionally, errors in commands or hooks shouldn't prevent the
+	prompt from showing up again now.
+	(erc-parse-current-line): Removed.
+	(erc-send-current-line): Refactored.
+	(erc-send-input): New function.
+	(erc-send-single-line): New function.
+	(erc-display-command): New function.
+	(erc-display-msg): New function.
+	(erc-user-input): New function.
+
+2004-08-13  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-cmd-SERVER): Use newer keyword call interface to
+	erc-select, and handle the error if it can't resolve the host.
+
+2004-08-11  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-backend.el, erc.el: erc-backend.el (404 response handler):
+	New function. We now support "cannot send to channel".
+
+	* erc.el (erc-define-catalog call): Added s404. erc.el
+	(erc-ctcp-ECHO-reply, erc-ctcp-CLIENTINFO-reply,
+	erc-ctcp-FINGER-reply, erc-ctcp-PING-reply, erc-ctcp-TIME-reply,
+	erc-ctcp-VERSION-reply): Display reply in the active window, not
+	the server window.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-with-all-buffers-of-server): Actually make it left
+	to right, doh.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-with-all-buffers-of-server): Evaluate left-to-right
+	so we don't surprise a user.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-process-input-line): Parentophobia! Another
+	paren-fix.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-backend.el: PRIVMSG NOTICE response handler: Killed one paren
+	too much. Poor paren. Got resurrected.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-track.el: Make server buffers showing up in the mode line
+	optional. Thanks to Daniel Knapp on the EmacsWiki for this patch.
+
+	erc-track-exclude-server-buffer: New variable.
+	(erc-track-modified-channels): Return a server buffer only if
+	erc-track-exclude-server-buffer is nil.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: (erc-cmd-DESCRIBE): Don't parse arguments.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-truncate.el: (erc-truncate-buffer-to-size): Use
+	erc-insert-marker, not (point-max), to decide the length of the
+	buffer. A long input line shouldn't make the buffer smaller.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-macs.el, erc-members.el: The change to hashes for channel
+	members has been made some time ago.  Clean up the various tries to
+	do this in the past.
+
+	erc-macs.el: Removed.  erc-members.el: Removed.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-backend.el, erc-ibuffer.el, erc-members.el, erc.el: Nothing
+	big changed here. Really. Uhm, maybe the info-buffers are gone or
+	so.  Can't really remember. Don't worry, nothing important is
+	missing.
+
+	erc-speedbar.el looks nice btw, did you know?
+
+	Adjusted various places in erc.el, erc-backend.el, erc-ibuffer.el
+	and erc-members.el - too numerous to list here, sorry.
+
+	* erc.el: erc-use-info-buffers: Removed.  erc-info-mode-map:
+	Removed.
+	(erc-info-mode): Removed.
+	(erc-find-channel-info-buffer): Removed.
+	(erc-update-channel-info-buffer): Removed.
+	(erc-update-channel-info-buffers): Removed.
+
+	* erc-members.el: erc-update-member renamed to
+	erc-update-channel-member for better clarity.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: This change improves the help output on a bogus command
+	invocation. We display the command as it would be typed by the
+	user, not as it is seen by Emacs.
+
+	(erc-get-arglist): Is now called erc-function-arglist, and returns
+	now an arglist without the enclosing parens.
+	(erc-command-name): New function.
+	(erc-process-input-line): Pass the command name, not the function
+	name.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: (erc-process-input-line): Fix bug when the command
+	doesn't have an arglist or no documentation. Thanks bojohan again
+	:)
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-match.el: (erc-add-entry-to-list),
+	(erc-remove-entry-from-list): Update docstring, a TEST argument is
+	not given.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-with-buffer): Really fix this docstring.
+
+2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-with-buffer): Fix double evaluation in macro, and
+	fix docstring.
+
+2004-08-10  Brian Palmer <bpalmer@gmail.com>
+
+	* erc.el (erc-cmd-JOIN): Use erc-member-ignore-case instead of
+	member-ignore-case.
+
+2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-backend.el: Define an "Edebug specification" for the
+	`define-erc-response-handler' macro. This means that one can step
+	through response handlers defined by this macro with edebug. Maybe
+	more macros would benefit from this?
+
+2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-pcomplete.el (pcomplete/erc-mode/CTCP): New function.
+	Completion for the /CTCP command.  (erc-pcomplete-ctcp-commands):
+	New variable. List of ctcp commands.
+
+2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-list.el: Clean up docstrings.
+	(erc-prettify-channel-list): Extend properties to cover the entire
+	line, including the newline, to make it look
+	better.
+	(erc-chanlist-highlight-line): Ditto.
+	(erc-chanlist-mode-hook): Make it a defcustom.
+
+2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-compute-full-name): Typo fix, should be full-name,
+	not name.
+
+2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc): Setup the buffer to be shown in a window at the
+	end of this function. This enables 'window-noselect to work
+	properly.
+	(erc, erc-send-current-line): Fix some
+	goto-char/open-line/goto-char to goto-char/insert.
+
+2004-08-08  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-parse-user): Live with bogus info from bouncers.
+
+2004-07-31  Brian Palmer <bpalmer@gmail.com>
+
+	* erc.el (erc-select): Change the docstring to reflect the new
+	arguments; include the arguments in the docstring for non-cvs
+	emacs. Change the parameters to call erc-compute-* instead of
+	using the erc-* variables directly.
+	(erc-compute-server): Made argument optional.
+	(erc-compute-nick): ditto.
+	(erc-compute-full-name): ditto.  (erc-compute-port): ditto.
+
+2004-07-30  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el: (erc-cmd-BANLIST): Fixed a bug where channel-banlist was
+	not reset to nil before fetching an updated banlist from the
+	server.
+
+2004-07-30  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el: (erc-cmd-BANLIST): Fixed a bug where the
+	'received-from-server property on variable channel-banlist was not
+	being reset to nil.  This fixes the symptom where one types
+	/BANLIST and sees "No bans for channel: #whatever" when you know
+	there are bans.
+
+2004-07-23  Brian Palmer <bpalmer@gmail.com>
+
+	* erc.el: (erc-select-read-args): Use erc-compute-nick to
+	calculate the default nickname
+
+2004-07-20  Brian Palmer <bpalmer@gmail.com>
+
+	* erc.el: (erc-process-sentinel-1): New function. This is an
+	auxiliary function refactored out of erc-process-sentinel to
+	decide a server buffer's fate (whether it should be killed, and
+	whether erc should attempt to auto-reconnect).  Michael Olson
+	<mwolson@gnu.org> helped with this.
+	(erc-kill-server-buffer-on-quit): New variable. Used in
+	erc-process-sentinel-1 to decide whether to kill a server buffer
+	when the user quit normally.
+	(erc-process-sentinel): Auxiliary function erc-process-sentinel-1
+	split out.  The function body has `with-current-buffer' wrapped
+	around it, to ensure separation of messages if multiple
+	connections were being made.  Use `if' instead of `cond' in places
+	where the decision is binary.  The last (useless, since the server
+	connection is closed) prompt in the server buffer is removed.
+	Color "erc terminated" and "erc finished" messages with
+	erc-error-face.  Mark the buffer unmodified so that, if not killed
+	automatically, the user is not prompted to save it.
+
+2004-07-16  Brian Palmer <bpalmer@gmail.com>
+
+	* erc.el (erc-select-read-args): New function. Prompts the user
+	for arguments to pass to erc-select and erc-select-ssl.
+	(erc-select): Use (erc-select-read-args) when called interactively
+	to get its arguments.  When non-interactively, use keyword
+	arguments.
+	(erc-select-ssl): Ditto.
+	(erc-compute-port): New function. Parallel to erc-compute-server,
+	but comes up with a default value for an IRC server's port.
+
+2004-07-16  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-match.el (erc-match-message): Quote the current nickname.
+
+2004-07-12  Brian Palmer <bpalmer@gmail.com>
+
+	* erc-list.el (erc-chanlist-mode): Remove explicit invocation of
+	erc-chanlist-mode-hook, since it's automatically invoked by
+	define-derived-mode
+
+2004-07-03  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-match.el (erc-match-current-nick-p): Quote current nick for
+	regexp parsing.
+
+2004-06-27  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-nickserv.el (erc-nickserv-identify-mode): Fix erroneous
+	parentheses in call to `completing-read'.
+
+2004-06-23  Alex Schroeder <alex@gnu.org>
+
+	* Makefile (release): Depend on autoloads, and copy erc-auto.el
+	into the tarball.
+
+2004-06-14  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-log-irc-protocol): Fixed minor bug where each line
+	received from a server was logged as two lines (one with text and
+	one blank).
+
+2004-06-08  Brian Palmer <bpalmer@gmail.com>
+
+	* erc-list.el (erc-chanlist-frame-parameters): Made customizable.
+	(erc-chanlist-header-face): Changed to use defface with some
+	reasonable defaults instead of make-face, and removed the
+	associated -face variable.
+	(erc-chanlist-odd-line-face): Ditto.
+	(erc-chanlist-even-line-face): Ditto.
+	(erc-chanlist-highlight-face): New variable. Holds a face used for
+	highlighting the current line.
+	(erc-cmd-LIST): Use erc-member-ignore-case instead of
+	member-ignore-case.
+	(erc-chanlist-post-command-hook): Change to move the highlight
+	overlay instead of refontifying the entire buffer.
+	(erc-chanlist-dehighlight-line): Added to detach the highlight
+	overlay from the buffer.
+
+2004-05-31  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: erc-mode-line-format: Add column numbers.
+
+2004-05-31  Adrian Aichner <adrian@xemacs.org>
+
+	* erc-autojoin.el: Typo fix.
+
+	* erc-dcc.el (erc-dcc-do-GET-command): Use expand-file-name.
+	(erc-dcc-get-file): XEmacs set-buffer-multibyte compatibility.
+
+	* erc-log.el: Append `erc-log-setup-logging' to
+	`erc-connect-pre-hook' so that `erc-initialize-log-marker' is run
+	first (markers are needed by `erc-log-setup-logging').
+	(erc-enable-logging): Docstring fix.
+	(erc-log-setup-logging): Move `erc-log-insert-log-on-open' to (1-
+	(point-max)) when doing `erc-log-insert-log-on-open'.  Modified
+	version of a patch by Lawrence Mitchell.
+	(erc-log-all-but-server-buffers): Do `save-excursion' as well.
+	(erc-current-logfile): Pass buffer name as target
+	argument to `erc-generate-log-file-name-function' if
+	`erc-default-target' is nil.
+	(erc-generate-log-file-name-with-date): Use expand-file-name.
+	(erc-generate-log-file-name-short): Ditto.
+	(erc-save-buffer-in-logs): Do `save-excursion' and test whether
+	erc-last-saved-position is a marker.
+
+	* erc-members.el: Avoid miscompiling macro `erc-log' and
+	`with-erc-channel-buffer' by requiring 'erc at compile time.
+
+	* erc-sound.el: Use expand-file-name.
+
+	* erc.el (erc-debug-log-file): Ditto.
+	(erc-find-file): Ditto.
+
+2004-05-26  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el, erc-backend.el (erc-cmd-BANLIST): Added a missing "'"
+	that was preventing /BANLIST from working.  In erc-backend.el,
+	added server repsonse handler for 367 and 368 reponses to get
+	/BANLIST working.
+
+2004-05-26  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el: Removed an eval-when-compile that was preventing the
+	byte-compiled version of this file from loading.
+
+2004-05-26  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el: Undid part of my last change.  I suspect it was wrong.
+
+2004-05-26  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el: Silenced several byte-compiler warnings.
+
+2004-05-26  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-log-irc-protocol): Fixed problem where this function
+	misformatted IRC protocol text if multiple lines were received from
+	the server at one time.
+
+2004-05-25  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-toggle-debug-irc-protocol): Cosmetic changes to the
+	informational text in the *erc-protocol* buffer.
+
+2004-05-24  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-log-irc-protocol, erc-process-filter): Now the lines
+	inserted in the *erc-protocol* buffer are prefixed with the name
+	of the network to/from which the data is going/coming.  This makes
+	reading the *erc-protocol* buffer much easier when connected to
+	multiple networks.
+
+2004-05-23  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
+
+	* erc-backend.el: Fixes server message parsing so that command
+	arguments specified after the colon are not treated specially. All
+	arguments are added to the `command-args' field, and the
+	`contents' points to the last element in the `command-args' list.
+	This allows ERC to connect to networks such as Undernet.  Although
+	keeping `contents' allows many of the response handlers to
+	continue to work as-is, many other are probably broken by this
+	patch.
+
+2004-05-20  Lawrence Mitchell <wence@gmx.li>
+
+	* 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 <disumu@x3y2z1.net>
+
+	* erc-speedbar.el: Ignore errors when attempting to require dframe
+	(there are a couple implementations of speedbar, one of which uses
+	of dframe).
+	(erc-speedbar-version): New.
+	(erc-speedbar-goto-buffer): Use dframe functions if dframe is
+	available.
+
+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'.
+
+2004-05-17  Mario Lang <mlang@delysid.org>
+
+	* erc-log.el: Dont autoload a define-key statement, erc-mode-map
+	might not be known yet
+
+2004-05-16  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-backend.el (erc-parse-server-response): Revert to original
+	`erc-parse-line-from-server' version, since new version breaks for
+	a number of edge cases.
+
+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
+	unknown responses to the user.
+	(221): Don't show nickname in modes list.
+	(254): Fixed to use 's254.
+	(303): Added docstring.
+	(315, 318, 323, 369): Ignored responses grouped together.
+	(391): New.
+	(406, 432): Use ?n, not ?c in `erc-display-message'.
+	(431, 445, 446, 451, 462, 463, 464, 465, 481, 483, 485, 491, 501,
+	502): All error responsess with no arguments grouped together.
+
+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.
+	(erc-cmd-TIME): Fixed to work with and without server given as
+	argument.
+	(erc-define-catalog): Added, s391, s431, s445, s446, s451, s462,
+	s463, s464, s465, s483, s484, s485, s491, s501, s502.
+
+2004-05-14  Lawrence Mitchell <wence@gmx.li>
+
+	* HACKING: Typo fix.
+
+2004-05-14  Lawrence Mitchell <wence@gmx.li>
+
+	* Makefile (erc-auto.el): Pass -f flag to rm so that we don't fail
+	if erc-auto.elc doesn't exist.
+
+2004-05-14  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-backend.el (erc-with-buffer): Autoload.
+	(erc-parse-server-response): XEmacs' `replace-match' only replaces
+	subexpressions when operating on buffers, not strings, work around
+	it.
+	(461): Command with invalid arguments is `second', not `third'.
+
+2004-05-14  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-notify.el (erc-notify-NICK): Use `erc-response.contents' to
+	get nickname.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-track.el: Indentation fixes.
+	(track-when-inactive): Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-notify.el (notify): Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+	(erc-notify-timer, erc-notify-JOIN, erc-notify-NICK)
+	(erc-notify-QUIT): Use new accessors for PARSED argument.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-nickserv.el (services, erc-nickserv-identify-mode): Use
+	`erc-server-FOO-functions', not `erc-server-FOO-hook.
+	(erc-nickserv-identify-autodetect): Use new accessors for PARSED
+	argument.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-netsplit.el (netsplit): Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+	(erc-netsplit-JOIN, erc-netsplit-MODE, erc-netsplit-QUIT): Use new
+	accessors for PARSED argument.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-nets.el: Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-menu.el (erc-menu-definition): Only allow listing of
+	channels if `erc-cmd-LIST' is fboundp.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-match.el: Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+	(erc-get-parsed-vector-nick, erc-get-parsed-vector-type): Use new
+	accessors for PARSED argument.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-list.el (erc-chanlist, erc-chanlist-322): Use new accessors
+	for PARSED argument.  Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-ezbounce.el (erc-ezb-notice-autodetect): Use new accessors
+	for PARSED argument.
+	(erc-ezb-initialize): Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-dcc.el: Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+	(erc-dcc-no-such-nick): Use new accessors for PARSED argument.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-bbdb.el (erc-bbdb-whois, erc-bbdb-JOIN, erc-bbdb-NICK): Use
+	new accessors for PARSED argument.
+	(BBDB): Use `erc-server-FOO-functions', not `erc-server-FOO-hook.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-autojoin.el (autojoin): Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+	(erc-autojoin-add, erc-autojoin-remove): Use new accessors for
+	PARSED argument.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-autoaway.el (autoaway): Use `erc-server-FOO-functions', not
+	`erc-server-FOO-hook.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-backend): Require.
+	(erc-disconnected-hook, erc-join-hook, erc-quit-hook)
+	(erc-part-hook, erc-kick-hook): Docstring fix, we now use
+	`erc-server-FOO-functions', rather than `erc-server-FOO-hook'.
+	(erc-event-to-hook-name, erc-event-to-hook): Remove.
+	(erc-once-with-server-event)
+	(erc-once-with-server-event-global): Use `erc-get-hook'
+	(erc-process-filter): Use `erc-parse-server-response'.
+	(erc-cmd-IDLE, erc-cmd-BANLIST, erc-cmd-MASSUNBAN): New accessors
+	for PARSED argument.  Rename all `erc-server-FOO-hook' to
+	`erc-server-FOO-functions'.
+	(erc-server-364-hook, erc-server-365-hook, erc-server-367-hook)
+	(erc-server-368-hook, erc-server-KILL-hook)
+	(erc-server-PONG-hook, erc-server-200-hook, erc-server-201-hook)
+	(erc-server-202-hook, erc-server-203-hook, erc-server-204-hook)
+	(erc-server-205-hook, erc-server-206-hook, erc-server-208-hook)
+	(erc-server-209-hook, erc-server-211-hook, erc-server-212-hook)
+	(erc-server-213-hook, erc-server-214-hook, erc-server-215-hook)
+	(erc-server-216-hook, erc-server-217-hook, erc-server-218-hook)
+	(erc-server-219-hook, erc-server-241-hook, erc-server-242-hook)
+	(erc-server-243-hook, erc-server-244-hook, erc-server-249-hook)
+	(erc-server-261-hook, erc-server-262-hook, erc-server-302-hook)
+	(erc-server-323-hook, erc-server-342-hook, erc-server-351-hook)
+	(erc-server-381-hook, erc-server-382-hook, erc-server-391-hook)
+	(erc-server-392-hook, erc-server-393-hook, erc-server-394-hook)
+	(erc-server-395-hook, erc-server-402-hook, erc-server-404-hook)
+	(erc-server-407-hook, erc-server-409-hook, erc-server-411-hook)
+	(erc-server-413-hook, erc-server-414-hook, erc-server-415-hook)
+	(erc-server-422-hook, erc-server-423-hook, erc-server-424-hook)
+	(erc-server-431-hook, erc-server-436-hook, erc-server-437-hook)
+	(erc-server-441-hook, erc-server-443-hook, erc-server-444-hook)
+	(erc-server-445-hook, erc-server-446-hook, erc-server-451-hook)
+	(erc-server-462-hook, erc-server-463-hook, erc-server-464-hook)
+	(erc-server-465-hook, erc-server-467-hook, erc-server-471-hook)
+	(erc-server-472-hook, erc-server-473-hook, erc-server-483-hook)
+	(erc-server-491-hook, erc-server-502-hook): Remove.
+	(erc-call-hooks, erc-parse-line-from-server): Remove
+	(erc-server-hook-list): Remove.  Remove top-level call too.
+	(erc-server-ERROR, erc-server-INVITE, erc-server-JOIN)
+	(erc-server-KICK, erc-server-MODE, erc-server-NICK)
+	(erc-server-PART, erc-server-PING, erc-server-PONG)
+	(erc-server-PRIVMSG-or-NOTICE, erc-server-QUIT)
+	(erc-server-TOPIC, erc-server-WALLOPS, erc-server-001)
+	(erc-server-004, erc-server-005, erc-server-221, erc-server-252)
+	(erc-server-253, erc-server-254, erc-server-301, erc-server-303)
+	(erc-server-305, erc-server-306, erc-server-311-or-314)
+	(erc-server-312, erc-server-313, erc-server-317, erc-server-319)
+	(erc-server-320, erc-server-321, erc-server-322, erc-server-324)
+	(erc-server-329, erc-server-330, erc-server-331, erc-server-332)
+	(erc-server-333, erc-server-341, erc-server-352, erc-server-353)
+	(erc-server-366, erc-server-MOTD, erc-server-379)
+	(erc-server-401, erc-server-403, erc-server-405, erc-server-406)
+	(erc-server-412, erc-server-421, erc-server-432, erc-server-433)
+	(erc-server-437, erc-server-442, erc-server-461, erc-server-474)
+	(erc-server-475, erc-server-477, erc-server-481, erc-server-482)
+	(erc-server-501): Move to erc-backend.el
+	(erc-auto-query, erc-banlist-store, erc-banlist-finished)
+	(erc-banlist-update, erc-connection-established)
+	(erc-process-ctcp-query, erc-display-server-message): Use new
+	accessors for PARSED argument.
+
+2004-05-13  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-backend.el: (erc-parse-server-response)
+	(erc-handle-parsed-server-response, erc-get-hook)
+	(define-erc-response-handler): New functions.
+	(erc-response): New struct for server responses.
+	(erc-server-responses): New variable.
+	(erc-call-hooks): Move from erc.el and rework.
+	(ERROR, INVITE, JOIN, KICK, MODE, NICK, PART, PING, PONG)
+	(PRIVMSG, NOTICE, QUIT, TOPIC, WALLOPS, 001, MOTD, 376, 004)
+	(252, 253, 254, 250, 301, 303, 305, 306, 311, 312, 313, 315)
+	(317, 318, 319, 320, 321, 322, 324, 329, 330, 331, 332, 333)
+	(341, 352, 353, 366, 369, 379, 401, 403, 405, 406, 412, 421)
+	(432, 433, 437, 442, 461, 474, 477, 481, 482, 501, 323, 221)
+	(002, 003, 371, 372, 374, 375, 422, 251, 255, 256, 257, 258)
+	(259, 265, 266, 377, 378, 314, 475, 364, 365, 367, 368, 381)
+	(382, 391, 392, 393, 394, 395, 200, 201, 202, 203, 204, 205)
+	(206, 208, 209, 211, 212, 213, 214, 215, 216, 217, 218, 219)
+	(241, 242, 243, 244, 249, 261, 262, 302, 342, 351, 402, 404)
+	(407, 409, 411, 413, 414, 415, 423, 424, 431, 436, 441, 443)
+	(444, 445, 446, 451, 462, 463, 464, 465, 467, 471, 472, 473)
+	(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 <disumu@x3y2z1.net>
+
+	* erc.el: A few bug fixes to avoid errors after disconnect,
+	including the "Selecting deleted buffer" bug.
+	(erc-channel-user-op-p, erc-channel-user-voice-p): Make sure NICK
+	is non-nil (`erc-current-nick' can return nil).
+	(erc-server-buffer): Make sure the buffer isn't a #<killed
+	buffer>.
+	(erc-server-buffer-live-p): New function.
+	(erc-display-line, erc-join-channel, erc-prepare-mode-line-format,
+	erc-away-p): Use `erc-server-buffer-live-p' to make sure process
+	buffer exists.
+	(erc-send-current-line): If there is no server buffer, let the
+	user know.
+
+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-log-version): New.
+	(erc-cmd-JOIN): Fix applied for bug where /join -invite causes
+	errors when there's no `invitation'.
+
+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 <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 <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-fill.el, erc-ibuffer.el, erc-imenu.el, erc-lang.el,
+	erc-list.el, erc-log.el, erc-macs.el, erc-match.el, erc-members.el,
+	erc-menu.el, erc-nets.el, erc-netsplit.el, erc-nickserv.el,
+	erc-notify.el, erc-page.el, erc-ring.el, erc-speak.el,
+	erc-speedbar.el, erc-stamp.el, erc-track.el, erc-truncate.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 <disumu@x3y2z1.net>
+
+	* erc-menu.el: Updated copyright years.
+
+2004-05-09  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-update-channel-info-buffer): Correct bug in sorting
+	of channel users.  Tiny change from Andreas Schwab
+	<schwab@suse.de>.
+
+2004-05-09  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-fill.el (erc-fill-variable): Fix docstring.
+
+2004-05-09  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-button.el (erc-button-add-button): Use 'keymap
+	text-property, rather than 'local-map, since it's cross-emacs
+	compatible.  Pass :mouse-down-action into `widget-convert-button'
+	as 'erc-button-click-button, to make XEmacs happy.  Replace bogus
+	reference to erc-widget-press-button with erc-button-press-button.
+	(erc-button-click-button): New (ignored) first argument, to make
+	XEmacs behave when pressing buttons.
+	(erc-button-press-button): New (ignored) &rest argument.
+
+2004-05-09  Adrian Aichner <adrian@xemacs.org>
+
+	* erc-log.el (erc-conditional-save-buffer): Fix docstring
+	reference to erc-save-queries-on-quit.
+	(erc-conditional-save-queries): Ditto.
+
+2004-05-06  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-speedbar.el: Updated copyright years.  Added local variables
+	for this file; fixed indenting.
+	(erc-speedbar): New group.
+	(erc-speedbar-sort-users-type): New variable.
+	(erc-speedbar-buttons): Handle query buffers (fixes a bug where an
+	error would be thrown if the current buffer was a query).  Ignore
+	unknown buffers.
+	(erc-speedbar-expand-channel): Show limit and key with channel
+	modes. Sort users according to `erc-speedbar-sort-users-type'.
+	(erc-speedbar-insert-user): Fixed bug where only nicks with more
+	info were being listed, and those were shown twice.
+	(erc-speedbar-goto-buffer): Don't use dframe functions, as dframe
+	isn't available with the default speedbar.
+
+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-server-412-hook, erc-server-432-hook, erc-server-475-hook):
+	Use them.
+	(erc-server-401, erc-server-403, erc-server-405)
+	(erc-server-421, erc-server-474, erc-server-481): Use catalog
+	messages.
+	(erc-define-catalog): Added s401, s403, s405, s412, s421, s432,
+	s474, s475, and s481.
+
+2004-05-06  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-nickserv.el: Added documentation to Commentary, Usage.
+	Removed `outline-mode' from file local variables.
+	(erc-services-mode): Use `erc-nickserv-identify-mode' to add
+	hooks.
+	(erc-nickserv-identify-mode): New function.
+	(erc-nickserv-identify-mode): New variable.
+	(erc-prompt-for-nickserv-password, erc-nickserv-passwords):
+	Changed docstring.
+	(erc-nickserv-identify-autodetect): Use
+	`erc-nickserv-call-identify-function'. Docstring change.
+	(erc-nickserv-identify-on-connect,
+	erc-nickserv-identify-on-nick-change,
+	erc-nickserv-call-identify-function): New functions.
+	(erc-nickserv-identify): PASSWORD is not optional.  Autoload
+	function.
+
+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-nick-changed-functions): New hook.
+	(erc-server-NICK): Run `erc-nick-changed-functions' with the
+	arguments NEW-NICK and OLD-NICK.
+	(erc-channel-user-voice-p, erc-channel-user-voice-p): Shortened
+	docstring.
+
+2004-05-05  Lawrence Mitchell <wence@gmx.li>
+
+	* HACKING: New section on function/variable naming and coding
+	conventions.
+
+2004-05-05  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-wash-quit-reason): Quote regexp special characters
+	in NICK, LOGIN and HOST.
+
+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
+	and nil.  (erc-mode-map): Bind `erc-get-channel-mode-from-keypress'
+	to C-c C-o instead of C-c RET (C-c C-m).  (erc-cmd-GQUIT): Use
+	REASON as argument when calling `erc-cmd-QUIT'.
+
+2004-05-03  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-nicklist.el: Initial version.
+
+2004-04-28  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-menu.el: Added local variables for file, fixed indenting.
+	(erc-menu-version): New variable.
+	(erc-menu-definition): "List channels": New.  "Join channel": Use
+	`erc-connected' as test.  "Start a query": New.  "List channel
+	operators": New.  "Input action": Moved up.  "Set topic": Fixed
+	test so it's only active in channels.  "Leave this channel": Moved
+	down.  "Track hidden channel buffers": Removed.  "Enable/Disable
+	ERC Modules": New.
+
+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 <disumu@x3y2z1.net>
+
+	* erc-log.el: Added local variables for this file.
+	(erc-log-channels-directory): Added directory as a choice in
+	`:type'.
+	(define-erc-module): Define and undefine key binding (C-c
+	C-l) for `erc-save-buffer-in-logs' here.
+
+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 <disumu@x3y2z1.net>
+
+	* erc-match.el: Added local variables for file.  (erc-keywords):
+	Use `list' instead of `cons' in `:type'.  Fixes bug where mismatch
+	was shown in customization.  (erc-current-nick-highlight-type):
+	Escape parentheses in docstring.  Added keyword, nick-or-keyword as
+	options in `:type'.
+
+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 <disumu@x3y2z1.net>
+
+	* erc.el (erc-modules): Added bbdb, log, match, sound, and stamp
+	as `:type' options; changed documentation for autojoin, fill,
+	pcomplete, track.  (erc-prompt-for-channel-key): New variable.
+	(erc-join-channel): Only prompt for key if
+	`erc-prompt-for-channel-key' is non-nil.  (erc-format-my-nick): New
+	function.  (erc-send-message, erc-send-current-line): Use it.
+
+2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-track.el: (erc-track-modified-channels): Fix indentation.
+
+2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-match.el: (erc-hide-fools): Docstring fix.
+	(erc-log-matches-types-alist): Added `current-nick' to valid
+	choices.
+
+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.
+	(erc-match, erc-track): `erc' is parent group.
+	(erc-ezb-regexp, erc-ezb-login-alist): Added `:group'.
+
+2004-04-20  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-fill.el: Fixed erc-fill-static so it breaks the lines at the
+	right column and respects timestamps. Patch by Simon Siegler
+	<simon@trz-kril.de>
+	(erc-fill-static): Major rewrite and split up into some functions.
+	(erc-count-lines): Removed.
+	(erc-fill-regarding-timestamp): New function.
+	(erc-timestamp-offset): New function.
+	(erc-restore-text-properties): New function.
+	(erc-fill-variable): Respect leftbound timestamp.  This is still
+	broken if someone has both erc-timestamp-only-if-changed-flag set
+	and erc-insert-timestamp-function set to
+	'erc-insert-timestamp-left, but otherwise it works now.
+
+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
+	shown).
+
+2004-04-19  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el: (erc-update-channel-topic); Error if `channel-topic' is
+	unbound.  Remove %-sign substitution.
+	(erc-update-mode-line-buffer): Escape %-signs in `channel-topic'
+	here.
+
+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'
+	propertize the message.
+	(erc-display-message-highlight): Allow for any erc-TYPE-face.
+	(erc-cmd-JOIN): Display error message instead of throwing an error
+	if there's no `invitation'.
+	(erc-cmd-PART): Allow for no reason if channel is provided.  Fixes
+	bug where user would part the current channel with the other
+	channel's name as reason when no reason was given.
+	(erc-server-vectors, erc-debug-missing-hooks): Added docstring.
+	(erc-server-JOIN): Moved `erc-join-hook' to JOIN-you section.
+	`erc-join-hook' called by `run-hook-with-args', sending the ARGS
+	`chnl' and the channel's buffer.  Changed an instance of if
+	without else to when.
+	(erc-server-477): New function.
+	(erc-server-477-hook): Use `erc-server-477'.
+	(erc-define-catalog): Added `no-invitation'.
+
+2004-04-14  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-nickserv.el: Local variables for file added.
+	(erc-nickserv-passwords): Customization: Network symbols updated
+	to reflect `erc-nickserv-alist'.  Allow user to type in network
+	symbol.
+	(erc-nickserv-alist): Now customizable variable.
+
+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 <disumu@x3y2z1.net>
+
+	* erc-autoaway.el (erc-autoaway-version): New variable.
+	(erc-auto-discard-away): Updated docstring.
+	(erc-autoaway-no-auto-back-regexp): New variable.
+	(erc-autoaway-reset-idletime): Use it.	Hopefully a better solution
+	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 <disumu@x3y2z1.net>
+
+	* erc-autoaway.el (erc-autoaway-reset-idletime): Forgot /gaway in
+	regexp.
+
+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
+	where ERC would send "/away" when user was already away and sent an
+	"/away reason".  Changed `l' to `line' for better understanding.
+	(erc-autoaway-set-back): Changed `l' to `line' for better
+	understanding.
+
+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 <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
+	changes during split.
+	(erc-show-channel-key-p): New variable.
+	(erc-prepare-mode-line-format): Only show key if
+	`erc-show-channel-key-p' is non-nil.
+
+2004-04-04  Diane Murray <disumu@x3y2z1.net>
+
+ 	* erc.el (channel-key): New variable.
+	(erc-update-channel-key): New function.
+	(erc-set-modes, erc-parse-modes, erc-update-modes, erc,
+	erc-update-channel-info-buffer): Deal with channel keys.
+	(erc-prepare-mode-line-format): Show channel key in header-line.
+	(erc-server-NICK): Show nick change in server buffer as well.
+	(erc, erc-send-command, erc-banlist-store, erc-banlist-update,
+	erc-load-irc-script-lines,
+	erc-arrange-session-in-multiple-windows, erc-handle-login,
+	erc-find-channel-info-buffer): Changed when not to unless.
+	(erc-server-MODE): Changed if without else to when.
+
+2004-03-27  Adrian Aichner <adrian@xemacs.org>
+
+	* erc.el: (erc-cmd-BANLIST): Use `truncate-string-to-width'
+	instead of `truncate-string' alias.
+	(erc-nickname-in-use): Ditto.
+
+2004-03-27  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-list.el (erc-cmd-list): Fixed error caused by erc-cmd-LIST
+	passing a non-sequence to erc-chanlist.
+
+2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
+
+	* erc.el: Add new hook `erc-join-hook', which is run when we join a
+	channel.
+
+2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
+
+	* erc.el: Replaced existing notice user notification system and
+	the configuration options, which consisted of
+	`erc-echo-notices-in-minibuffer-flag' and
+	`erc-echo-notices-in-current-buffer' with two new hooks,
+	`erc-echo-notice-hook' and `erc-echo-notice-always-hook'.
+
+	When user notification is needed, `erc-echo-notice-always-hook' is
+	first run using `run-hook-with-args', then `erc-echo-notice-hook'
+	is run using `run-hook-with-args-until-success'.
+
+	In addition to these hooks, a large number of functions, which are
+	described in the documentation strings of those hooks, were added
+	which can be used to achieve a large variety of different
+	behaviors.
+
+	The current default behavior, which is identical to the existing
+	default behavior, is for `erc-echo-notice-always-hook' to be set to
+	`(erc-echo-notice-in-default-buffer).
+
+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 <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'
+	is nil, messages in the query buffer are formatted like private
+	messages.
+
+	(erc-server-252-hook, erc-server-253-hook, erc-server-254-hook,
+	erc-server-256-hook, erc-server-257-hook, erc-server-258-hook,
+	erc-server-259-hook, erc-server-371-hook, erc-server-372-hook,
+	erc-server-374-hook, erc-server-374-hook, erc-server-442-hook,
+	erc-server-477-hook): Removed, now defined in
+	`erc-server-hook-list'.
+	(erc-display-server-message): New function.
+	(erc-server-252, erc-server-253, erc-server-254, erc-server-442):
+	New functions.
+	(erc-server-hook-list): Added 250, 256, 257, 258, 259, 265, 266,
+	377, 378, 477 - using `erc-display-server-message'.  251, 255 now
+	use `erc-display-server-message'.  Added 252, 253, 254, 442 -
+	using respective erc-server-* functions.  371, 372, 374, 375 now
+	defined here.
+	(erc-define-catalog): Added s252, s253, s254, s442.
+	(erc-server-001, erc-server-004, erc-server-005): Fixed
+	documentation.
+
+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 <disumu@x3y2z1.net>
+
+	* erc.el (erc-send-action): Use `erc-input-face'.
+	(erc-display-message-highlight): If the requested highlighting
+	type doesn't match, just display the string with no highlighting
+	and warn about it with `erc-log'.. (erc-cmd-JOIN): If user is
+	already on the requested channel, switch to that channel's buffer.
+	(erc-ctcp-query-ACTION): Use `erc-action-face' for nick as well.
+	(erc-header-line-use-help-echo-p): New variable.
+	(erc-update-mode-line-buffer): Use `help-echo' for header-line if
+	`erc-header-line-use-help-echo-p' is non-nil.
+
+2004-03-18  Adrian Aichner <adrian@xemacs.org>
+
+	* erc-nets.el: Use two arguments version of `make-obsolete', if
+	third argument is not supported (for XEmacs).
+
+2004-03-18  Andreas Fuchs <asf@void.at>
+
+	* CREDITS: added CREDITS entry for Adrian Aichner
+
+2004-03-18  Andreas Fuchs <asf@void.at>
+
+	* erc-xdcc.el, erc.el, erc-autoaway.el, erc-autojoin.el,
+	erc-button.el, erc-dcc.el, erc-ezbounce.el, erc-imenu.el,
+	erc-list.el, erc-log.el, erc-match.el, erc-members.el,
+	erc-menu.el, erc-netsplit.el, erc-notify.el, erc-speedbar.el,
+	erc-stamp.el, erc-track.el, erc-truncate.el:
+	(erc-coding-sytem-for-target): Removed.
+	(erc-coding-system-for-target): New.
+	(erc-autoaway-use-emacs-idle): Typo fix.
+	(erc-auto-set-away): Ditto.
+	(erc-auto-discard-away): Ditto.
+	(autojoin): Ditto.
+	(erc-button-alist): Ditto.
+	(erc-dcc-auto-masks): Ditto.
+	(erc-dcc-chat-send-input-line): Ditto.
+	(erc-ezb-get-login): Ditto.
+	(erc-unfill-notice): Ditto.
+	(erc-save-buffer-in-logs): Ditto.
+	(match): Ditto.
+	(erc-log-matches-types-alist): Ditto.
+	(erc-match-directed-at-fool-p): Ditto.
+	(erc-match-message): Ditto.
+	(erc-update-member): Ditto.
+	(erc-ignored-reply-p): Ditto.
+	(erc-menu-definition): Ditto.
+	(erc-netsplit-QUIT): Ditto.
+	(erc-notify-list): Ditto.
+	(erc-speedbar-update-channel): Ditto.
+	(erc-speedbar-item-info): Ditto.
+	(erc-stamp): Ditto.
+	(erc-timestamp-intangible): Ditto.
+	(erc-add-timestamp): Ditto.
+	(erc-timestamp-only-if-changed-flag): Ditto.
+	(erc-show-timestamps): Ditto.
+	(erc-track-priority-faces-only): Ditto.
+	(erc-modified-channels-alist): Ditto.
+	(erc-unique-substrings): Ditto.
+	(erc-find-parsed-property): Ditto.
+	(erc-track-switch-direction): Ditto.
+	(erc-truncate-buffer-to-size): Ditto.
+	(erc-xdcc): Ditto.
+	(erc-auto-reconnect): Ditto.
+	(erc-startup-file-list): Ditto.
+	(erc-once-with-server-event): Ditto.
+	(erc-once-with-server-event-global): Ditto.
+	(erc-mode): Ditto.
+	(erc-generate-new-buffer-name): Ditto.
+	(erc): Ditto.
+	(erc-open-ssl-stream): Ditto.
+	(erc-default-coding-system): Ditto.
+	(erc-encode-string-for-target): Ditto.
+	(erc-decode-string-from-target): Ditto.
+	(erc-scroll-to-bottom): Ditto.
+	(erc-decode-controls): Ditto.
+	(erc-channel-members-changed-hook): Ditto.
+	(erc-put-text-property): Ditto.
+	(erc-add-default-channel): Ditto.
+
+2004-03-17  Diane Murray <disumu@x3y2z1.net>
+
+	* erc.el (erc-process-sentinel): Cancel ping timer upon
+	disconnect.
+	(erc-cmd-PART): Use same regexp as `erc-cmd-QUIT' when no #channel
+	is provided.
+	(erc-nick-uniquifier, erc-manual-set-nick-on-bad-nick-p): `:group'
+	was missing, added.
+	(erc-part-reason-zippy, erc-part-reason-zippy): Removed FIXME
+	comments.  I see no problem allowing typed in reasons.
+
+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-timestamp-only-if-changed-flag): Updated documentation.
+
+2004-03-13  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-nets.el (erc-network-name): No longer marked as obsolete.
+	Why was this function made obsolete?  There is no other function
+	that performs this task.  Some of us use these functions in our
+	personal ERC configs.
+
+2004-03-12  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-buffer-filter): Use `with-current-buffer'.
+	(erc-process-input-line): Append newline to documentation.  Fixes a
+	bug whereby the prompt would be put on the same line as the output.
+	(erc-cmd-GQUIT): Only try and send QUIT if the process is alive.
+
+2004-03-12  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-log.el: Only add top-level hooks if `erc-enable-logging' is
+	non-nil.
+
+2004-03-10  Damien Elmes <erc@repose.cx>
+
+	* 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 <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
+	send 004 (RPL_MYINFO) message.
+
+2004-03-10  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-nets.el (erc-server-alistm erc-settings): Use lowercase
+	"freenode", as in `erc-networks-alist'.
+
+2004-03-10  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-nickserv.el (erc-nickserv-alist): Use lowercase "freenode",
+	as in `erc-networks-alist'.
+
+2004-03-10  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-dcc.el (pcomplete/erc-mode/DCC): Append "send" as a list.
+
+2004-03-10  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-nets.el (erc-networks-alist): Changed "Freenode" to
+	"freenode".
+
+2004-03-10  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-list.el (erc-cmd-LIST): Improved the docstring.	Made
+	message to user more accurate	depending on whether a single
+	channel is being listed or not.
+
+2004-03-10  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-nets.el (erc-determine-network): Make matching logic simpler
+	(suggested by Damian Elmes).
+	(erc-current-network, erc-network-name): Add `make-obsolete' form.
+	(erc-set-network-name): Indentation fix.
+	(erc-ports-list): Add docstring.  Rework function body to use
+	`nconc'.
+
+2004-03-09  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-list.el, erc-notify.el: (require 'erc-nets): added
+
+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
+	`erc-network' in erc-nets.el do what this did before.  Deprecated.
+	Use (erc-network) instead.
+
+2004-03-08  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-nickserv.el: Changed copyright notice.  Now require
+	erc-nets.  erc-nets.el now takes care of network-related functions
+	and variables.
+	(erc-nickserv-alist): Changed network symbols to match those in
+	`erc-networks-alist' in erc-nets.el.
+	(erc-nickserv-identify-autodetect): Use `erc-network'.
+	(erc-nickserv-identify): Use `erc-network'.  Changed wording for
+	interactive use, now shows current nick.
+	(erc-networks): Removed.  Use `erc-networks-alist' as defined in
+	erc-nets.el.
+	(erc-current-network): Function definition moved to erc-nets.el.
+	The functions `erc-determine-network' and `erc-network' in
+	erc-nets.el do what this did before.  Deprecated.  Use
+	(erc-network) instead.
+
+2004-03-08  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-nets.el: Added commentary, `erc-nets-version'.
+	(erc-server-alist): Changed Brasnet to BRASnet.
+	(erc-networks-alist): All networks (except EFnet and IRCnet) now
+	have a MATCHER.  (erc-network): New variable.
+	(erc-determine-network): New function. Determine the network the
+	user is on.  Use the server parameter NETWORK, if provided, else
+	parse the server name and search for a match (regexp and loop by
+	wencem) in `erc-networks-alist'.  Return the name of the network
+	or "Unknown" as a symbol.
+	(erc-network): New function.  Returns value of `erc-network'.  Use
+	this when the current buffer is not the server process buffer.
+	(erc-current-network): Returns the value of `erc-network' as
+	expected by users who used the function as it was defined in
+	erc-nickserv.el.  Deprecated.
+	(erc-network-name): Returns the value of `erc-network' as expected
+	by users who used the function as it was defined in erc.el.
+	Deprecated.
+	(erc-set-network-name): New function.  Added to
+	`erc-server-375-hook' and `erc-server-422-hook'.
+	(erc-unset-network-name): New function.  Added to
+	`erc-disconnected-hook'.
+	(erc-server-select): Small documentation word change.
+
+2004-03-07  Diane Murray <disumu@x3y2z1.net>
+
+	* AUTHORS, CREDITS: disumu info updated
+
+2004-03-06  Lawrence Mitchell <wence@gmx.li>
+
+	* erc-list.el (erc-cmd-LIST): Take &rest rather than &optional
+	arguments.
+	(erc-chanlist): Construct correct LIST command from list of
+	channels.
+
+2004-03-06  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-update-mode-line-buffer): Add 'help-echo property to
+	header-line text.  This allows header lines longer than the width
+	of the current window to be seen.
+
+2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-match.el (erc-match-directed-at-fool-p): Also check for
+	"FOOL, "
+
+2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-match.el (erc-match-message): Only use nick-or-keyword if
+	we're matching our nick.
+
+2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-match.el: The highlight type for the current nickname can
+	now also be 'nick-or-keyword, to highlight the nick of the sender
+	if that is available, but fall back to highlighting your nickname
+	in the whole message otherwise.
+	(erc-current-nick-highlight-type): Adapted docstring accordingly.
+	(erc-match-message): Added new condition. Also added some comments
+	to this monster of a function.
+
+2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-is-valid-nick-p): Don't check for length less or
+	equal to 9.
+
+2004-03-06  Damien Elmes <erc@repose.cx>
+
+	* erc-nickserv.el (erc-current-network): the last change resulted
+	in this function failing when a network identifies itself as
+	anything other than var.netname.com, so for instance
+	'vic.au.austnet.org' fails. This version is only a marginal
+	improvement over the original, but if we want to be more flexible
+	we'll probably have to do the iteration ourselves instead of using
+	assoc.
+
+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
+	server's settings. This fixes a bug where nicks that were too long
+	and got truncated by ther server were still set to the old value.
+	(nickname-in-use): If user wants to try again manually, let user
+	know that the nick is taken.  If not, go through erc-default-nicks
+	until none are left, and then try one last time with
+	erc-nick-uniquifier.  If it's still a bad-nick, make the user
+	change nick manually.  When applying uniquifier, use NICKLEN if
+	it's in the server parameters, otherwise use what RFC 2812 says is
+	the max nick length (9 chars).  Added custom variable
+	erc-manual-set-nick-on-bad-nick-p, which is set to nil and
+	erc-nick-change-attempt-count.  Reset erc-default-nicks and
+	erc-nick-change-attempt-count when the nick has been changed
+	successfully.  This fixes the bug where ERC would get caught in a
+	neverending loop of trying to set the same nick if the nick was
+	too long and the uniquified nick was not available.
+
+	* added erc-cmd-WHOAMI
+
+	* added custom variable erc-mode-line-away-status-format, use this
+	instead of   the previous hard-coded setting
+
+	* erc-server-315|318|369-hook defvar lines removed - they're
+	already defined in erc-server-hook-list
+
+2004-03-04  Lawrence Mitchell <wence@gmx.li>
+
+	* HACKING: Initial commit.  Some thoughts on coding standards.
+
+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 <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 <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 <disumu@x3y2z1.net>
+
+	* erc-match.el: Added 'keyword option to
+	erc-current-nick-highlight-type highlights all instances of
+	current-nick in the message ('nickname option in cvs revisions 1.9
+	- 1.11 had same effect)
+
+2004-02-28  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-button.el: Add Lisp: prefix for the EmacsWiki Elisp area.
+	(erc-button-alist): Added Lisp: prefix.
+	(erc-emacswiki-lisp-url): New variable.
+	(erc-browse-emacswiki-lisp): New function.
+
+2004-02-27  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-get-arglist): Use `substitute-command-keys', rather
+	than hard-coding C-h f for `describe-function'.
+
+2004-02-26  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-log.el (erc-save-buffer-in-logs): bind `inhibit-read-only'
+	to t around call to `erase-buffer'.
+
+2004-02-23  Edward O'Connor <ted@oconnor.cx>
+
+	* erc-chess.el, erc-dcc.el, erc-ezbounce.el, erc-list.el,
+	erc-macs.el, erc-ring.el, erc-stamp.el, erc.el: Normalized buffer
+	local variable creation.
+
+2004-02-17  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-scroll-to-bottom, erc-add-scroll-to-bottom): Mention
+	`erc-input-line-position' in docstring.
+
+2004-02-13  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-kick-hook): Typo fix.
+
+2004-02-13  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
+
+	* erc.el: Added `erc-kick-hook', which is called when the local
+	user is kicked from a channel.  Fixed a bug in `erc-cmd-OPS', such
+	that the command now works.  Added `erc-remove-channel-users', in
+	order to fix a number of significant bugs relating to channel
+	parting.
+
+2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-display-prompt): Remove last change. This caused a
+	lot of trouble :(
+
+2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-display-prompt): Also set 'field property, so C-j
+	works on an empty prompt.
+
+2004-02-12  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-update-channel-topic): Ensure that `channel-topic'
+	does not contain any bare format controls.
+
+2004-02-10  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc-stamp.el (erc-timestamp-intangible): New variable (user
+	feature request)
+	(erc-format-timestamp): Use erc-timestamp-intangible.
+
+2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
+
+	* erc-button.el: Fixed bug related to nickname buttonizing and text
+	fields due to erc-stamp.
+
+2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
+
+	* CREDITS: Added mention of my change of ERC to use hash tables.
+
+2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
+
+	* AUTHORS: Added myself to the list.
+
+2004-02-05  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el: From Jeremy Maitin-Shepard <jbms@attbi.com>:
+	(erc-remove-channel-user): Use `delq' not `delete'.
+	(erc-get-buffer): Pass PROC through to `erc-buffer-filter'.
+	(erc-process-sentinel): Use `erc' rather than `erc-reconnect' for
+	auto-reconnection.
+
+2004-02-02  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el: (erc-buffer-list-with-nick): Apply `erc-downcase' NICK.
+
+2004-01-30  Alex Schroeder <alex@gnu.org>
+
+	* erc.el: (erc-get-buffer): Use erc-buffer-filter.
+
+2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc.el: From jbms: (erc-get-channel-nickname-list): New function.
+	(erc-get-server-nickname-list): New function.
+	(erc-get-server-nickname-alist): New function.
+	(erc-get-channel-nickname-alist): New function.
+
+2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-match.el: (erc-add-entry-to-list,
+	erc-remove-entry-from-list): Use `erc-member-ignore-case' to
+	compare entries.
+	(erc-add-pal, erc-add-fool): Fix type bug. Use
+	`erc-get-server-nickname-alist'.
+
+2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc.el: From jbms: Adds xemacs compatibility to hash table
+	channel-members patch.
+
+2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc.el: (erc-update-undo-list): Rewritten. Update
+	buffer-undo-list in place.  Deal with XEmacsesque
+	entries (extents) in the list.
+	(erc-channel-users): Fix unescaped open-paren in left column in
+	docstring.
+
+2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-ring.el: (erc-replace-current-command): Exclude the prompt
+	from the deleted region and don't redisplay the prompt (because
+	`erc-display-prompt' flushes `buffer-undo-list').
+
+2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
+
+	* erc-match.el: (erc-add-entry-to-list): Use `symbol-value' instead
+	of `eval'.
+
+2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: (erc-kill-buffer-function): maphash was missing an
+	argument.
+
+2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* Makefile, erc-autoaway.el, erc-button.el, erc-ibuffer.el,
+	erc-lang.el, erc-list.el, erc-match.el, erc-menu.el, erc-page.el,
+	erc-pcomplete.el, erc-speedbar.el, erc.el: HUGE change by jbms.
+	This makes channel-members a hash, erc-channel-users.
+
+	Modified files: Makefile erc-autoaway.el erc-button.el
+	erc-ibuffer.el erc-lang.el erc-list.el erc-match.el erc-menu.el
+	erc-page.el erc-pcomplete.el erc-speedbar.el erc.el
+
+	The changes are too numerous to document properly. Have fun with
+	the breakage.
+
+2004-01-27  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: (erc-send-input-line): Add a space to empty lines so the
+	server likes them.
+
+2004-01-25  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: erc-send-whitespace-lines: New variable.
+	(erc-send-current-line): Use erc-send-whitespace-lines. Also,
+	removed superflous test for empty line in the mapc, since the
+	blank line test should find all. I do like to be able to send an
+	empty line when i want to!
+	(erc-send-current-line): Check for point being in input line
+	before checking for blank lines.
+
+2004-01-21  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el: (erc-display-line-1): Move `erc-update-undo-list' outside
+	`save-restriction'.  Removing need for temporary variable.
+	(erc-send-current-line): Fix bug introduced by last change, remove
+	complement in blank line regexp.
+
+2004-01-20  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el: (erc-update-undo-list): Add logic to catch the case when
+	`buffer-undo-list' is t, indentation cleanup.
+	(erc-send-current-line):  Reverse logic for matching blank lines.
+
+2004-01-20  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-input-line-position): New variable.  If non-nil,
+	specifies the argument to `recenter' in `erc-scroll-to-bottom'.
+	(erc-scroll-to-bottom): Use it.
+
+2004-01-20  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el: From Johan Bockgård <bojohan+news@dd.chalmers.se>:
+	(erc-update-undo-list): New function.  Update `buffer-undo-list'
+	so that calling `undo' in an ERC buffer doesn't mess up the
+	existing text.
+	(erc-display-line-1): Use it.
+
+2004-01-19  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-beg-of-input-line): Use `forward-line' rather than
+	`beginning-of-line'.  Docstring fix.
+	(erc-end-of-input-line): Docstring fix.
+
+2004-01-13  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-display-prompt): Remove the undo list after
+	displaying the prompt, so the user can't undo ERC changes, which
+	breaks some stuff anyways. This way the user can still undo his
+	editing, but not ours.
+
+2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el (erc-scroll-to-bottom): Should recenter on the bottom
+	line, not the second-to-last one.
+
+2004-01-12  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el: (erc-bol): Fix bug introduced in revision 1.601.
+
+2004-01-12  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el: From Brian Palmer <bpalmer@gmail.com>
+	(erc-cmd-JOIN): Use `erc-member-ignore-case', rather than
+	`member-ignore-case'.
+
+2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
+
+	* erc.el: There was an inconsistency where the values of op and
+	voice in channel-names could be 'on or 'off after an update, t and
+	nil before.  The intended version was to have t or nil, so i fixed
+	it to do so.
+	(channel-names): Updated docstring.
+	(erc-update-current-channel-member): Clarified docstring, fixed so
+	it sets t or nil on an update as well, not only on an add.
+	(erc-cmd-OPS): Updated not to check for 'on (the only function that
+	did this!)
+
+2004-01-12  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-part-reason-various-alist,
+	erc-update-mode-line-buffer): Fix docstring
+
+2004-01-11  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-update-mode-line): Fix typo.
+
+2004-01-11  Lawrence Mitchell <wence@gmx.li>
+
+	* erc.el (erc-prompt-interactive-input): Removed.
+	(erc-display-prompt): Removed `erc-prompt-interactive-input'
+	option.  (erc-interactive-input-map): Removed.
+
+	Major docstring fixes.
+
+2004-01-07  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-cmd-OPS): Added this function.
+	(erc-cmd-IDLE): Switched from using erc-display-message-highlight
+	to erc-make-notice.
+
+2004-01-07  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-list.el (erc-cmd-LIST): Switched from using
+	erc-display-message-highlight to erc-make-notice.
+
+2004-01-07  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-once-with-server-event): Added a sentence to the
+	docstring.  Now returns the uninterned symbol that is added to the
+	server hook.
+	(erc-cmd-IDLE): Changed to use erc-once-with-server-event instead
+	of erc-once-with-server-event-global.
+
+2004-01-06  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-list.el (erc-chanlist-hide-modeline): New variable.
+	(erc-chanlist): Now displays message as a notice.  Also hides the
+	modeline if erc-chanlist-hide-modeline is non-nil.
+
+2004-01-05  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-server-PRIVMSG-or-NOTICE): Now nicks appear as
+	<nick> in query buffers, instead of as *nick*.
+
+2004-01-03  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-once-with-server-event-global): Changed to return
+	the uninterned symbol that it creates.
+	(erc-cmd-LIST): Changed to clean up hooks that don't run.
+
+2004-01-03  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-pcomplete.el (pcomplete/erc-mode/IDLE): Added to support new
+	/IDLE command.
+
+2004-01-03  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc.el (erc-once-with-server-event-global): New function.  Like
+	erc-once-with-server-event, except it modifies the global value of
+	the event hook.
+	(erc-cmd-IDLE): New function.  Implements the new /IDLE command.
+	Usage: /IDLE NICK (erc-seconds-to-string): New function.  Converts
+	a number of seconds to an Engligh phrase.
+
+2004-01-02  Francis Litterio <franl@users.sourceforge.net>
+
+	* erc-list.el: Added variable erc-chanlist-mode-hook.
+
+See ChangeLog.03 for earlier changes.
+
+    Copyright (C) 2004 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.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/erc/ChangeLog.05	Sun Feb 12 00:15:44 2006 +0000
@@ -0,0 +1,1228 @@
+2005-11-23  Johan Bockgård  <bojohan@users.sourceforge.net>
+
+	* erc.el (erc-cmd-SAY): Strip leading space in input line.
+
+2005-10-29  Michael Olson  <mwolson@gnu.org>
+
+	* FOR-RELEASE: Add stuff that needs to be done before the 5.1
+	release.  Longer-term items can be added to the 5.2 section.
+
+	* Makefile (SITEFLAG): New variable that indicates what variant of
+	"--site-flag" to use.  XEmacs needs "-site-flag".
+	(INSTALLINFO): New variable indicating how we should call
+	install-info when installing documentation.
+	(erc-auto.el, .elc.el): Use $(SITEFLAG).
+
+	* NEWS: Note that last release was 5.0.4.
+
+	* erc.texi: Initial and incomplete draft of ERC documentation.
+	Commence collaborate-documentation-hack-mode :^) .
+
+2005-10-29  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-ring.el (erc-replace-current-command): Revert last change
+	since it made the prompt disappear when using `erc-next-command'
+	and `erc-previous-command'.
+
+2005-10-28  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-input-marker): New variable that indicates the
+	position where text from the user begins, after the prompt.
+	(erc-mode-map): Bind <HOME> to erc-bol, just like C-a.
+	(erc): Initialize erc-input-marker.
+	(erc-display-prompt): Even in case where no prompt is desired by
+	the user, clear the undo buffer and set the input marker.
+	(erc-bol, erc-user-input): Simplify by using erc-input-marker.
+
+	* erc-pcomplete.el (pcomplete-parse-erc-arguments): Use
+	erc-insert-marker.
+
+	* erc-ring.el (erc-previous-command)
+	(erc-replace-current-command): Use erc-insert-marker.
+
+	* erc-spelling.el (erc-spelling-init): Make sure that even Emacs21
+	obeys erc-spelling-flyspell-verify.
+	(erc-spelling-flyspell-verify): Use erc-input-marker.  This should
+	make it considerably faster when switching to a buffer that has
+	seen a lot of activity since last viewed.
+
+2005-10-25  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-backend.el (erc-server-version, 004): Re-added setting of
+	`erc-server-version'.  It doesn't hurt to set, and it could be
+	used in modules or users' settings.
+
+	* NEWS: Added descriptions of some new features.
+
+2005-10-20  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-match.el (erc-current-nick-highlight-type): Set to `keyword'
+	as default.
+	(erc-beep-match-types): New variable.
+	(erc-text-matched-hook): Doc fix.  Added `erc-beep-on-match' to
+	customization options.
+	(erc-beep-on-match): New function.  If the MATCH-TYPE is found in
+	`erc-beep-match-types', beep.
+
+	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
+	New functions to deal with the difference in the number of
+	arguments accepted by `make-obsolete' and `make-obsolete-variable'
+	in Emacs and XEmacs.
+
+	* erc.el, erc-nets.el: Use `erc-make-obsolete' and
+	`erc-make-obsolete-variable'.
+
+	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
+	Handle `wrong-number-of-arguments' error instead of checking for
+	xemacs feature as future versions of XEmacs might accept three
+	arguments.
+
+2005-10-18  Edward O'Connor  <ted@oconnor.cx>
+
+	* erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module
+	docstrings.
+
+2005-10-08  Diane Murray  <disumu@x3y2z1.net>
+
+	* 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-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
+	Lisp mode knows how to indent erc-with-buffer blocks.
+	(with-erc-channel-buffer): Ditto.
+	(erc-with-all-buffers-of-server): Ditto.
+	(erc-modules): Use pcomplete by default, not completion, since
+	erc-complete.el is deprecated.  Use `fboundp' instead of
+	`symbol-value' to check for existence of a function before calling
+	it.  This was causing an error when untoggling the `completion'
+	option and trying to save via the customize interface.
+
+	* erc-track.el (erc-modified-channels-update): If a buffer is not
+	currently connected, remove it from the modified channels list.
+	This should fix the problem where residue was left on the mode
+	line after quitting ERC.
+
+	* erc-list.el (erc-prettify-channel-list): Docfix; thanks to John
+	Paul Wallington for reporting this.
+
+2005-05-31  Michael Olson  <mwolson@gnu.org>
+
+	* debian/changelog: First draft of entries for the 5.0.3 release.
+
+	* debian/README.Debian: Note that ERC will now install correctly
+	on versions of Emacs or XEmacs that do not have the `format-spec'
+	library.  Correct some grammar and prune the content a bit.
+
+	* debian/scripts/install (emacs20): Remove line since we no longer
+	need to deal with format-spec.el.
+
+	* NEWS: Add entries for the upcoming 5.0.3 release.
+
+	* erc.el: Don't require format-spec since this is provided in
+	erc-compat.el now.
+	(erc-process-sentinel, erc-setup-periodical-server-ping): Use
+	`erc-cancel-timer' instead of `cancel-timer'.
+	(erc-version-string): Update to 5.0.3.
+
+	* erc-autoaway.el (autoaway, erc-autoaway-reestablish-idletimer):
+	Use `erc-cancel-timer' instead of `cancel-timer'.
+
+	* erc-compat.el (format-spec, format-spec-make): If we cannot load
+	the `format-spec' library, provide versions of these functions.
+	This should keep problems from surfacing with Emacs21 Debian
+	builds.
+	(erc-cancel-timer): New function created to take the place of
+	`cancel-timer' since XEmacs calls it something else.
+
+	* erc-track.el (erc-modified-channels-update): Accept any number
+	of arguments, which are ignored.  This allows it to be run from
+	`erc-disconnected-hook' without extra bother.
+	(track): Add `erc-modified-channels-update' to
+	`erc-disconnected-hook' so that the indicators are removed
+	correctly in some edge cases.
+	(erc-modified-channels-display): Make sure that we never pass nil
+	to the function in `erc-track-shorten-function'.  This happens
+	when we have deleted buffers in `erc-modified-channels-alist'.
+	Also, make sure that the buffer has a non-nil short-name before
+	adding it to the string list.  This should fix some XEmacs
+	warnings when running /quit with unchecked buffers, as well as get
+	rid of a stray buffer problem (or so it is hoped).
+
+2005-05-31  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
+
+	* erc-replace.el, erc-speak.el: Clean up comment formatting.
+
+	* erc-ring.el (ring, erc-input-ring-index, erc-clear-input-ring):
+	Clean up docstring formatting.
+
+2005-05-30  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
+
+	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Delete superfluous
+	arg to `format'.
+	(erc-load-irc-script): Use `insert-file-contents' instead of
+	`insert-file'. Simplify.
+
+2005-05-29  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-version-string): Move this up so that it is
+	evaluated before the `require' statements.  Not a major change.
+
+2005-04-27  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
+
+	* erc.el (erc-complete-word): Simplify.
+
+2005-04-27  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (debrelease): Use a slightly different approach when
+	removing CVS and Arch cruft.
+
+	* debian/changelog: Update for 5.0.2-1 package.
+
+2005-04-25  Michael Olson  <mwolson@gnu.org>
+
+	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move code
+	block higher in file to fix a load failure when using Emacs21.
+	Thanks to Daniel Brockman for the report and fix.
+
+2005-04-24  Adrian Aichner  <adrian@xemacs.org>
+
+	* erc-backend.el (JOIN): save-excursion so that
+	`erc-current-logfile' inserts into the correct channel buffers
+	when using erc-log-insert-log-on-open in combination with autojoin
+	to multiple channels.
+
+2005-04-17  Adrian Aichner  <adrian@xemacs.org>
+
+	* erc-log.el: Remove stray whitespace.
+	* erc.el: Ditto.
+
+2005-04-09  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* erc.el: autoload erc-select-read-args, which, because it parses
+	erc-select's args, can be called before erc.el is loaded. 
+
+2005-04-07  Edward O'Connor  <ted@oconnor.cx>
+	
+	* erc-viper.el: Remove final newlines from previously-existing ERC
+	buffers. (Minor bug fix.)
+
+2005-04-06  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (debrelease): Ignore errors from deleting Arch and CVS
+	metadata.
+
+2005-04-05  Michael Olson  <mwolson@gnu.org>
+
+	* ChangeLog, CREDITS, AUTHORS: Correct name and email address of
+	Marcelo Toledo.
+
+2005-04-04  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-modules): Add entry for spelling module.
+
+	* erc-spelling.el: Add autoload line.
+
+	* erc-backend.el: Apply latest non-ascii patch from Kai Fan.
+	(erc-decode-parsed-server-response): Search
+	erc-response.command-args for channel name.  Decode the
+	erc-response struct using this channel name as key according to
+	the `erc-encoding-coding-alist'.
+
+	* erc-track.el: Apply patch from Henrik Enberg.
+	(erc-modified-channels-object): Use optimal amount of whitespace
+	around modified channels indicator.
+
+2005-04-02  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
+
+	* erc.el (define-erc-module, erc-with-buffer)
+	(erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
+	edebug-form-spec.
+
+	* erc-compat (erc-define-minor-mode): Ditto.
+
+2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
+
+	* erc-spelling.el: New file.
+
+2005-03-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
+
+	* erc-backend.el (define-erc-response-handler): Add
+	`definition-name' property to constructed symbols so that
+	find-function and find-variable will find them.
+
+2005-03-21  Michael Olson  <mwolson@gnu.org>
+
+	* erc-dcc.el, erc-goodies.el, erc-list.el, erc-notify.el,
+	erc-ring.el, erc.el: Copyright assignment occurred.
+
+	* debian/scripts/install: Make a shell wrapper around the original
+	Makefile and inline the Makefile.  The problem is that Debian
+	passes all the Emacs variants at once, rotating them at every
+	invocation of the install script, which happens once per variant.
+	This caused each installation to happen N-1 times more often than
+	it should have.  As a result, we need to only deal with the first
+	argument.
+	(ELFILES): Only add format-spec.el if we are compiling for
+	emacs21.  Don't filter out erc-compat.el.
+	(SITEFLAG): New variable that indicates that the "nosite" option
+	should look like.
+	(.DEFAULT): Use $(FLAVOUR) instead of $@ for clarity.
+
+	* debian/rules: Install NEWS file and compress it.
+
+	* debian/maint/postinst: Be more cautious about configuration
+	step.
+
+	* debian/copyright (Copyright): Another assignment came in.
+
+	* debian/control (Standards-Version): Update to a newer version as
+	recommended by lintian.
+
+	* debian/changelog: Changes made for the Debian package.
+
+	* debian/README.Debian: Keep only the General Notes section.
+
+	* NEWS: Move old history items here from debian/README.Debian.
+
+	* Makefile (SNAPSHOTDATE): Deprecate this option since we hope to
+	release more often.
+
+2005-03-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el (erc-define-catalog, `ctcp-request-to'): Fix typo (%: ->
+	%t:).
+
+2005-03-01  Michael Olson  <mwolson@gnu.org>
+
+	* erc-log.el (erc-save-buffer-in-logs): Replace tabs with spaces
+	in code indentation.
+
+2005-02-28  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-display-message): Apply corrected patch from Henrik
+	Enberg.
+
+2005-02-27  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-display-message): Apply patch from Henrik Enberg.
+	Check here to see if a message should be hidden, rather than
+	relying on code in each individual command.
+	(erc-version-string): Add "(CVS)" to the version string for
+	clarity.
+
+	* erc-backend.el (JOIN, KICK, MODE, NICK, PART, QUIT, TOPIC):
+	Don't check `erc-hide-list' here.
+
+	* erc-list.el, erc-match.el, erc.el, debian/copyright: Update
+	copyright information as a few more people have assignments
+	registered.
+
+2005-02-06  Michael Olson  <mwolson@gnu.org>
+
+	* erc-backend.el: Apply patch from Kai Fan for non-ASCII character
+	support.
+	(erc-parse-server-response): Add call to
+	`erc-decode-parsed-server-response'.
+	(erc-decode-parsed-server-response): New function that decodes a
+	pre-parsed server response before it can be handled.
+	(PRIVMSG): Comment out call to `erc-decode-string-from-target'.
+	(TOPIC): Ditto.
+
+2005-02-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
+
+	* erc.el (erc-process-sentinel-1): Don't reconnect on connection
+	refused. This error is reported differently when using
+	open-network-stream-nowait.
+
+2005-01-26  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-cmd-APPENDTOPIC, erc-set-topic): The control
+	character in `channel-topic' was changed to \C-o - replaced \C-c
+	with \C-o so that these functions work as expected again.
+	(erc-get-channel-mode-from-keypress): Doc fix.
+
+2005-01-25  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el, erc-button.el, erc-compat.el, erc-goodies.el,
+	erc-match.el, erc-nets.el, ChangeLog, NEWS: Merged bug fixes made
+	on release_5_0_branch since 5.0.1 release.
+
+2005-01-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
+
+	* erc.el (erc-input-action): Quote `erc-action-history-list' so
+	that input history actually works.
+	(erc-process-ctcp-query): Fix and simplify logic.
+	(erc-get-channel-mode-from-keypress): Use `C-' string syntax.
+	(erc-load-irc-script-lines): Use `erc-command-indicator' instead
+	of `erc-prompt'.
+
+2005-01-23  Edward O'Connor  <ted@oconnor.cx>
+	
+	* erc-viper.el: Ensure that `viper-comint-mode-hook' runs in
+	buffers whose `erc-mode-hook' has already run when this file is
+	loaded.
+	Explicitly `require' erc.el.
+
+2005-01-22  Edward O'Connor  <ted@oconnor.cx>
+	
+	* erc.el (erc-mode): Remove frobbing of `require-final-newline'.
+
+	* erc-log.el (erc-save-buffer-in-logs): Remove frobbing of
+	`require-final-newline'.
+
+	* erc-viper.el: New file. This is where all ERC/Viper
+	compatiibilty code should live. When and if ERC is bundled with
+	Emacs, some of the hacks in this file should be merged into Viper
+	itself.
+
+2005-01-21  Edward O'Connor  <ted@oconnor.cx>
+	
+	* erc.el (erc-mode): Set `require-final-newline' to nil in ERC
+	buffers. This prevents a Viper misfeature whereby extraneous
+	newlines are inserted into the ERC buffer when switching between
+	viper states.
+
+	* erc-log.el (erc-save-buffer-in-logs): Bind `require-final-newline'
+	to t when calling `write-region' to ensure that further log
+	entries start on fresh lines.
+	
+2005-01-21  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-button.el (erc-button-add-face): Reverted my change to the
+	order faces since it had the unwanted effect of putting the button
+	face after all others.
+	(erc-button-face-has-priority): Removed this variable as it is not
+	necessary anymore - it was used to compensate for the above
+	mentioned change.
+
+	* NEWS: Added the latest fixes.
+
+2005-01-20  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-button.el, erc-match.el:
+	(erc-button-syntax-table, erc-match-syntax-table): Added \ as a
+	legal character for nicknames.
+
+	* erc-nets.el (erc-server-select): Fixed so that only networks
+	with servers found in `erc-server-alist' are available as choices.
+
+	* erc.el, erc-compat.el, erc-goodies.el:
+	(erc-replace-match-subexpression-in-string): New function.  Needed
+	because `replace-match' in XEmacs doesn't replace regular
+	expression subexpressions in strings, only in buffers.
+	(erc-seconds-to-string, erc-controls-interpret): Use the new
+	function.
+
+	* erc-button.el (erc-button-add-button): Use the `:button-face'
+	key combined with an `erc-mode' local `widget-button-face' set to
+	nil to get the widget overlay face suppressed in XEmacs.
+
+2005-01-19  Francis Litterio  <franl@world.std.com>
+
+	* erc-button.el (erc-button-add-face): The face added by this
+	function is more important than the existing text's face, so we
+	now prepend erc-button-face to the list of existing faces when
+	adding a button.  To instead append erc-button-face to existing
+	faces, set variable `erc-button-face-has-priority' to nil.
+	(erc-button-face-has-priority): New variable to control how
+	erc-button-add-face adds erc-button-face to existing faces.
+	(erc-button-press-button): Silenced a byte-compiler warning about
+	too few arguments in a call to `error'.
+
+2005-01-19  Diane Murray  <disumu@x3y2z1.net>
+
+	* NEWS: Added list of 5.0.1 fixes.
+
+2005-01-19  Michael Olson  <mwolson@gnu.org>
+
+	* AUTHORS: Move to format that cscvs can understand.  As an added
+	perk, entries line up nicer.
+
+	* erc.el, erc-fill.el, erc-pcomplete.el, debian/copyright: Merge a
+	few more copyright lines thanks to Alex Schroeder's BBDB file.
+
+	* Makefile: Change version to correspond with our new scheme.
+
+2005-01-18  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-list.el (erc-chanlist-channel-line-regexp): Now matches
+	private channels, the channels `#' and `&', and channels with
+	names including non-ascii characters.
+	(erc-chanlist-join-channel): Don't attempt to join private
+	channels since the channel name is unknown.
+
+	* erc-goodies.el (erc-make-read-only): Add `rear-nonsticky'
+	property to avoid `Text is read-only' errors during connection.
+	`front-nonsticky' does not exist, changed to `front-sticky'.
+	(erc-controls-interpret, erc-controls-strip): Just work on the
+	string, don't open a temporary buffer.
+	(erc-controls-propertize): Now accepts optional argument STR.
+
+2005-01-17  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile: Version is 5.01, but only in the Makefile.  It has not
+	been released yet.
+
+	* erc-auto.in, erc-autojoin.el, erc-bbdb.el, erc-button.el,
+	erc-chess.el, erc-complete.el, erc-dcc.el, erc-fill.el,
+	erc-goodies.el, erc-ibuffer.el, erc-identd.el, erc-imenu.el,
+	erc-list.el, erc-match.el, erc-menu.el, erc-nets.el,
+	erc-netsplit.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el,
+	erc-ring.el, erc-speak.el, erc-speedbar.el, erc-stamp.el,
+	erc-track.el, erc-xdcc.el, erc.el, debian/copyright: Update
+	copyright notices.  If anyone has signed papers for Emacs in
+	general, merge them with the FSF's entry.
+
+2005-01-16  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc): `erc-set-active-buffer' was being called before
+	`erc-process' was set, so that channels weren't being marked
+	active correctly upon join; fixed.
+
+2005-01-15  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
+
+	* erc-backend.el (def-edebug-spec): This macro caused problems (in
+	XEmacs). Use its expansion directly.
+
+2005-01-15  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-button.el (erc-button-add-button): Reverted previous change
+	since `:suppress-face' doesn't seem to be checked for a certain
+	face.
+	(erc-button-add-face): FACE is now appended to the `old' face.
+	This should fix the problem of faces being "covered" by
+	`erc-button-face'.
+
+2005-01-14  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el, erc-backend.el (erc-cmd-OPS, erc-cmd-COUNTRY,
+	erc-cmd-NICK, erc-process-ctcp-query, ERROR, PONG, 311, 312, 313,
+	314, 317, 319, 320, 321, 322, 330, 352): Use catalog entries
+	instead of hard-coded text messages.
+	(english): Added new catalog entries `country', `country-unknown',
+	`ctcp-empty', `ctcp-request-to', `ctcp-too-many', `nick-too-long',
+	`ops', `ops-none', `ERROR', `PONG', `s311', `s312', `s313',
+	`s314', `s317', `s317-on-since', `s319', `s320', `s321', `s322',
+	`s330', and `s352'.
+	(erc-send-current-line): Use `erc-set-active-buffer' (change was
+	lost in previous bug fix).
+
+2005-01-14  Francis Litterio  <franl@world.std.com>
+
+	* erc-button.el (erc-button-add-button): Fixed a bug where the
+	overlay created by widget-convert-button has a `face' property
+	that hides the `face' property set on the underlying button text.
+
+	* erc-goodies.el: Docstring fix.
+
+	* erc-button.el: Improved docstring for variable erc-button-face.
+
+2005-01-13  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-menu.el (erc-menu-definition): "Topic set by channel
+	operator": Small word change.  "Identify to NickServ...": Check
+	that we're connected to the server.  Added "Save buffer in log"
+	and "Truncate buffer".
+
+2005-01-13  Lawrence Mitchell  <wence@gmx.li>
+
+	* erc.el (erc-display-line-1): Widen before we try to insert
+	anything, this makes sure input isn't broken when the buffer is
+	narrowed by the user.
+	(erc-beg-of-input-line): Simplify, just return the position of
+	`erc-insert-marker' or error if does not exist.
+	(erc-send-current-line): Widen before trying to send anything.
+
+2005-01-13  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el, erc-backend.el, erc-list.el:
+	(erc-update-mode-line-buffer): Strip controls characters from
+	`channel-topic' since we add our own control character to it.
+	(TOPIC, 332): Use \C-o instead of \C-c to force an end of IRC
+	control characters as it also ends bold, underline, and inverse -
+	\C-c only ends colors.
+	(erc-chanlist-322): Strip control characters from channel and
+	topic.  No need to interpret controls when we're applying overlays
+	to the lines.
+
+	* erc.el, erc-backend.el, erc-button.el, erc-netsplit.el,
+	erc-nicklist.el: Fixed so that each server has an active buffer.
+	(erc-active-buffer): Now a buffer-local variable.
+	(erc-active-buffer, erc-set-active-buffer): New functions.
+	(erc-display-line, erc-echo-notice-in-active-non-server-buffer,
+	erc-process-away, MODE): Call `erc-active-buffer' to get the
+	active buffer for the current server.
+	(erc, erc-process-sentinel-1, erc-grab-region, erc-input-action,
+	erc-send-current-line, erc-invite-only-mode,
+	erc-toggle-channel-mode, erc-channel-names, MODE, erc-nick-popup,
+	erc-nicklist-call-erc-command): Use `erc-set-active-buffer' to set
+	the active buffer for the current server.
+	(erc-cmd-WHOLEFT): Use 'active as BUFFER in `erc-display-message'.
+
+	* erc-track.el (erc-track-modified-channels): Server buffers are
+	now treated the same as channels and queries.  This means that
+	`erc-track-priority-faces-only', `erc-track-exclude', and
+	`erc-track-exclude-types' now work with server buffers.
+
+2005-01-12  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-backend.el (475): Prompt for the channel's key if
+	`erc-prompt-for-channel-key' is non-nil.  Send a new JOIN message
+	with the key if a key is provided.
+
+	* erc.el (erc-command-indicator): Fixed customization choices so
+	that there's no `mismatch' message when nil is the value.
+
+2005-01-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc-bbdb.el (bbdb): Lowercase the name of the module.  This
+	fixes a bug which caused an error to occur when trying to enable
+	the module using the customization interface.
+
+2005-01-08  Edward O'Connor  <ted@oconnor.cx>
+
+	* erc-track.el: Support using faces to indicate channel activity
+	in the modeline under XEmacs.
+	(erc-modified-channels-object): New function.
+	(erc-modified-channels-display): Use it.
+	`erc-modified-channels-string' renamed to
+	`erc-modified-channels-object' (because it's no longer a string on
+	XEmacs). The new function `erc-modified-channels-object' is used
+	to generate updated values for the same-named variable.
+
+2005-01-08  Diane Murray <disumu@x3y2z1.net>
+
+	* ChangeLog.2002: Changed instances of my sourceforge username and
+	email address to real name and email.
+
+	* erc.el (erc-modules): Changed customization tag descriptions, so
+	that they all start with a verb; added new modules to choices.
+
+2005-01-08  Mario Lang  <mlang@delysid.org>
+
+	* debian/rules: Introduce new variable DOCDIR to simplify stuff a
+	bit.
+
+2005-01-08  Michael Olson  <mwolson@gnu.org>
+
+	* AUTHORS, ChangeLog.2004: Change bpalmer's email address as
+	requested.
+
+	* CREDITS: Add everyone who is mentioned in the ChangeLogs.
+
+	* debian/copyright (Copyright): Add last few people.  This can now
+	be considered a complete list, as far as CVS entries are
+	concerned.  If people have assigned copyright to the FSF, merge
+	them with the entry for the FSF.
+
+	* debian/README.Debian: Add entry for XEmacs-related change in
+	`erc-track.el'.
+
+	* erc.el (erc-cmd-MODE): New command that changes or displays the
+	mode for a channel or user.  The functionality was present before
+	this change, but there was no documentation for it.
+
+	* erc-auto.in, erc-*.el: Fully investigate copyright headers and
+	change them appropriately.  If a file has been pulled off of
+	erc.el at one time, keep track of copyright from the time of
+	separation, but not before.  If a file has been derived from a
+	work outside of erc, keep copyright statements in place.
+
+	* Makefile (VERSION): Change to 5.0! :^) Congrats on all the great
+	work.  I'll wait until hober commits his XEmacs compatibility
+	patch to erc-track.el, and then release.
+	(distclean): Alias for `realclean' target.
+
+2005-01-07  Michael Olson  <mwolson@gnu.org>
+
+	* AUTHORS: Add Marcelo Toledo, who has CVS access to this project.
+
+	* ChangeLog.2004: Add my name to my one contribution to erc last
+	year.
+
+	* CREDITS: Add people that were discovered while scouring
+	ChangeLogs.
+
+	* debian/copyright: Add everyone from `AUTHORS' to Upstream
+	Authors.  Anyone who has contributed 15 or more lines of
+	code (according to ChangeLogs) is listed in Copyright section.
+	Accurate years are included.
+
+	* debian/README.Debian: Paste content of NEWS and reformat
+	slightly.
+
+	* debian/rules: Concatenate the ChangeLogs during the Debian
+	install process and then gzip them.
+
+	* Makefile (MISC): Add ChangeLog.yyyy files to list.
+	(ChangeLog): Remove rule since we do not dynamically generate the
+	ChangeLog anymore.
+
+	* MkChangeLog: Removed since we do not use it to generate the
+	ChangeLog anymore.  cvs2cl does a much better job anyway.
+
+	* NEWS: Use 3rd level heading instead of bullets for lists that
+	contain descriptions.
+
+2005-01-07  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-list.el: Require 'sort.
+	(erc-chanlist): Disable undo in the channel list buffer.
+
+	* erc.el, erc-menu.el: The `IRC' menu is now automatically added
+	to the menu-bar.  Add the call to `easy-menu-add' to
+	`erc-mode-hook' when running in XEmacs (without this the menu
+	doesn't appear).
+
+	* NEWS: Added the information from
+	http://emacswiki.org/cgi-bin/wiki/ErcCvsFeatures and the newer
+	changes which weren't yet documented on that page.
+
+2005-01-06  Hoan Ton-That  <hoan@ton-that.org>
+
+	* erc-log.el (erc-current-logfile): Only downcase the logfile
+	name, not the whole filename.  Also expand relative to
+	`erc-log-channels-directory'.
+	(erc-generate-log-file-name-with-date)
+	(erc-generate-log-file-name-short)
+	(erc-generate-log-file-name-long): Don't expand filename, done in
+	`erc-current-logfile'.
+
+2005-01-06  Lawrence Mitchell  <wence@gmx.li>
+
+	* NEWS: New file, details user visible changes from version to
+	version.
+
+	* HACKING (NEWS entries): Mention NEWS file, and what its purpose
+	is.
+
+2005-01-05  Michael Olson  <mwolson@gnu.org>
+
+	* FOR-RELEASE: New file containing the list of release-critical
+	tasks.  Feel free to add to it.
+
+	* debian/rules (binary-erc): Add ChangeLog files.
+
+2005-01-04  Michael Olson  <mwolson@gnu.org>
+
+	* ChangeLog.2001, ChangeLog.2002, ChangeLog.2003, ChangeLog.2004:
+	ChangeLog entries from previous years.
+
+	* ChangeLog: New file containing ChangeLog entries for the current
+	year.  Please update this file manually whenever a change is
+	committed.  This is a new policy.
+
+	* AUTHORS: Add myself to list.  Some entries were space-delimited
+	instead of TAB-delimited, and since the latter seemed to be the
+	default, make the other entries conform.
+
+	* HACKING (ChangeLog Entries): Update section to reflect new
+	policy toward ChangeLog entries, which is that they should be
+	manually updated whenever a change is committed.
+
+2005-01-04  Diane Murray <disumu@x3y2z1.net>
+
+	* erc.el (erc-connection-established, erc-login): Update the
+	mode-line.
+	(erc-update-mode-line-buffer): If `erc-current-nick' returns nil,
+	use an empty string for ?n character in format spec.  Set
+	`mode-line-process' to ":connecting" while the connection is being
+	established.
+
+2005-01-04  Lawrence Mitchell <wence@gmx.li>
+
+	* AUTHORS: Update list of authors.
+
+2005-01-02  Diane Murray <disumu@x3y2z1.net>
+
+	* erc-goodies.el (erc-control-characters): New customization
+	group.
+	(erc-interpret-controls-p): Small fix, addition to
+	documentation. Updated customization to allow 'remove as a value.
+	Use 'erc-control-characters as `:group'.
+	(erc-interpret-mirc-color): Use 'erc-control-characters as
+	`:group'.
+	(erc-beep-p): Updated documentation.  Use 'erc-control-characters
+	as `:group'.
+	(define-erc-module irccontrols): Add `erc-controls-highlight' to
+	`erc-insert-modify-hook' and `erc-send-modify-hook' since it
+	changes the text's appearance.
+	(erc-controls-remove-regexp, erc-controls-interpret-regexp): New
+	variables.
+	(erc-controls-highlight): Fixed so that highlighting works even if
+	there is no following control character.  Fixed mirc color
+	highlighting; now respecting `erc-interpret-mirc-color'.  Fixed a
+	bug where emacs would get stuck in a loop when \C-g was in a
+	message and `erc-beep-p' was set to nil (default setting).
+
+See ChangeLog.04 for earlier changes.
+
+    Copyright (C) 2005 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.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba
--- a/lisp/erc/ChangeLog.2001	Mon Feb 06 18:44:57 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1046 +0,0 @@
-2001-12-18  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.176: * Added missing 747 numreply (banned)
-
-2001-12-15  Gergely Nagy  <algernon@debian.org>
-
-	* debian/scripts/install 1.4, debian/rules 1.6:
-	updated to 2.1.cvs.20011215-1
-
-	* debian/changelog 1.12: Debian version 2.1.cvs.20011215-1
-
-2001-12-11  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.175:
-	* applied a nicer version of mhp's patch to remove the last prompt from
-	  saved logs
-
-	* erc-replace.el 1.1: * Initial checkin
-
-2001-12-11  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.174:
-	* fixed bug triggered when reuse-buffer was enabled (the default).
-	  Another silly port type problem. Maybe we should unify that once and for all sometimes...
-
-2001-12-10  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.173: * erc-message-english: New QUIT and s004 entries.
-	* erc-save-buffer-on-part: New variable.
-	* erc-kill-buffer-on-part: New variable.
-	* (erc-server-PART): Use above variables.
-	* (erc-join-channel): Use DEF argument instead of initial input for completing-read.
-
-2001-12-08  Tijs van Bakel  <smoke@wanadoo.nl>
-
-	* erc.el 1.172: added defcustom erc-nick-uniquifier ^ (i prefer _)
-
-2001-12-07  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.11: changelog for version 2.1.cvs.20011208-1
-
-2001-12-07  Tijs van Bakel  <smoke@wanadoo.nl>
-
-	* erc.el 1.171:
-	Added erc-scroll-to-bottom as an erc-insert-hook function.  It still bugs a bit, so please test it, thanks
-
-2001-12-07  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.170: * Fixed silly bug in erc-server-TOPIC (thanks mhp)
-
-	* erc-speak.el 1.17:
-	* Fix non-greedy matching bug. That one somehow swallowed text
-
-	* erc.el 1.169:
-	Fix Emacs20 problem. For now, we disable erc-track-modified-channels-minor-mode in emacs20
-
-2001-12-07  Andreas Fuchs  <asf@void.at>
-
-	* erc-fill.el 1.5:
-	* Fix another stupid one-off error. This time it really works!
-	 (Until I find the next bug. I guess you can hold your breath) (-:
-
-2001-12-06  Andreas Fuchs  <asf@void.at>
-
-	* erc-fill.el 1.4: * Fixed static filling:
-	** No more \ed (continued on next line) lines anymore
-	** Fixed bug with previous version where longer lines wouldn't get
-	   filled correctly (i.e. at all)
-
-2001-12-06  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.10: changelog for 2.1.cvs.20011206-1 added
-
-2001-12-06  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.168:
-	* Don't discard away status when identifying to NickServ
-	* Modify `erc-already-logged-in': check for port, too.
-
-	* erc-fill.el 1.3:
-	* Fix stupid loop non-termination error in erc-fill-static when filling
-	  one-line regions.
-	* Make erc-count-lines return meaningful values
-
-2001-12-05  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.167:
-	* (erc-process-input): Make ' /command' work for quoting /commands
-
-	* erc-speak.el 1.16: see changelog
-
-	* erc-fill.el 1.2: see erc.el changelog
-
-	* erc.el 1.166:
-	* erc-insert-hook: Changed strategy completely, no start end parameters any more.
-	We narrow-to-region now, thats much cleaner.
-	* rename erc-fill-region to erc-fill and change the autoload
-	** You'll probably need to restart Emacs
-
-2001-12-04  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.165:
-	* (erc-send-current-line): Fixed long outstanding bug. XEmacs users with erc-fill-region on erc-insert-hook knew that one a long time.
-
-	* erc.el 1.164: fix order of attack
-
-	* erc.el 1.163: * macroexpanded define-minor-mode for XEmacs
-
-	* erc.el 1.162: First try to make channel tracking mouse sensitive
-
-	* erc.el 1.161: * More erc-message-format conversion.
-	  erc-format-message-english-PART as an example on how to use functions to format message
-	* (erc-format-message): Fallback mechanism to use english catalog if variable is not bound
-
-2001-12-03  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.160: * (erc-iswitchb): Rewrite, docfix.
-	Make it use erc-modified-channels as default if available.
-
-	* erc-menu.el 1.2:
-	* Fixage related to erc-track-modified-channels-minor-mode rewrite
-
-	* erc.el 1.159:
-	* erc-track-modified-channels-minor-mode: Use buffer objects instead of erc-default-target return value for internal state keeping.
-
-	* erc.el 1.158: * Made reconnect behave nicer (erc-process-sentinel)
-	* Rewrote erc-modified-channels-tracking completely.
-	  Its now a minor mode (erc-track-modified-channels-minor-mode)
-	  It uses a list as internal representation now, so all silly string-parsing
-	  related bugs should be gone.
-	  Use (erc-track-modified-channels-minor-mode t) now to toggle this functionality.
-	  Dont set the erc-track-modified-channels-minor-mode variable yourself, use the toggle function
-
-2001-11-29  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.9: final version
-
-2001-11-29  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.157:
-	* (erc-channel-p): Make it work with string and buffer as parameter. buffer.
-	* (erc-format-message): Add a check for functionp. This allows a format-specifier also to be a function name, which gets called with args applied and needs to return the actual format string.
-	* Converted some formats, JOIN, JOIN-you, MODE, ...
-
-2001-11-28  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.156:
-	* (erc-prepare-mode-line-format): Added sanity checks to prevent it from having problems with server buffers where the connection failed
-
-	* erc-bbdb.el 1.7:
-	* (erc-bbdb-JOIN): regexp-quote the fingerhost before searching, some people have really strange characters as their user names
-
-	* erc.el 1.155: Remove a stupid debug like (message ...) call
-
-2001-11-28  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.8: draft of 2.1.cvs.20011128-1
-
-	* debian/rules 1.5: simplify for the all-in-one erc package
-
-	* debian/control 1.3: integrated erc-speak back into erc
-
-	* debian/maint/conffiles 1.3, debian/maint/conffiles.in 1.2, debian/maint/postinst 1.3, 
-	  debian/maint/postinst.in 1.2, debian/maint/prerm 1.3, debian/maint/prerm.in 1.2, 
-	  debian/scripts/install 1.3, debian/scripts/install.in 1.3, debian/scripts/remove 1.3, 
-	  debian/scripts/remove.in 1.2, debian/scripts/startup.erc-speak 1.2:
-	since erc-speak is gone, resurrect the static files, and update them to support the latest erc
-
-2001-11-28  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.154: * (erc-mode): Shouldn't be interactive.
-	* (erc-info-mode): Ditto.
-
-	* erc.el 1.153: * (erc-server-352): Added hopcount parsing.
-	Added call to erc-update-channel-member to fill in channel-members information
-	on /WHO if the channel is joined.
-
-2001-11-27  Mario Lang  <mlang@delysid.org>
-
-	* erc-speedbar.el 1.6: *** empty log message ***
-
-	* erc-speedbar.el 1.5: * (erc-speedbar-expand-user): New function.
-	Used when more information than just the nick name is available about a dude.
-
-	* erc.el 1.152: * Fixed stupid edit,checkin,save cycle error :)
-
-	* erc.el 1.151:
-	* (erc-generate-log-file-name-default): Renamed to -long
-	Doc fix.
-	* (erc-generate-log-file-name-old): Renamed to -long
-	Doc fix.
-	* erc-generate-log-file-name-function: Set default to ...-long
-	Doc fixes
-
-	* erc-speedbar.el 1.4: *** empty log message ***
-
-2001-11-26  Mario Lang  <mlang@delysid.org>
-
-	* erc-speedbar.el 1.3: * Integrated channel names list
-	  what else do we need to replace info buffers???
-	  please test that code and comment on erc-ehlp, thanks
-
-	* erc-speedbar.el 1.2:
-	* Added erc-speedbar-goto-buffer and therefore enable switching to the buffers from speedbar
-
-	* erc-speedbar.el 1.1:
-	I had to check this in, it works !! sort of,, megaalphagammaversion, first version. test, play, submit ideas/patches
-
-2001-11-26  Gergely Nagy  <algernon@debian.org>
-
-	* erc.el 1.150 (erc-mode): moved erc-last-saved-position here
-	moved buffer naming code from here..
-	(erc): ...to here
-	(erc-generate-log-file-name-old): only prepend target if it exists
-
-	made erc-log-insert-log-on-open a defcustom
-
-2001-11-26  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.149:
-	* Applied antifuchs/mhp patches, the latest on erc-help, unmodified
-	* New variable: erc-reuse-buffers default to t.
-	* Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, 
-	  then one can assume thats the same channel/query target again.
-
-2001-11-23  Mario Lang  <mlang@delysid.org>
-
-	* erc-bbdb.el 1.6:
-	* new function erc-BBDB-NICK to handle nickname anotation on a nick-change event of a known record
-
-	* erc.el 1.148: * Remove erc-rename-buffer, its no longer necessary
-	* Remove erc-autoop-*. it was broken, and needed rewrite anyway
-	* write erc-already-logged-in in terms of erc-buffer-list and make the duplicate login check work again
-
-	* erc.el 1.147: * Fixed stupid typo
-
-2001-11-22  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.146: * New local variable, erc-announced-server-name
-	* erc-mode-line-format supports a new symbol, target-and/or-server
-	* The mode-line displays the announced server name now (for autojoin later..., 
-	  greets Adam)
-	* New macro, erc-server-hook-list for a nice way to define the defcustoms of the erc-server-*-hook's
-	  Thanks go to the guy from #emacs who helped with that
-	* erc-fill-region is now autoloaded from erc-fill.el
-	  * erc-fill.el implements a new fill method, erc-fill-static
-	    (setq erc-fill-function 'erc-fill-static)
-	* Some other things I forgot right now
-
-	* erc-bbdb.el 1.5: *** empty log message ***
-
-	* erc-fill.el 1.1: Initial version.
-
-	* erc-complete.el 1.4:
-	Applied antifuchs patch to make completion work with (string= erc-prompt "")
-
-	* erc-complete.el 1.3:
-	added function erc-nick-completion-exclude-myself
-	you can set erc-nick-completion to 'erc-nick-completion-exclude-myself to use it
-
-2001-11-21  Mario Lang  <mlang@delysid.org>
-
-	* erc-bbdb.el 1.4:
-	* Changed usage of 'finger-host to bbdb-finger-host-field
-
-	* erc-bbdb.el 1.3:
-	* Changed WHOIS to use finger-host instead of net field.
-	* Added 'visible as option to erc-bbdb-popup-p to only pop-up the bbdb buffer if a join happened in a visible buffer on any visible frame.
-	* Added (regexp-quote ...) for nickname search in erc-bbdb-JOIN
-
-2001-11-20  Mario Lang  <mlang@delysid.org>
-
-	* erc-bbdb.el 1.2: * Added JOIN support
-
-2001-11-19  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.145:
-	Initial message catalog code. converted erc-action-format usage to use it
-
-	* erc.el 1.144: * erc-play-sound: Added XEmacs related check
-
-	* erc-bbdb.el 1.1: * Initial version, many thanks to Andreas Fuchs
-
-	* erc.el 1.143: * Fixed silly problem with whois/was handling
-
-	* erc.el 1.142: * Renamed prev-rd to erc-previous-read
-	* Removed erc-next-line-add-newlines and s next-line-add-newlines to nil in defun erc by default
-
-	* erc.el 1.141:
-	fixed xemacs compatibility prob with delete, thanks Adam
-
-2001-11-18  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.140: numreplies 301 & 461
-
-2001-11-13  Tijs van Bakel  <smoke@wanadoo.nl>
-
-	* erc.el 1.139:
-	Added code for error reply 421 "Unknown command", to test the new server parsing system.
-	This was really easy!  Thanks ZenIRC guys & delysid :-)
-
-2001-11-13  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.138: * Allow connecting to SSL enabled irc servers.
-	   Ugly hack, but it works for now. Be sure to use the numeric irc port 994 so that erc can recognize what you want
-	  good example is
-	irc server: ircs.segfault.net
-	port: 994
-
-	meet me there, I am still delYsid :)
-
-	* erc.el 1.137: * some more numreply handlers
-	* cleanup in erc-process-away-p
-	* new function erc-display-error-notice
-
-	* erc.el 1.136: * numreply 501 and 221
-
-	* erc.el 1.135:
-	removed obsolete old hook variables. Your functions may break, but it is easy to hook them up to the new hooks.
-	erc-part-hook: use erc-server-PART-hook instead
-	erc-kick-hook: use erc-server-KICK-hook instead
-	and so on
-
-	* erc.el 1.134:
-	fixed serious bug which cause privmsgs vanishing when erc-auto-query was set to nil
-
-	* erc.el 1.133: cleaned up erc-process-filter
-
-	* erc.el 1.132: * 401 and 320 numreplies implemented
-
-	* erc.el 1.131: * Removed old/now obsolete code
-
-	* erc.el 1.130: * Fixed bug in erc-server-MODE
-
-2001-11-12  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.129: fixed it
-
-	* erc.el 1.128:
-	*** We switched over. New server message parsing/handling is running now. Thansk to the zenirc developers for the great ideas I got from the code!!!!! Go and test it, poke at it, bug me on irc about problems
-
-	* erc.el 1.127: *** empty log message ***
-
-2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
-
-	* erc.el 1.125:
-	Fixed bug in erc-get-buffer, now channel names are compared in
-	a case-insensitive way.
-
-2001-11-12  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.124: erc-server-353
-
-2001-11-12  Tijs van Bakel  <smoke@wanadoo.nl>
-
-	* erc.el 1.123: Fixed docstring for erc-get-buffer.
-	Added erc-process to a lot of calls to erc-get-buffer, so
-	that only the local process is searched.
-
-2001-11-12  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.122: * erc-buffer-filter: do it differently
-
-	* erc.el 1.121: ugly but working fix for mhp's query problem
-
-	* erc.el 1.120: * erc-server-PRIVMSG-or-NOTICE
-	  Now, all the server word replies are finished. Going to numreplies now
-
-	* erc.el 1.119:
-	* debugging fascilities for the transition. C-x 2 C-x o M-x ielm RET erc-server-vectors RET ; to get a list of all server messages currently not handled in the new code. Feel free to pick one and implement it
-
-	* erc.el 1.118: * erc-server-KICK and erc-server-TOPIC. new functions
-	* erc-server-305-or-306 and erc-server-311-or-314
-
-	* erc.el 1.117:
-	* ported PART and QUIT msgs to the new scheme, many to go. but it is a easy task. does someone wanna try and start with numreplies?
-
-	* erc.el 1.116: * erc-server-JOIN
-
-	* erc.el 1.115: * Ported erc-server-INVITE code
-
-	* erc.el 1.114: * erc-server-ERROR and erc-server-MODE
-
-2001-11-11  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.113: * zen
-
-	* erc.el 1.112: * New variable erc-connect-function.
-
-	* erc.el 1.111:
-	* New function erc-channel-p and use it where appropriate
-
-	* erc.el 1.110: * Removed the variable erc-buffer-list completely now
-	* Moved erc-dbuf around a bit
-
-	* erc.el 1.109: * Fix silly change in quit/rename msg handling
-
-	* erc.el 1.108: thanks mhp, fixed
-
-	* erc.el 1.107: * Tijs van Bakel's work from 10th Nov. merged in
-	* My additions to that idea merged in too
-	Basicly, this is a major rewrite, if you are scared and want avoid problems,
-	stay at your current version. It seems fairly stable though.
-	That changed? erc-buffer-name handling was completely rewritten,
-	and erc-buffer-list local variable handling removed.
-	Simplifies alot of code. Poke at it. read the diff. report bug/send patches!
-
-	* erc.el 1.106: * Added variable listing when /set is used without args
-
-2001-11-10  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.105:
-	* Comment/structure cleanup, removal of unnecessary code
-
-	* erc.el 1.104: only some code beautification
-
-	* erc-imenu.el 1.2:
-	remove add-hook call, thats done in erc.el now for autoloadability
-
-	* erc.el 1.103: * Make erc-imenu autoloadable
-
-	* erc.el 1.102:
-	* The long promised erc-mode-line-format handling rewrite
-	   Poke at it, try it, play with it, report bugs
-
-	* erc.el 1.101:
-	some regex-quote fixes, new function erc-cmd-set, and minor things
-
-2001-11-08  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.100:
-	* added second timestamp-format (erc-away-timestamp-format) for marking msgs when being away
-
-	* erc-complete.el 1.2: fixed silly deffun
-
-	* erc.el 1.99: * Rewrote erc-load-irc-script (simplified)
-	* Removed depricated code
-
-	* erc-speak.el 1.15: * reflect changes in erc.el
-
-	* erc.el 1.98:
-	* Moved completion related functions into erc-complete.el
-	  placed an autoload instead into erc.el. That quite cool,
-	  because erc-complete.el only gets loaded when you use
-	  TAB first time in erc.
-
-	* erc-complete.el 1.1: _ Initial checkin
-
-	* erc.el 1.97: * New function: erc-chain-hook-with-args
-	* Changed calls to erc-insert-hook to use it
-
-2001-11-07  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.96: * Patch from Fabien Penso
-	  Make completion case insensitive. try it! its cool
-
-	* erc.el 1.95: * Reduction patch 2
-	  This time, we move the input ring handling into erc-ring.el
-	  Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature
-	  And remeber, that you dont need it if you dont use input ring :-)
-
-	* erc-ring.el 1.1: * Initial checkin
-
-	* erc.el 1.94: * The great reduction patch :-)
-	  moved relevant function from erc.el to new file erc-menu.el and erc-imenu.el
-
-	* erc-imenu.el 1.1: nitial version
-
-	* erc-menu.el 1.1: * Initial version
-
-	* erc.el 1.93: * wording change suggested by Benjamin Drieu
-
-2001-11-07  Tijs van Bakel  <smoke@wanadoo.nl>
-
-	* erc.el 1.92: Added Emacs version to /SV
-
-2001-11-07  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.91: * Hookification patch, read the diff
-
-	* erc.el 1.90: too tired for a changelog :)
-
-2001-11-06  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.89:
-	* make erc-cmd-op and erc-cmd-deop take multiple nicknames as argument
-
-2001-11-06  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.7: sync
-
-	* debian/rules 1.4: fixed a typo: PKGDIR, not PKIDR
-
-2001-11-06  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.88:
-	* Changed timestamping when away to use erc-timestamp-format and append the timestamp instead of prepending it..
-	* minor cleanup, s/(if (not /(unless/ and thelike
-
-2001-11-06  Tijs van Bakel  <smoke@wanadoo.nl>
-
-	* erc.el 1.87: Fixed OP and DEOP commands to return T.
-	Added SV say-version command.
-	Added erc-send-message utility function, but it's not used everywhere yet.
-
-2001-11-05  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.86: stupid delYsid, forgot require 'format-spec. good nite
-
-	* erc.el 1.85:
-	* new variable erc-action-format. Some erc-notice-prefix fixes again
-
-	* erc.el 1.84: * erc-minibuffer-privmsg defaults to t
-
-	* erc.el 1.83:
-	* Small fix in relation to the transition to erc-make-notice
-
-2001-11-05  Tijs van Bakel  <smoke@wanadoo.nl>
-
-	* erc.el 1.82:
-	Renamed erc-message-notices to erc-minibuffer-notice, and renamed erc-prevent-minibuffer-privmsg to erc-minibuffer-privmsg, inverting its functionality
-
-	* erc.el 1.81: Added support for channel names starting with & + and !.
-	Also, many changes partially discussed on the mailinglist:
-
-		* erc.el (cl): Add requirement for cl package.
-		(erc-buffer-list): Make this variable global again.
-		(erc-default-face): Fix typo.
-		(erc-timestamp-face): Add face for timestamps.
-		(erc-join-buffer, erc): Add a 'bury option.
-		(erc-send-action): Add timestamp.
-		(erc-command-table): Add /CLEAR, /DEOP, /OP, /Q.
-		(erc-send-current-line): Add timestamp.
-		(erc-send-current-line): Add call to erc-insert-hook.
-		(erc-cmd-clear): New command to clear buffer contents.
-		(erc-cmd-whois): Fix cut'n'paste-o.
-		(erc-cmd-deop): New command to deop a user.
-		(erc-cmd-op): New command to op a user.
-		(erc-make-notice): Moved a lot of duplicate code here.  Perhaps
-		this should also be done for erc-highlight-error.
-		(erc-parse-line-from-server): Now NOTICE will also open a new
-		query, just as PRIVMSG.
-		(erc-parse-line-from-server): Call erc-put-text-property on a
-		channel message/notice first, before concatenating nick and
-		timestamp &c.
-		(erc-message-notices): Add option to display notices in
-		minibuffer.
-		(erc-fill-region): No longer strip spaces in front of incoming
-		messages.
-		(erc-parse-current-line): No longer strip spaces in front of text
-		input by user.
-
-	Hopefully I didn't break too much :(
-
-2001-11-05  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.80:
-	* New function erc-nickserv-identify-autodetect for erc-insert-hook. Added by default currently.
-
-	* erc.el 1.79:
-	* Mini-fix in erc-process-num-reply (= n 353): Added @ as prefix character to make certain channels on opn work again nicely
-
-2001-10-31  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.6: updated to reflect changes
-
-	* debian/scripts/install.in 1.2:
-	moved #PKGFLAG# before -f batch-byte-compile
-
-2001-10-29  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.78:
-	Imenu fixed somehow, added IRC services interactive function for indentify to NickServ. Read the diff
-
-2001-10-26  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.5: sigh. -2
-
-2001-10-25  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.4: updated to reflect changes
-
-	* debian/rules 1.3: handle conffiles.in too
-
-	* debian/maint/conffiles.in 1.1: new file
-
-	* debian/maint/conffiles 1.2: superceded by conffiles.in
-
-	* debian/scripts/startup 1.2: superceded by startup.erc
-
-2001-10-25  Mario Lang  <mlang@delysid.org>
-
-	* debian/scripts/startup.erc-speak 1.1: * Initial version
-
-	* debian/scripts/startup.erc 1.1: * Added and fixes minimal typo
-
-2001-10-25  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.3: updated to reflect changes
-
-	* debian/rules 1.2:
-	modified to be able to build the erc-speak package too
-
-	* debian/control 1.2: added the new erc-speak package
-
-	* debian/README.erc-speak 1.1, debian/maint/postinst.in 1.1, debian/maint/prerm.in 1.1, 
-	  debian/scripts/install.in 1.1, debian/scripts/remove.in 1.1:
-	new file
-
-	* debian/maint/postinst 1.2, debian/maint/prerm 1.2, debian/scripts/install 1.2, 
-	  debian/scripts/remove 1.2:
-	removed, superceded by it's .in counterpart
-
-2001-10-25  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.77: * Fixed some defcustom :type 's
-	* Added erc-before-connect hook which gets called with server port and nick.
-	  Use this hook to e.g. setup a tunnel before actually connecting.
-	  something like (when (string= server "localhost") ...)
-
-2001-10-24  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.76: * Patch by smoke: fix erc-cmd-* commands and add aliases
-
-2001-10-23  Mario Lang  <mlang@delysid.org>
-
-	* erc-speak.el 1.14:
-	* Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, 
-	  especially if you are on more than one channel simultaniously.
-
-	* erc.el 1.75:
-	* Made the completion postfix customizable through erc-nick-completion-postfix
-
-	* erc-speak.el 1.13, erc.el 1.74:
-	* Added erc-prevent-minibuffer-privmsg
-
-	* erc-speak.el 1.12:
-	* Quickish hack to allow exclusion of timestamps from speaking. see erc-speak-filter-timestamps
-
-2001-10-21  Mario Lang  <mlang@delysid.org>
-
-	* erc-speak.el 1.11:
-	* Removed now really obsolete code. Package size reduced by 50%
-
-	* erc-speak.el 1.10:
-	* Very important fix! Now erc-speak is really complete. Messages dont get cut anymore. Be sure to use auditory icons, 
-	  it's reallllly cool now!!!
-
-	* erc-speak.el 1.9: *** empty log message ***
-
-	* erc-speak.el 1.5: * Major simplification. depends on erc.el,v 1.73
-	* Things removed, read diff
-
-2001-10-21  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.2: oops, silly typo
-
-	* debian/changelog 1.1, debian/control 1.1, debian/copyright 1.1, 
-	  debian/maint/conffiles 1.1, debian/maint/postinst 1.1, debian/maint/prerm 1.1, 
-	  debian/rules 1.1, debian/scripts/install 1.1, debian/scripts/remove 1.1, 
-	  debian/scripts/startup 1.1:
-	initial check-in
-
-2001-10-21  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.73:
-	* Changed erc-insert-hook to get two arguments, START and END of the region
-	  which got inserted. CAREFUL! This could break stuff, but it makes the hook
-	  much more useable.
-
-	* erc.el 1.72:
-	* Made erc-smiley a new option, currently set to t to showoff this feature. :)
-
-2001-10-20  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.71: * Add missing erc-mode-hook variable
-	* Add smiley-support (preliminary test)
-
-2001-10-20  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.70:
-	Replaced all occurences of put-text-property with a call to
-	erc-put-text-property.
-	(erc-put-text-property): New function.
-	(erc-tracking-modified-channels): Moved to the front of the file such
-	that it is already defined when the menu is being defined.
-	(erc-modified-channel-string): Ditto.
-
-2001-10-18  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.69: Removed some commentary.  The wiki page is the place to
-	put such information.
-	(erc-fill-prefix): Doc change.
-	(erc-notice-highlight-type): Doc change, now a user option.
-	(erc-pal-highlight-type): Doc change, now a user option.
-	(erc-fool-highlight-type): New option.
-	(erc-keyword-highlight-type): New option.
-	(erc-dangerous-host-highlight-type): New option.
-	(erc-uncontrol-input-line): Doc change.
-	(erc-interpret-controls-p): Doc change, now a user option.
-	(erc-multiline-input): Doc change.
-	(erc-auto-discard-away): Doc change.
-	(erc-pals): Changed from string to regexp.
-	(erc-fools): New option.
-	(erc-keywords): Renamed from erc-highlight-strings.  WATCH OUT:
-	Not backwards compatible change!
-	(erc-dangerous-hosts): Renamed from erc-host-danger-highlight.
-	WATCH OUT: Not backwards compatible change!
-	(erc-menu-definition): Added menu entries for fools, keywords and
-	dangerous hosts.
-	(erc-mode-map): Changed keybindings from C-c <plain ascii> to
-	various C-c <C-ascii> combinations.
-	(erc-dangerous-host-face): Renamed from erc-host-danger-face.
-	WATCH OUT: Not backwards compatible change!
-	(erc-fool-face): New face.
-	(erc-keyword-face): Renamed from erc-highlight-face.  WATCH OUT:
-	Not backwards compatible change!
-	(erc-parse-line-from-server): Fixed highlighting in the cases
-	where (equal erc-pal-highlight-type 'all), added code to handle
-	erc-fool-highlight-type, erc-dangerous-host-highlight-type
-	(erc-update-modes): Replaced erc-delete-string with delete.
-	(erc-keywords): Renamed from erc-highlight-strings, handle
-	erc-keyword-highlight-type.
-	(erc-delete-string): Removed.
-	(erc-list-match): New function.
-	(erc-pal-p): Use erc-list-match.
-	(erc-fool-p): New function.
-	(erc-keyword-p): New function.
-	(erc-dangerous-host-p): Renamed from erc-host-danger-p, use
-	erc-list-match.
-	(erc-directed-at-fool-p): New function.
-	(erc-add-entry-to-list): New function.
-	(erc-remove-entry-from-list): New function.
-	(erc-add-pal): Use erc-add-entry-to-list.
-	(erc-delete-pal): Use erc-remove-entry-from-list.
-	(erc-add-fool): New function.
-	(erc-delete-fool): New function.
-	(erc-add-keyword): New function.
-	(erc-delete-keyword): New function.
-	(erc-add-dangerous-host): New function.
-	(erc-delete-dangerous-host): New function.
-
-2001-10-07  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.68: * irc vs ircd default port fixed
-
-	* erc.el 1.67: * Added topic-change to imenu
-
-	* erc.el 1.66: * More imenu spiffyness
-
-	* erc.el 1.65: * Added imenu support
-
-	* erc.el 1.64:
-	* Fix to /topic to show topic instead of setting it to null :)
-
-2001-10-05  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.63: * First version of erc-rename-buffer
-
-	* erc.el 1.62: * more header-line tricks.
-
-	* erc.el 1.61:
-	* Small fix to do erc-update-mode-line-buffer in erc-update-channel-topic
-
-	* erc.el 1.60: * Added erc-header-line-format
-
-2001-10-04  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.59: * mini-fix, add msgp to auto-query code
-
-	* erc.el 1.58: * Added command-names to completion (erc-command-table)
-	* New variable erc-auto-query. When set, every arriving message to you
-	will open a query buffer for that sender if not already open.
-	* Compatibility function fo non-existing line-beginning|end-position functions in XEmacs.
-
-2001-10-03  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.57:
-	* Removed alot of (progn ...) where they were not necessary
-	* Changed some (if ...) without else part to (when ...)
-	* Some (while ...) to use (dolist ...)
-	* Fix for completion popup generating tracebacks.
-	* New function erc-arrange-session-in-mulptiple-windows
-	* Lots of other stuff, read the diff
-
-2001-10-02  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.56: * Added erc-kill-input and keybinding C-c C-u for it
-
-2001-10-01  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.55: * Another fix to nick-completion
-	* Additional checks in erc-track-modified-channels
-
-2001-09-26  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.54: * Fixed completion (alex)
-	  * Now popup buffer doesnt destroy your window configuration.
-	* Fixed away handling (incomplete)
-
-2001-09-24  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.53: Fixed silly quoting-escape error
-
-2001-09-23  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.52: * Added auto-op support (unfinished)
-	* Added erc-latest-version.
-	* Added erc-ediff-latest-version.
-
-2001-09-21  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.51:
-	* Minor menu additions (invite only mode is now a checkbox)
-
-2001-09-20  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.50:
-	* Fix (erc-cmd-names): This should fix C-c C-n too, hoepfully it was the right fix and doesnt break anything else.
-
-	* erc.el 1.49: * Fixes XEmacs easymenu usage (2nd time).
-
-2001-09-19  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.48:
-	* (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space
-
-	* erc.el 1.47:
-	* Changed menu-definition to use easymenu (hopefully this now works under Xemacs)
-	* Fix for custom problem with :must-match on XEmacs (thanks shapr)
-	* Added /COUNTRY command using (what-domain) from package mail-extr (shapr)
-	* Fix for case-sensitivity problem with pals (they are now all downcased)
-	* Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, 
-	  instead of just displaying it in the minibuffer.
-
-2001-09-10  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.46: Updated erc-version-string
-
-	* erc.el 1.45: Version number change and last read-through...
-
-2001-09-04  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.44: Added some asterisks
-
-2001-08-24  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.43:
-	Fixed hidden channel buffer tracking (sort of), now using switch-to-buffer for advice.
-	This version is unofficially named 2.1prebeta1. Please test it and send
-	fixes to various problems you may encounter so that we can eventually
-	release 2.1 soon.
-
-2001-08-14  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.42:
-	Added function erc-bol and keybinding C-c C-a for it (contributed by Benjamin Rutt <brutt@bloomington.in.us)
-
-2001-08-07  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.41:
-	Checked in lathis code and modified it slightly. Still unsure about set-window-buffer advice, current attempt doesnt seem to work.
-	Removed (nick -> #channel) from mode-line. (CLOSED) and (AWAY...) should still be displayed when appropriate
-
-2001-08-06  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.40:
-	added local-variable channel-list in session-buffers and make /LIST use it.
-	erc-join-channel can now do completion after /LIST was executed
-
-2001-08-05  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.39: Tweaked erc-join-channel and erc-part-from-channel
-
-2001-07-27  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.38: some more defcustom stuff
-
-	* erc.el 1.37: Patch from Henrik Enberg <henrik@enberg.org>:
-	   Adds variables erc-frame-alist and erc-frame-dedicated-p.
-
-	* erc.el 1.36: fixed erc-part-from-channel
-
-	* erc.el 1.35:
-	fixed match-string problem and added interactive topic setting function.
-
-	* erc.el 1.34: fixed silly string-match bug
-
-	* erc.el 1.33:
-	Added erc-join-channel and erc-part-from-channel (interactive prompts), as well as keybindings. C-c C-j #emacs RET is now enough :)
-
-2001-07-27  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.32 (erc-display-line-buffer): Simplified filling.
-	(erc-fill-region): New function.
-
-2001-07-27  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.31: Added redundancy check in output
-
-2001-07-26  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.30 (erc-send-action): Add text-property stuff.
-	(erc-input-action): Removed text-property stuff.
-	(erc-command-table): Corrected command for DESCRIBE.  Still
-	doesn't work though.  No idea what it should do.  Looks like a no op.
-	(erc-cmd-me): Doc change.
-
-2001-07-26  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.29:
-	fixed one occurence of a setq with only one argument (XEmacs didnt like that)
-
-	* erc.el 1.28:
-	Added erc-next-line-add-newlines customisation possibility.
-
-	* erc.el 1.27:
-	added erc-fill-prefix for defining your own way of filling and fixed filling somehow
-
-	* erc.el 1.26:
-	fixed small incompatibility in erc-parse-line-from-server at (and (= n 353) regexp
-
-2001-07-25  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.25:
-	Added erc-filling and filling code to erc-display-line-buffer.
-
-2001-07-08  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.24 (try-complete-erc-nick): Make the ": " part of the
-	expansion
-
-	* erc.el 1.23: require ring
-
-2001-07-08  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.22: *** empty log message ***
-
-2001-07-07  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.21: typo
-
-	* erc.el 1.20: ommit
-	:wq
-
-2001-07-06  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.19 (erc-mode): Call erc-input-ring-setup.
-	(erc-send-current-line): Call erc-add-to-input-ring.
-	(erc-input-ring): New variable.  Currently not buffer local.
-	(erc-input-ring-index): New variable.  Currently not buffer local.
-	(erc-input-ring-setup): New function.
-	(erc-add-to-input-ring): New function.
-	(erc-previous-command): New function.
-	(erc-next-command): New function.
-	(erc-mode-map): Uncommented keybindings for erc-next-command and
-	erc-previous-command.
-
-2001-07-05  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.18 (erc-highlight-strings): Removed debug message.
-
-	* erc.el 1.17 (erc-join-buffer): Changed default to 'buffer.
-	(erc-join-info-buffer): Changed default to 'disable.
-	(erc-nick-completion): Changed default to 'all.
-
-2001-07-04  uid31117  <uid31117@confusibombus>
-
-	* erc.el 1.16: Resolved...
-
-2001-07-03  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.15 (erc-highlight-strings): New option and new function.
-	(erc-parse-line-from-server): Use it.
-	Various empty lines removed.  Various doc strings fixed.
-
-	* erc.el 1.14: Removed more empty lines.
-
-	* erc.el 1.13 (erc-member-string): replaced by plain member
-	Otherwise, lots of deleting of empty lines...  I'm not too happy with that
-	but I feel better when the code is "cleaned up".
-
-2001-07-03  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.12: Ugly hack, but looks nicer when giving commands
-
-	* erc-speak.el 1.4: ugly hack, but looks nicer now
-
-2001-07-03  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.11 (try-complete-erc-nick): New function.
-	(erc-try-complete-nick): New function.
-	(erc-nick-completion): New option.
-	(erc-complete): Call hippie-expand such that erc-try-complete-nick
-	will be called eventually.  Based on erc-nick-completion
-	try-complete-erc-nick will then complete on the nick at point.
-
-2001-07-02  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.10:
-	Insert (erc-current-nick) instead of (erc-display-prompt). good night :)
-
-	* erc.el 1.9:
-	small, but it was anoying, so I just did it (defcustom for erc-join-buffer and erc-join-info-buffer)
-
-2001-06-29  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.8: Use defface to define all faces.
-	Removed some history from the commentary, as well as some other
-	commentary editing.
-
-2001-06-28  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.7: hmm, defcustom for erc-user-full-name
-
-	* erc-speak.el 1.3, erc.el 1.6: *** empty log message ***
-
-2001-06-27  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.5: typo
-
-	* erc.el 1.4: Some more defcustom
-
-	* erc-speak.el 1.2: nothing, really
-
-2001-06-26  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.3: Some defcustom stuff. Still no defgroup though :)
-
-	* erc.el 1.2:
-	Initial change to erc.el (2.0). Mainly list of ideas and features
-	and syntax-table entries.
-
-	* erc-speak.el 1.1.1.1, erc.el 1.1.1.1: Initial Import
-
-	* erc-speak.el 1.1, erc.el 1.1: New file.
-
-    Copyright (C) 2001 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.
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
-;; arch-tag: 306c4b58-f9ae-4f3d-9fd9-db2d743f05a6
--- a/lisp/erc/ChangeLog.2002	Mon Feb 06 18:44:57 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2607 +0,0 @@
-2002-12-31  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.398 (erc-split-command):
-	Removed assignment to free variable "continue".
-	(erc-strip-controls): New function.  Takes a string, returns the string with
-	all IRC color/bold/underline/etc. control codes stripped out.
-	(erc-interpret-controls): If variable erc-interpret-controls-p is nil, now
-	uses erc-strip-controls to strip control codes.
-	(erc-ctcp-reply-ECHO): Changed reference and assignment to free variable "s"
-	into reference/assignment to "msg", which appears to be the original author's
-	intent.
-
-	* erc-list.el 1.8 (erc-chanlist):
-	Changed to use the new erc-once-with-server-event function
-	instead of the old macro of the same name.
-
-	* erc-notify.el 1.10 (erc-notify-timer):
-	Changed to use the new erc-once-with-server-event function
-	instead of the old macro of the same name.  Also fixed a bug were variable
-	erc-last-ison was being read from a non-server buffer (thus giving its default
-	value instead of its per-server value).
-
-	* erc.el 1.397 (erc-once-with-server-event):
-	This is now a function.  It was a macro with a
-	bug (the call to gensym happened at byte-compile-time not macro-call-time).
-	(erc-toggle-debug-irc-protocol): Now [return] is bound to this function in
-	the *erc-protocol* buffer.
-
-2002-12-30  Alex Schroeder  <alex@gnu.org>
-
-	* erc-autoaway.el 1.10 (erc-autoaway-idletimer): Doc,
-	ref. erc-autoaway-use-emacs-idle.
-	(autoaway): Doc, explain different idle definitions.  Reestablish
-	the idletimer only when erc-autoaway-use-emacs-idle is non-nil.
-	(erc-auto-set-away): Doc, ref erc-auto-discard-away.
-	(erc-auto-discard-away): Doc, ref erc-auto-set-away.
-	(erc-autoaway-use-emacs-idle): Doc, ref erc-autoaway-mode, and
-	added a note that this feature is currently broken.
-	(erc-autoaway-reestablish-idletimer): Doc.
-	(erc-autoaway-possibly-set-away): Split test such that
-	erc-time-diff is only computed when necessary, add a comment why
-	erc-process-alive is not necessary.
-	(erc-autoaway-set-away): Test for erc-process-alive.
-
-2002-12-29  Alex Schroeder  <alex@gnu.org>
-
-	* erc-autoaway.el 1.9:
-	Changed the order of defcustoms to avoid errors in the :set property
-	of erc-autoaway-idle-seconds.
-
-2002-12-29  Damien Elmes  <erc@repose.cx>
-
-	* erc-track.el 1.42:
-	* (erc-track-get-active-buffer): remove superflous (+ arg 0)
-
-2002-12-29  Alex Schroeder  <alex@gnu.org>
-
-	* erc-autoaway.el 1.8 (erc-autoaway): Moved the defgroup up to the
-	top, before the define-erc-module call.
-	(autoaway): Extended doc.
-	(erc-autoaway-idle-seconds): Use a :set property to handle
-	erc-autoaway-use-emacs-idle.
-	(erc-auto-set-away): Set default to t.  Added doc strings where
-	necessary, reformatted doc strings such that the first line can
-	stand on its own.  This is important for the output of M-x
-	apropos.
-
-2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-auto.in 1.3:
-	added (provide 'erc-auto), which is required for (require 'erc-auto) :)
-
-	* erc.el 1.396 (erc-display-prompt):
-	Set the face property of the prompt to
-	everything but the last character.
-
-	* erc.el 1.395 (erc-send-current-line):
-	Check wether point is in the input line. If
-	not, just beep and do nothing.
-
-2002-12-28  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.394 (erc-bol):
-	Fixed bug when there is only a prompt, and no property
-	change.
-
-	* erc.el 1.393 (erc-display-prompt): Rewrote using a save-excursion
-	and erc-propertize.  No longer use a field for the prompt, but a
-	plain text property called erc-prompt.
-	(erc-bol): Use the erc-prompt text property instead of a field.
-	Return point instead of t.
-	(erc-parse-current-line): No need to call point here, then, since
-	erc-bol now returns point.
-
-	* Makefile 1.11:
-	make ChangeLog .PHONY, thus forcing it always to be rebuilt.
-
-2002-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.392 (erc-log-irc-protocol):
-	Removed check wether get-buffer-create
-	    returned nil. "The value is never nil", says the docstring.
-
-	* erc.el 1.391: Day Of The Small Changes
-
-	(erc-display-prompt): Make the prompt 'front-sticky, which prevents it
-	    from being modified. It *should* also make end-of-line move to the
-	    end of the field (i.e. the end of the prompt) when point is at the
-	    beginning of the prompt, but it doesn't. Dunno why. :(
-
-2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
-
-	* Makefile 1.10:
-	Added "-f" to "rm" command in rule for target "realclean".
-
-	* erc.el 1.390:
-	New function: erc-log-irc-protocol.  Consolidates nearly duplicate code
-	from functions erc-send-command and erc-process-filter into one function.
-
-	* erc.el 1.389 (erc-toggle-debug-irc-protocol):
-	Removed unneeded argument PREFIX and code
-	which referenced it at end of function.
-	(erc-send-command): Now we only append a newline to the logged copy
-	of output protocol text if it doesn't have one.
-
-2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.388 (erc-toggle-debug-irc-protocol):
-	Display buffer if it's not shown
-	    already, and use view-mode.
-	(erc-toggle-debug-irc-protocol), (erc-send-command),
-	    (erc-process-filter): inhibit-only t to insert into the
-	    *erc-protocol* buffer (view-mode)
-
-2002-12-27  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.387 (erc-mode-map):
-	Removed keybinding for erc-toggle-debug-irc-protocol.
-	(erc-toggle-debug-irc-protocol): Now used erc-make-notice to propertize the
-	face of the enabled/disabled messages in the *erc-protocol* buffer.
-	(erc-send-command): Now outgoing IRC protocol traffic is logged too.
-
-	* erc.el 1.386:
-	Added user-customizable variable erc-debug-irc-protocol.
-	Added function erc-toggle-debug-irc-protocol.
-	(erc-process-filter): Now supports IRC protocol logging.  If variable
-	erc-debug-irc-protocol is non-nil, all IRC protocol traffic is appended
-	to buffer *erc-protocol*, which is created if necessary.
-
-2002-12-27  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.385 (erc-display-prompt):
-	Don't make the prompt intangible; that didn't
-	    make things that much better for the user, but confused ispell,
-	    which checked the prompt when it should check the first word
-
-2002-12-27  Alex Schroeder  <alex@gnu.org>
-
-	* AUTHORS 1.4: fixed resolve's email add
-
-	* AUTHORS 1.3: added damien
-
-	* erc.el 1.384 (erc-truncate-buffer-on-save):
-	Removed documentation that
-	described behaviour now changed.  It used to say "When nil, no
-	buffer is ever truncated."  This is no longer true; even when
-	buffers are NOT truncated on save, they can be truncated, eg. by
-	adding erc-truncate-buffer to the hook.
-	(erc-logging-enabled): New function.
-	(erc-current-logfile): New function.
-	(erc): Use erc-logging-enabled and erc-current-logfile.
-	(erc-truncate-buffer-to-size): Rewrote it, and made sure to use a
-	(save-restriction (widen) ...) such that the truncation actually
-	runs in the whole buffer, not in the last message only (as
-	erc-insert-post-hook will do!).  This should fix rw's
-	out-of-bounds error.
-	(erc-generate-log-file-name-short): Made all but the BUFFER
-	argument optional.  Doc: Mention
-	erc-generate-log-file-name-function.
-	(erc-generate-log-file-name-long): Doc: Mention
-	erc-generate-log-file-name-function.
-	(erc-save-buffer-in-logs): Use erc-logging-enabled and
-	erc-current-logfile.  Doc: Mention erc-logging-enabbled.
-
-	(erc-encode-string-for-target): Only do the real work when
-	featurep mule; else just return the string unchanged.
-
-2002-12-27  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.383:
-	erc-encoding-default: check for (coding-system-p) for older emacs versions
-
-	* erc.el 1.382 (erc-connect): missing ()s added. "don't commit at 2am"
-
-	* erc.el 1.381 (erc-connect):
-	check if (set-process-coding-system) is available before use
-
-2002-12-27  Alex Schroeder  <alex@gnu.org>
-
-	* AUTHORS 1.2: added franl
-
-2002-12-26  Alex Schroeder  <alex@gnu.org>
-
-	* erc-pcomplete.el 1.14 (pcomplete-parse-erc-arguments):
-	Reworked, and fixed a bug that had
-	caused completions to corrupt preceding text under some circumstances.
-
-	* erc.el 1.380 (erc-encoding-default): New.
-	(erc-encode-string-for-target): Use it instead of a hard-coded ctext.
-	(erc-encoding-coding-alist): Doc.
-
-2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.379:
-	Removed fix for bug 658552 recently checked-in, because it doesn't work.
-
-	* erc.el 1.378 (erc-kill-buffer-function):
-	Removed check that connection is up
-	before running erc-kill-server-hook hooks.  Those hooks should use
-	erc-process-alive to avoid interacting with the process.
-
-	* erc.el 1.377:
-	Fixed erc-send-current-line so it no longer assigns the free variable "s", and
-	it doesn't move point to end-of-buffer in non-ERC buffers.  Fixed
-	erc-kill-buffer-function so it doesn't run the erc-kill-server-hook hooks if the
-	server connection is closed.  Fixed bug 658552, which is described in detail at
-	http://sourceforge.net/tracker/index.php?func=detail&aid=658552&group_id=30118&atid=398125
-
-2002-12-26  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.376 (erc-cmd-SMV): Bug, now call erc-version-modules.
-
-	* erc-pcomplete.el 1.13 (erc-pcomplete-version): New.
-
-2002-12-26  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-pcomplete.el 1.12:
-	Fix for bug where you could not complete a nick when there was text following
-	the nick.
-
-2002-12-25  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.375 (erc-already-logged-in): Use erc-process-alive.
-	(erc-prepare-mode-line-format): Use erc-process-alive.
-	(erc-process-alive): Check erc-process for boundp and processp.
-
-	* erc.el 1.374 (erc-kill-buffer-function):
-	Do not check wether the process is
-	alive before running the hook, because there might be functions on
-	the hook that need to run even when the process is dead.  And
-	function that wants to check this, should use (erc-process-alive).
-	(erc-process-alive): New function.
-	(erc-kill-server): Use it.
-	(erc-kill-channel): Use it.
-
-	* erc.el 1.373 (erc-kill-buffer-function):
-	Reverted ignore-error change.
-	ignore-error is dangerous because we might miss bugs in functions
-	on erc-kill-server-hook.
-
-	* erc.el 1.372 (erc-kill-buffer-function): Use memq instead of member
-	when checking process-status.  Added doc string with references to
-	the other hooks.
-	(erc-kill-server): Only send the command when the erc-process is
-	still alive.  This prevents the error: "Process
-	erc-irc.openprojects.net-6667 not running" when killing the buffer
-	after having used /QUIT.
-
-2002-12-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.371 (erc-server-ERROR):
-	Show the error reason, not only the originating host.
-
-	* erc.el 1.370 (erc-kill-buffer-function):
-	(ignore-errors ...) in 'erc-kill-server-hook.
-	    When the process for this server does not exist anymore, the hook
-	    will cause an error, effectively preventing the buffer from being
-	    killed.
-
-2002-12-24  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-notify.el 1.9:
-	Fixed erc-notify-timer so that it passes the correct nick to
-	the functions on erc-notify-signoff-hook.
-
-2002-12-24  Alex Schroeder  <alex@gnu.org>
-
-	* erc-track.el 1.41: Doc
-
-	* erc-track.el 1.40 (erc-make-mode-line-buffer-name): Removed a
-	superfluous if construct around erc-track-showcount-string.
-	(erc-track-modified-channels): Use 1+.
-	Plus some doc and comment changes.
-
-2002-12-23  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.369: Fix (erc-version) string
-
-2002-12-23  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.368:
-	Removed unnecessary assignment to free-variable "p" in erc-downcase.
-
-	* erc.el 1.367:
-	Now /PART reason strings are generated the same way /QUIT reason strings
-	are generated (see variable erc-part-reason).  Also, when a server buffer
-	is killed, a QUIT command is automatically sent to the server.
-
-	* erc.el 1.366:
-	Changed erc-string-no-properties so that it is more efficient.  Now it uses
-	set-text-properties instead of creating and deleting a temporary buffer.
-
-2002-12-21  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.365:
-	erc-kill-input: added a check to prevent a (ding) and an error when
-	    there's nothing to kill (thanks to Francis Litterio, franl on IRC)
-
-2002-12-21  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.364:
-	AWAY notice duplication prevention. erc-prevent-duplicates now set to ("301") by default, and timeout to 60
-
-	* erc.el 1.363: erc-prevent-duplicates: New variable, see docstring
-
-2002-12-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-track.el 1.39:
-	erc-track-modified-channels: Use cddr of cell for old-face. cdr of
-	    cell is '(1 . face-name), i have no idea why :)
-
-2002-12-20  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.362 (erc-current-nick):
-	check the server buffer is active before using
-
-	Also tabified and cleaned up some trailing whitespace
-
-2002-12-15  Mario Lang  <mlang@delysid.org>
-
-	* erc-track.el 1.38: erc-track-count patch by az
-
-2002-12-14  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.361:
-	last-peers: initialise to a cons. thanks to Francis Litterio
-	    <franl@world.std.com> for the patch
-
-	* erc.el 1.360:
-	erc-kill-channel-hook, erc-kill-buffer-hook, (erc-kill-channel):
-	    both hooks now call erc-save-buffer-in-logs, so that query buffers are
-	    saved properly now, and not just channel buffers.
-
-2002-12-13  Alex Schroeder  <alex@gnu.org>
-
-	* erc-track.el 1.37 (erc-unique-channel-names): Fix another #hurd
-	vs. #hurd-bunny bug.
-
-	* erc-match.el 1.17 (match): No longer modify erc-send-modify-hook,
-	since it does not work without a parsed text property, anyway.
-	(erc-keywords): Allow cons cells.
-	(erc-remove-entry-from-list): Deal with cons cells.
-	(erc-keyword-p): Ditto.
-	(erc-match-message): Ditto.
-
-	Moved nil to the beginning of the list, removed :tags for the
-	-type variables:
-	(erc-current-nick-highlight-type): Ditto.
-	(erc-pal-highlight-type): Ditto.
-	(erc-fool-highlight-type): Ditto.
-	(erc-keyword-highlight-type): Ditto.
-	(erc-dangerous-host-highlight-type): Ditto.
-	(erc-log-matches-flag): Moved nil to the beginning.
-
-2002-12-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.359:
-	erc-beg-of-input-line: Don't do (goto-char (beginning-of-line)), since
-	    beginning-of-line always moves point and returns nil. Thanks to
-	    franl on IRC for noting this.
-
-	* erc-stamp.el 1.20:
-	erc-insert-timestamp-left, erc-insert-timestamp-right: Made the
-	    timestamp a 'field named 'erc-timestamp. Now end-of-line and
-	    beginning-of-line will move over the timestamp.
-
-2002-12-10  Damien Elmes  <erc@repose.cx>
-
-	* erc-button.el 1.34 (erc-button-add-button):
-	make the created button rear-nonsticky, to allow
-	cutting and pasting of buttons without worrying about the button properties
-	being inherited by the text typed afterwards.
-
-	* erc.el 1.358: save logfile when killing buffer
-
-2002-12-09  Alex Schroeder  <alex@gnu.org>
-
-	* erc-track.el 1.36 (erc-modified-channels-display): Reworked.
-	(erc-track-face-more-important-p): Removed.
-	(erc-track-find-face): Return only one face.
-	(erc-track-modified-channels): Reworked.
-	(erc-modified-channels-string): Changed from (BUFFER FACE...) to
-	(BUFFER . FACE)
-
-	* erc-stamp.el 1.19 (erc-insert-timestamp-right): Do not assume
-	erc-fill-column is available.
-
-2002-12-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.357:
-	erc-ech-notices-in-minibuffer-flag, erc-minibuffer-notice: Clarified
-	    the difference in the docstrings.
-
-2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.356: erc-noncommands-list: added erc-cmd-SM and erc-cmd-SMV
-
-2002-12-08  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.355 (erc-cmd-SM): New.
-	(erc-cmd-SMV): New.
-
-	* erc.el 1.354 (erc-modes): New.
-
-2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-compat.el 1.9:
-	field-end: use (not (fboundp 'field-end)) instead of (featurep 'xemacs)
-
-2002-12-08  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.353 (erc-version-modules): New.
-
-2002-12-08  Mario Lang  <mlang@delysid.org>
-
-	* debian/changelog 1.19, debian/control 1.7, debian/scripts/startup.erc 1.3:
-	debian release 3.0.cvs.20021208
-
-2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.352 (erc-split-command): Do the right thing with CTCPs.
-
-2002-12-08  Mario Lang  <mlang@delysid.org>
-
-	* erc-stamp.el 1.18: Be a bit more functional
-
-2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-compat.el 1.8:
-	XEmacs doesn't seem to have field-end, so we provide our own version here.
-
-2002-12-08  Mario Lang  <mlang@delysid.org>
-
-	* Makefile 1.9: Small fixes to debrelease target
-
-2002-12-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.351:
-	make-obsolete-variable: xemacs doesn't have the WHEN parameter, remove it.
-
-2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-imenu.el 1.5 (erc-create-imenu-index):
-	Use (forward-line 0) instead of
-	  (beginning-of-line) now, sine the latter ignores fields (used in the
-	  prompt).
-
-	* erc.el 1.350:
-	Rewrite of the prompt stuff to use a field named 'erc-prompt:
-
-	erc-prompt: Removed getter and setter functions. The properties were
-	  already set (and overwritten) in erc-display-prompt.
-	(erc-prompt): Add the trailing space here, not all over the code.
-	(erc-display-prompt): Cleaned up a bit. The text-properties now are
-	  valid on the whole prompt. Also, made the prompt 'intangible to
-	  avoid confused users.
-	(erc-bol): Now use the field 'erc-prompt for finding the prompt
-	(erc-parse-current-line): Cleaned up considerably. Uses (erc-bol) now.
-	(erc-load-irc-script-lines): Adjusted for the new (erc-prompt).
-	(erc-save-buffer-in-logs): Adjusted for the new (erc-prompt).
-
-	* erc.el 1.349:
-	erc-uncontrol-input-line: The comment said "Consider it deprecated",
-	so I removed it now.
-	erc-prompt-interactive-input: Marked obsolete as of 1.348
-
-	* erc.el 1.348:
-	erc-smiley, erc-unmorse: Put at the end to separate it from the
-	important parts of erc.el.
-
-2002-12-07  Alex Schroeder  <alex@gnu.org>
-
-	* erc-stamp.el 1.17 (erc-insert-timestamp-right): New algorithm.
-
-2002-12-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.347:
-	last-peers, erc-message: Explained what last-peers is used for.
-
-2002-12-07  Alex Schroeder  <alex@gnu.org>
-
-	* erc-page.el 1.3 (erc-cmd-PAGE): New function.
-	(erc-ctcp-query-PAGE): Use the catalog entry for the message, too.
-	(erc-ctcp-query-PAGE-hook): Added custom type.
-	(erc-page-function): Changed custom type from ... function-item to
-	... function.
-	As well as doc strings.
-
-2002-12-06  Alex Schroeder  <alex@gnu.org>
-
-	* erc-page.el 1.2: provide feature at the end
-
-2002-12-06  Brian P Templeton  <bpt@tunes.org>
-
-	* erc-nickserv.el 1.10:
-	Added austnet in erc-nickserv.el (thanks to Damien Elmes
-	<resolve@repose.cx>)
-
-2002-12-05  Mario Lang  <mlang@delysid.org>
-
-	* erc-complete.el 1.13: Add autoload cookie
-
-	* erc-speak.el 1.24: Small fix to make proper voice-changes
-
-2002-12-05  Alex Schroeder  <alex@gnu.org>
-
-	* erc-lang.el 1.1: New
-
-2002-12-03  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.346:
-	erc-mode-map: Put back C-c C-p (PART) and C-c C-q (QUIT)
-
-2002-12-02  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.345:
-	erc-insert-post-hook: Add :options erc-make-read-only, erc-save-buffer-in-logs
-	erc-send-post-hook: Add :options erc-make-read-only
-
-	* erc.el 1.344: erc-insert-hook: Removed ("this hook is obsolescent")
-	erc-insert-post-hook: Added :options '(erc-truncate-buffer)
-
-2002-12-02  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.343: Add missing requires
-
-2002-11-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.342 (erc-quit-reason-normal):
-	Remove v before %s so it's "Version ..." not
-	   "vVersion ..."
-
-2002-11-26  Alex Schroeder  <alex@gnu.org>
-
-	* erc-compat.el 1.7 (erc-encode-coding-string): Add second argument
-		coding-system, and for non-mule xemacsen, use a new defun instead
-		of identity.
-
-	* erc.el 1.341:  (define-erc-module): Use the appropriate group.
-	(erc-port): Changed custom type.
-	(erc-insert-hook): Custom group changed to erc-hooks.
-	(erc-after-connect): ditto
-	(erc-before-connect): ditto
-	(erc-disconnected-hook): ditto
-
-	* erc-button.el 1.33 (erc-button): New group, changed all custom groups
-	from erc to erc-button, but left all erc-faces as-is.
-
-	* erc-track.el 1.35 (erc-track): New group, changed all custom groups
-	from erc to erc-track.
-
-2002-11-26  Mario Lang  <mlang@delysid.org>
-
-	* erc-macs.el 1.1:
-	Macros for erc-victim handling.  Primary idea is to use setf and some fancy things to get nice syntax. have a look
-
-2002-11-26  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.340:
-	pings, erc-cmd-PING, erc-ctcp-reply-PING, catalog entry CTCP-PING:
-	Cleaned up. Removed buffer-local variable pings which stored a list of
-	all sent CTCP PING requests. Now send our full time with the CTCP PING
-	request and interpret the answer.
-
-2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.339: nick-stk: replaced by the local variable current-nick.
-
-2002-11-25  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.338 (erc-send-command): Use erc-encode-string-for-target.
-	(erc-encode-string-for-target): New.
-
-	* erc-compat.el 1.6 (erc-encode-coding-string): Add second argument
-	coding-system, and for non-mule xemacsen, use a new defun instead
-	of identity.
-
-	* erc-nickserv.el 1.9 (erc-nickserv-version): New.
-
-2002-11-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* Makefile 1.8:
-	UNCOMPILED: erc-chess.el depends on chess-network.el, which might not
-	be installed. Don't compile it.
-
-	* erc.el 1.337:
-	erc-mode-map: Added C-a as erc-bol (no reason why it shouldn't be),
-	and removed C-c C-p (part channel) and C-c C-q (quite server) as these
-	are a bit drastic in their consequences and easy to mistype.
-
-2002-11-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-track.el 1.34: erc-track-faces-priority-list: Extended list
-
-	* erc.el 1.336:
-	channel-members: Updated docstring: We have a VOICE predicate, too.
-
-	* erc-track.el 1.33 (erc-unique-substrings):
-	Don't shorten a single channel to "#", but
-	always give at least 2 chars (except when there are no two chars).
-
-2002-11-23  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-nickserv.el 1.8:
-	support for BrasNET. Thanks to rw on IRC for the settings.
-
-2002-11-23  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.335: (erc-default-recipients, erc-session-user-full-name)
-		(nick-stk, pings, erc-announced-server-name, erc-connected)
-		(channel-user-limit, last-peers, invitation, away, channel-list)
-		(last-sent-time, last-ping-time, last-ctcp-time, erc-lines-sent)
-		(erc-bytes-sent, quitting, bad-nick, erc-logged-in)
-		(erc-default-nicks): Defvars.
-
-	* erc-compat.el 1.5: Switched tests to iso-8859-1 instead of latin-1.
-
-	* erc-compat.el 1.4 (erc-compat-version): New.
-
-2002-11-22  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.334 (smiley): Smileys are a very small module, now.
-
-2002-11-22  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.333:
-	erc-event-to-hook, erc-event-to-hook-name: eval-and-compile these,
-	    since we need them in a macro. ERC now compiles again!
-
-	* erc-speak.el 1.23:
-	erc-minibuffer-privmsg: Removed setting this variable to nil, since it
-	    was removed from erc.el.
-
-	* erc.el 1.332 (erc-interactive-input-map): Added docstring.
-	(erc-wash-quit-reason): Extended docstring.
-	(erc-server-ERROR): Added docstring.
-	(erc-server-321): buffer-local variable channel-list probably
-	    shouldn't be renamed erc-channel-list - removed FIXME.
-
-	* erc.el 1.331: small cleanup.
-	("was not used anymore" here means "not used in erc/*.el nor in
-	fsbot", thanks to deego for checking that.)
-
-	erc-minibuffer-privmsg: Removed (was not used anymore)
-	(erc-reformat-command): Removed (was not used anymore)
-	(erc-strip-erc-parsed-property): Removed (was not used anymore)
-	(erc-process-ctcp-response): Removed (replaced by ctcp-query-XXX-hook)
-	(erc-send-paragraph): Removed ("Note that this function is obsolete,
-	    erc-send-current-line handles multiline input.")
-	(erc-input-hook): Removed ("This hook is obsolete. See
-	    `erc-send-pre-hook', `erc-send-modify-hook' and
-	    `erc-send-post-hook' instead.")
-	(erc-message-hook): Removed ("This hook is obsolete. See
-	    `erc-server-PRIVMSG-hook' and `erc-server-NOTICE-hook'.")
-	(erc-cmd-default-channel): Removed ("FIXME: no clue what this is
-	    supposed to do." - it was supposed to prepend the default channel
-	    to a command before sending it. E.g. typing "/FOO now!" would send
-	    the IRC command "FOO #mycurrentchannel now!")
-
-	* erc.el 1.330:
-	erc-ctcp-query-PING: Send the whole argument back, not just the first
-	number. This is required for many clients (e.g. irssi, BitchX, ...)
-	which send their ping times in two different numbers for microsecond
-	accuracy.
-
-2002-11-22  Alex Schroeder  <alex@gnu.org>
-
-	* erc-track.el 1.32 (erc-track-shorten-function): Allow nil.
-
-2002-11-21  Alex Schroeder  <alex@gnu.org>
-
-	* erc-track.el 1.31 (erc-unique-channel-names): Fixed bug that appeared
-	if one target name was a substring of another -- eg. #hurd and
-	#hurd-bunny.  Added appropriate test.
-
-2002-11-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-track.el 1.30:
-	erc-unique-channel-names: Don't take a substring of channel that could
-	be longer than the channel, but at most (min (length candidate)
-	(length channel). (thanks to deego for noticing this)
-
-2002-11-19  Mario Lang  <mlang@delysid.org>
-
-	* erc-notify.el 1.8: * (require pcomplete): Only when compiling.
-
-2002-11-19  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-track.el 1.29:
-	erc-track-faces-priority-list: New variable, defines what faces will
-	be shown in the modeline. If set to nil, the old behavior ("all")
-	remains.
-	erc-track-face-more-important-p: new function
-	erc-track-find-face: new function
-
-2002-11-19  Alex Schroeder  <alex@gnu.org>
-
-	* erc-fill.el 1.20 (erc-stamp): Require it.
-
-	* erc-match.el 1.16 (away): devar for the compiler.
-
-	* erc-stamp.el 1.16 (stamp): Moved.
-
-	* erc.el 1.329 (erc-version-string): New version.
-
-	* erc-autoaway.el 1.7 (erc-autoaway-idletimer): Moved to the front of
-	the file.
-
-	* erc-auto.in 1.2: (generated-autoload-file, command-line-args-left):
-	Added defvar without value to silence byte compiler.
-
-	* Makefile 1.7 (realclean): renamed fullclean to realclean.
-	(UNCOMPILED): New list, for erc-bbdb.el, erc-ibuffer.el,
-	erc-speak.el.
-	(SOURCE): Do not compile UNCOMPILED.
-	(release): New target.
-	(ChangeLog): New target.
-	(todo): New target.
-
-	* erc-complete.el 1.12 (erc-match): Require it.
-	(hippie-exp): Require it.
-
-	* erc-ezbounce.el 1.3 (erc): Require it.
-
-	* erc-imenu.el 1.4 (imenu): Require it.
-
-	* erc-nickserv.el 1.7 (erc-networks): Moved up.
-
-	* erc-notify.el 1.7 (pcomplete): Require it.
-
-	* erc-replace.el 1.5 (erc): Require it.
-
-	* erc-sound.el 1.3 (sound): Typo -- define-key in erc-mode-map.
-
-	* erc-speedbar.el 1.10 (dframe): Require it.
-	(speedbar): Require it.
-
-	* erc-track.el 1.28 (erc-default-recipients): devar for the compiler.
-
-	* README 1.1: New file.
-
-2002-11-18  Mario Lang  <mlang@delysid.org>
-
-	* AUTHORS 1.1: File needed for mkChangeLog
-
-	* mkChangeLog 1.1: Original code by mhp
-
-2002-11-18  Alex Schroeder  <alex@gnu.org>
-
-	* erc-button.el 1.32 (erc-button-list): Renamed to erc-list and moved
-	to erc.el.
-
-	* erc.el 1.328 (erc-list): New.
-
-	* erc-track.el 1.27 (erc-make-mode-line-buffer-name): Simplified.
-	(erc-modified-channels-display): Simplified.  Now works with all
-	faces, and fixes the bug that when two faces where used (bold
-	erc-current-nick-face), then no faces was added.
-
-	* erc-track.el 1.26: Lots of new tests.  Moved some defuns around in
-	the file.
-	(erc-all-channel-names): Renamed.
-	(erc-all-buffer-names): New name, now include query buffers as
-	well.
-	(erc-modified-channels-update-inside): New variable.
-	(erc-modified-channels-update): Use it to prevent running display
-	if already inside it.  This prevented debugging of
-	`erc-modified-channels-display'.
-	(erc-make-mode-line-buffer-name): Moved.
-	(erc-track-shorten-names): Don't test using erc-channel-p as that
-	failed with query buffers.
-	(erc-unique-substrings): Move setq i + 1 to the end of the while
-	loop, so that start is used as a default value instead of start +
-	1.
-
-2002-11-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-track.el 1.25:
-	erc-unique-substrings: define this before using it in assert
-
-	* erc.el 1.327:
-	with-erc-channel-buffer: Define *before* using this macro. This
-	hopefully fixes a bug noted on IRC.
-
-	* erc-notify.el 1.6:
-	erc-notify-signon-hook, erc-notify-signoff-hook: New hooks. They're
-	even run when their name suggests!
-
-2002-11-18  Alex Schroeder  <alex@gnu.org>
-
-	* erc-list.el 1.7: Typo.
-
-	* erc-speedbar.el 1.9: Whitespace only.
-
-	* erc.el 1.326 (define-erc-module): Avoid defining an alias if name and
-	alias are the same.
-
-	* erc-ibuffer.el 1.17: URL
-
-	* erc-imenu.el 1.3 (erc-imenu-version): New constant.
-
-	* erc-ibuffer.el 1.16 (erc-ibuffer-version): New constant.
-
-	* erc-ibuffer.el 1.15: File header, comments.
-
-	* erc-fill.el 1.19 (erc-fill-version): New constant.
-
-	* erc-ezbounce.el 1.2 (erc-ezb-version): New constant.
-
-	* erc-complete.el 1.11 (erc-complete-version): New constant.
-
-	* erc-chess.el 1.21 (erc-chess-version): New constant.
-
-	* erc-chess.el 1.20: Whitespace only.
-
-	* erc-bbdb.el 1.20 (erc-bbdb-version): Typo.
-
-	* erc-bbdb.el 1.19 (erc-bbdb-version): New constant.
-	Lots of whitespace changes.  Changes to the header.
-
-	* erc-track.el 1.24 (erc-track-shorten-aggressively): Doc.
-	(erc-all-channel-names): New function.
-	(erc-unique-channel-names): New function.
-	(unique-substrings): Renamed.
-	(erc-unique-substrings): New name
-	(unique-substrings-1): Renamed.
-	(erc-unique-substring-1): New name.  Added lots of tests.
-	(erc-track-shorten-names): Call erc-unique-channel-names instead
-
-	* erc-match.el 1.15 (match): Rewrote a as module.
-
-2002-11-17  Alex Schroeder  <alex@gnu.org>
-
-	* erc-netsplit.el 1.6 (erc-netsplit-version): New.
-	(netsplit): Defined as a module, replacing erc-netsplit-initialize
-	and erc-netsplit-destroy.
-
-2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-track.el 1.23 (erc-track-switch-buffer):
-	define-erc-module defines erc-track-mode,
-	not erc-track-modified-channels-mode.
-
-	* erc.el 1.325:
-	Variables erc-play-sound, erc-sound-path, erc-default-sound,
-	erc-play-command, erc-ctcp-query-SOUND-hook and functions
-	erc-cmd-SOUND, erc-ctcp-query-SOUND, erc-play-sound, erc-toggle-sound
-	moved to erc-sound.el
-
-	Variables erc-page-function, erc-ctcp-query-PAGE-hook and function
-	erc-ctcp-query-PAGE moved to erc-page.el
-
-	* erc-page.el 1.1:
-	erc-page.el: New file. CTCP PAGE support for ERC, extracted from erc.el.
-
-	* erc-sound.el 1.2:
-	defin-erc-module: Typo. Autoload should do erc-sound-mode and "erc-sound".
-
-	* erc-sound.el 1.1:
-	erc-sound.el: New file. Contains all the CTCP SOUND stuff from erc.el.
-
-	* erc.el 1.324 (erc-process-ctcp-request):
-	Removed (old-style CTCP handling)
-	(erc-join-autogreet): Removed (was broken anyways)
-
-2002-11-17  Alex Schroeder  <alex@gnu.org>
-
-	* erc-button.el 1.31 (erc-button-version): New constant.
-
-	* erc-button.el 1.30 (button): rewrote as a module.
-
-2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.323: New functions:
-	(erc-event-to-hook), (erc-event-to-hook-name): Convert an event to the
-	corresponding hook. The latter only returns the name, while the former
-	interns the hook symbol and returns it.
-
-2002-11-17  Alex Schroeder  <alex@gnu.org>
-
-	* erc-replace.el 1.4:
-	Practically total rewrite.  All smiley stuff deleted.
-
-	* erc-track.el 1.22 (track): typo.
-
-	* erc.el 1.322 (define-erc-module): Doc change.
-
-2002-11-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-autoaway.el 1.6: Changed to use define-erc-module.
-
-	* erc.el 1.321 (define-erc-module):
-	Make the enable/disable functions interactive.
-
-	* erc.el 1.320 (erc):
-	Don't use switch-to-buffer when we're in the minibuffer,
-	because that does not work. Use display-buffer instead. This leaves
-	two problems: The point does not advance to the end of the buffer for
-	whatever reason, and after leaving the minibuffer, the new window gets
-	buried.
-
-2002-11-17  Alex Schroeder  <alex@gnu.org>
-
-	* erc-stamp.el 1.15 (stamp): Doc change.
-
-	* erc-stamp.el 1.14 (erc-stamp-version): New constant.
-	(stamp): downcase alias name of the mode.
-
-	* erc.el 1.319 (define-erc-module): Added defalias option, renamed
-	parameters again.
-
-	* erc-track.el 1.21: erc-track-modified-channels-mode is now only an
-	alias to erc-track-mode.  Only erc-track-mode is autoloaded.
-	(track): Rewrote call to define-erc-module.
-
-2002-11-16  Mario Lang  <mlang@delysid.org>
-
-	* debian/README.Debian 1.5: * Spelling fix
-
-	* erc-fill.el 1.18: * Fix autoload definition for erc-fill-mode
-
-	* debian/control 1.6, debian/maint/postinst 1.4, debian/maint/prerm 1.4:
-	* Remove /usr/doc -> /usr/share/doc link handling
-
-	* debian/changelog 1.18: * Sync with reality
-
-	* debian/scripts/startup.erc 1.2:
-	* Add /usr/share/emacs/site-lisp/erc/ to load-path
-	* (load "erc-auto")
-
-	* debian/README.Debian 1.4:
-	* Info about the changes since last release updated
-
-	* erc-pcomplete.el 1.11: * Fix emacs/xemacs compatibility
-
-	* debian/scripts/install 1.10: * Dont compile erc-compat, fix ELCDIR
-
-	* debian/control 1.5: * Change maintainer field
-
-	* erc.el 1.318:
-	* (defin-erc-module): Renamed argument mode-name to mname because silly byte-compiler thought we were talking about `mode-name'.
-
-	* Makefile 1.6: * Added debrelease target
-
-	* erc-bbdb.el 1.18, erc-pcomplete.el 1.10, erc-stamp.el 1.13, erc.el 1.317:
-	* (define-erc-module): Added mode-name argument.
-	* Converted erc-bbdb, erc-pcomplete and erc-stamp to new macro.
-	* autoload fixes
-
-	* erc-bbdb.el 1.17:
-	* Create a global-minor-mode (i.e., make it a proper erc-module)
-
-	* erc.el 1.316: * (define-erc-modle): New defmacro
-
-2002-11-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-autoaway.el 1.5 (erc-autoaway-idle-seconds):
-	t in docstrings should be non-nil
-
-2002-11-16  Alex Schroeder  <alex@gnu.org>
-
-	* erc-autoaway.el 1.4, erc-button.el 1.29, erc-fill.el 1.17, erc-match.el 1.14, 
-	  erc-menu.el 1.9, erc-ring.el 1.5, erc-track.el 1.20:
-	Cleanup of file headers: copyright years, GPL mumbo-jumbo, commentaries.
-
-	* erc-stamp.el 1.12 (erc-insert-away-timestamp-function):
-	New custom type.
-	(erc-insert-timestamp-function): New custom type.
-
-	* erc-fill.el 1.16 (erc-fill-function): Doc, new custom type.
-	(erc-fill-static): Doc.
-	(erc-fill-enable): New function.
-	(erc-fill-disable): New function.
-	(erc-fill-mode): New function.
-
-	* erc-match.el 1.13 (erc-match-enable): add-hook for both
-	erc-insert-modify-hook and erc-send-modify-hook.
-	(erc-match-disable): remove-hook for both
-	erc-insert-modify-hook and erc-send-modify-hook.
-
-2002-11-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-autoaway.el 1.3:
-	- Added a way to use auto-away using emacs idle timers
-	- Renamed erc-set-autoaway to erc-autoaway-possibly-set-away for consistency
-
-2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.315: erc-mode-map: Removed the C-c C-g binding for erc-grab
-
-	* erc.el 1.314:
-	(erc-server-341) Another instance of the channel/chnl problem i didn't
-	see last time
-
-2002-11-14  Alex Schroeder  <alex@gnu.org>
-
-	* erc-compat.el 1.3 (erc-decode-coding-string): typo
-
-2002-11-14  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.313 (erc-server-341):
-	variable name should be chnl not channel, as it is
-	used this way in this function, and the other erc-server-[0-9]* use
-	chnl too.
-
-	* erc-autoaway.el 1.2:
-	Set back on all servers, not just the current one, since we're set
-	away on all servers as well.
-
-	* HISTORY 1.2: Fixed typo (ngu.org => gnu.org)
-
-	* erc-autoaway.el 1.1, erc-fill.el 1.15, erc.el 1.312: erc-autoaway.el:
-	* new file
-
-	erc.el:
-	* Removed auto-discard-away facility (now included in erc-autoaway.el)
-	* (erc-away-p): new function
-
-	erc-fill.el:
-	* (erc-fill-variable): Check wether erc-timestamp-format is bound before
-	                       using it (erc-fill.el does not require erc-stamp).
-
-2002-11-10  Alex Schroeder  <alex@gnu.org>
-
-	* TODO 1.4:
-	TODO: moved it to http://www.emacswiki.org/cgi-bin/wiki.pl?ErcTODO
-
-	* erc.el 1.311 (with-erc-channel-buffer): Rudimentary doc string.
-
-2002-11-09  Alex Schroeder  <alex@gnu.org>
-
-	* erc-button.el 1.28 (erc-nick-popup-alist): Made a defcustom.
-
-	* erc-button.el 1.27 (erc-button-disable): New function.
-	(erc-button-enable): New function, replaces the add-hook calls at top-level.
-	(erc-button-mode): New minor mode.
-
-2002-11-08  Alex Schroeder  <alex@gnu.org>
-
-	* erc-button.el 1.26 (erc-button-entry): Use erc-button-syntax-table.
-
-	* erc.el 1.310, erc-stamp.el 1.10: Doc changes.
-
-	* erc-match.el 1.12 (erc-match-mode): New function, replacing the
-	add-hook.
-	(erc-match-enable): New function.
-	(erc-match-disable): New function.
-	(erc-current-nick-highlight-type): Changed from 'nickname to 'nick
-	to make it consistent with the others.
-	(erc-match-message): Ditto.
-
-	* erc-button.el 1.25 (erc-button-syntax-table): New variable.
-	(erc-button-add-buttons): Use it.
-
-2002-11-06  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.309:
-	1) (bug) ERC pops up a new buffer and window when being messaged
-	   from an ignored person. fixed
-	2) (misfeature) ERC notices the user in the minibuffer when it
-	   ignores something - this can get very annoying, since the
-	   minibuffer is also visible when not looking at ERC buffers.
-	   Added a customizeable variable for this, the default is nil.
-	3) (wishlist) There is no IGNORE or UNIGNORE command.
-	   Added.
-	4) (wishlist) Some IRC clients, notably irssi, allow the user to
-	   ignore "replies" to ignored people. A reply is defined as a
-	   line starting with "nick:", where nick is the nick of an
-	   ignored person. Added that functionaly.
-	Done by Jorgen Schaefer <forcer@forcix.cx>
-
-2002-11-02  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.308 (erc-connect): set-process-coding-system to raw-text.
-
-2002-11-01  Brian P Templeton  <bpt@tunes.org>
-
-	* erc-pcomplete.el 1.9, erc-stamp.el 1.9, erc-track.el 1.19:
-	Fixed more autoloads
-
-	* erc-compat.el 1.2: Added autoload for erc-define-minor-mode
-
-2002-11-01  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.307: * (erc-send-command): will break long messages into
-	a bunch of smaller ones, to prevent them from being truncated by the server.
-	The patch also axes some trailing whitespace. :-) <resolve>
-
-2002-10-31  Alex Schroeder  <alex@gnu.org>
-
-	* erc-pcomplete.el 1.8 (erc-compat): Require.
-	(erc-completion-mode): Use erc-define-minor-mode.
-
-	* erc-track.el 1.18 (erc-compat): Require.
-	(erc-track-modified-channels-mode): Use erc-define-minor-mode.
-
-	* erc-stamp.el 1.8 (erc-compat): Require.
-	(erc-timestamp-mode): Use erc-define-minor-mode.
-
-	* erc-compat.el 1.1: New file with the code for erc-define-minor-mode,
-	erc-encode-coding-string and erc-decode-coding-string.  Essentially
-	all the stuff that cannot be tested for using a simple boundp or
-	fboundp -- eg. because the number of arguments are wrong.
-
-	* erc.el 1.306 (erc-compat): Require.
-	(erc-process-coding-system): Moved to erc-compat.el.
-	(erc-connect): Do not set-process-coding-system.
-	(encode-coding-string): Compatibility code moved to erc-compat.el.
-	(decode-coding-string): Compatibility code moved to erc-compat.el.
-	(erc-encode-coding-string): Compatibility code moved to erc-compat.el.
-	(erc-decode-coding-string): Compatibility code moved to erc-compat.el.
-
-2002-10-27  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.305 (erc-display-line-1): Removed call to
-	erc-decode-coding-string.
-	(erc-parse-line-from-server): Added call to
-	erc-decode-coding-string before anything gets parsed at all.
-	(erc-decode-coding-string): Use undecided coding system.
-
-2002-10-24  Sandra Jean Chua  <sacha@free.net.ph>
-
-	* erc-button.el 1.24, erc.el 1.304:
-	Added LASTLOG command and action for nick-button
-
-2002-10-22  Sandra Jean Chua  <sacha@free.net.ph>
-
-	* erc-pcomplete.el 1.7:
-	Fixed nopruning bug, added /MODE channel (mode) [nicks...] completion - mode not completed yet.
-
-2002-10-16  Sandra Jean Chua  <sacha@free.net.ph>
-
-	* erc-pcomplete.el 1.6:
-	Fixed 'Hi delysid:' bug in SAY completion after realizing that pcomplete on commands already took care of completing the initial nick:
-
-2002-10-15  Mario Lang  <mlang@delysid.org>
-
-	* erc-pcomplete.el 1.5: update from sachac
-
-2002-10-13  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.303 (erc-emacs-time-to-erc-time): Catch when tm is nil.
-
-2002-10-11  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.302:
-	* Fixed `erc-scroll-to-bottom' to scroll to the bottom even when
-	  in the middle of a line. Might also fix the Magic ECHAN Bug[tm]. (-:
-
-2002-10-11  Mario Lang  <mlang@delysid.org>
-
-	* erc-nickserv.el 1.6: Fixed erc-networks for the opn->freenode change
-
-2002-10-08  Mario Lang  <mlang@delysid.org>
-
-	* erc-pcomplete.el 1.4:
-	Make erc-completion-mode work interactively with already joined channel buffers
-
-	* erc-chess.el 1.19: Add autoload cookies
-
-	* erc-notify.el 1.5: Add pcomplete support
-
-	* erc.el 1.301:
-	Remove autoload statments, remove autoload cookie from erc-mode and erc-info-mode
-
-	* erc-fill.el 1.14, erc-match.el 1.11: add/remove autoload cookies
-
-2002-10-06  Alex Schroeder  <alex@gnu.org>
-
-	* erc-pcomplete.el 1.3 (erc-completion-mode): New global minor mode
-	with autoload cookie.
-	(erc-pcomplete-enable): Renamed erc-pcomplete-initialize.
-	(erc-pcomplete-disable): New function.
-
-	* erc-complete.el 1.10: Doc changes.
-
-	* erc-stamp.el 1.7 (erc-stamp-enable): Renamed erc-stamp-initialize.
-	(erc-stamp-disable): Renamed erc-stamp-destroy.
-	(erc-timestamp-mode): Use new names.
-
-	* erc.el 1.300: Removed autload for erc-complete and
-	erc-track-modified-channels-mode -- the autoload cookie should do
-	that instead.
-	(erc-input-message): Doc string, removed binding for erc-complete.
-	(erc-mode-map): Removed binding for erc-complete.
-
-2002-10-03  Mario Lang  <mlang@delysid.org>
-
-	* erc-notify.el 1.4:
-	New functions erc-notify-JOIN and erc-notify-QUIT to catch some common cases (warning, untested)
-
-2002-10-01  Alex Schroeder  <alex@gnu.org>
-
-	* erc-stamp.el 1.6 (erc-timestamp-mode): New function.  Removed call
-	to erc-stamp-initialize at the end.
-
-2002-09-25  Brian P Templeton  <bpt@tunes.org>
-
-	* erc.el 1.299:
-	Added customizable `erc-process-coding-system' variable.
-
-2002-09-22  Brian P Templeton  <bpt@tunes.org>
-
-	* erc-fill.el 1.13:
-	`erc-fill-variable' now does the right thing when `erc-hide-timestamps' is non-nil
-
-2002-09-21  Mario Lang  <mlang@delysid.org>
-
-	* erc-fill.el 1.12:
-	patch from Peter Solodov <peter@alcor.concordia.ca>  (note, its slightly broken still
-
-2002-09-05  Mario Lang  <mlang@delysid.org>
-
-	* erc-pcomplete.el 1.2: Added LEAVE as alias for PART
-
-2002-09-04  Mario Lang  <mlang@delysid.org>
-
-	* erc-pcomplete.el 1.1:
-	By sachac (good work!) keep up doing such things
-
-2002-08-31  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.298:
-	A fix for Bug#133267: now you can put (erc-save-buffer-in-logs) on erc-insert-post-hook to save *every* incoming message.
-
-2002-08-30  Brian P Templeton  <bpt@tunes.org>
-
-	* erc.el 1.297:
-	Changed default value of erc-common-server-suffixes because of the OPN
-	name change
-
-2002-08-28  Mario Lang  <mlang@delysid.org>
-
-	* erc-stamp.el 1.5: Try to reactivate isearch in xemacs
-
-	* erc-stamp.el 1.4:
-	fixes issues related to comparative emacsology and a silly bug
-
-2002-08-27  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.296:
-	New hook erc-send-completed-hook (for robot stuff), changed alexanders email address to reflect reality, little fix to erc-auto-query to get a bit of a speedup
-
-2002-08-22  Mario Lang  <mlang@delysid.org>
-
-	* erc-button.el 1.23:
-	Fixed case-fold-search (thanks sachac), now lambda works in erc-button-alist, added wardwiki+google+symvar+rfc+itime regexps from the wiki
-
-2002-08-19  Mario Lang  <mlang@delysid.org>
-
-	* erc-button.el 1.22:
-	erc-nick-popup-alist: New variable to make erc-nick-popup configurable
-
-2002-08-16  Alex Schroeder  <alex@gnu.org>
-
-	* erc-button.el 1.21 (erc-recompute-nick-regexp): Fixed regexp.
-
-	* erc-button.el 1.20 (erc-button-buttonize-nicks): Changed custom type
-	to integer.
-	(erc-button-add-buttons): Moved button removal code to new
-	function.
-	(erc-button-remove-old-buttons): New function.
-	(erc-button-add-button): Removed use of overlays and used
-	erc-button-add-face instead.
-	(erc-button-add-face): New function to merge faces as text
-	properties.  This should be much faster when lots of buttons
-	appear.
-	(erc-button-list): New helper function.
-
-	* erc.el 1.295 (erc-display-message): Fixed argument list.
-	(erc-display-prompt): Reduced calls to length, use start-open
-	property for XEmacs to prevent a little box of erc-prompt-face at
-	the end of messages other people send.
-	(erc-refresh-channel-members): Fix XEmacs calls to split-string,
-	which may return an empty string at the end of the list.  This
-	would cause hangups in erc-button in re-search-forward loops.
-	(erc-get-channel-mode-from-keypress): Replaced control codes with
-	octal escape sequences.
-
-2002-08-14  Mario Lang  <mlang@delysid.org>
-
-	* erc-button.el 1.19:
-	Try to be compatible to XEmacs regexp-opt. (Im going to quit this job if I find more of those damn differencies
-
-	* debian/README.Debian 1.3, debian/scripts/install 1.9:
-	* Added info to README.Debian
-	* Finished debian/scripts/install
-
-2002-08-13  Mario Lang  <mlang@delysid.org>
-
-	* debian/scripts/install 1.8: First attempt to fix it
-
-	* debian/README.Debian 1.2, debian/changelog 1.17, debian/scripts/install 1.7:
-	changelog: Changed maintainer and added new entry
-	README.Debian: Re-explained the byte-compile issue
-	scripts/install: Exclude erc-bbdb|chess|ibuffer|speedbar from
-	byte-compiling
-
-	* erc-track.el 1.17: Added C-c C-SPC in addition to C-c C-@
-
-	* erc-notify.el 1.3: Little docstring change
-
-2002-08-09  Mario Lang  <mlang@delysid.org>
-
-	* erc-stamp.el 1.3:
-	Change one use of set-text-properties to add-text-properties (tnx Lathi)
-
-2002-08-02  Mario Lang  <mlang@delysid.org>
-
-	* erc-stamp.el 1.2: added erc-timestamp-only-if-changed-flag
-
-2002-07-22  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.294:
-	Removed timestamp related code and moved into erc-stampe.l
-
-	* erc-stamp.el 1.1:
-	Timestamping code moved out of erc.el. Additional, now we can timestamp either on the left or on the right side
-
-2002-07-16  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.293:
-	* Make ctcp ping return its message in the active buffer, instead of the server buffer
-	* Corrected minimal typo in catalog
-	* Added var and variable as alias for /set
-
-2002-07-08  Mario Lang  <mlang@delysid.org>
-
-	* erc-track.el 1.16:
-	* New function erc-track-switch-buffer (by resolve)
-	  Bound to C-c C-SPC, enjoy!
-
-2002-07-08  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.16: New snapshot deb
-
-	* debian/scripts/install 1.6: Rewrote in make.
-	Does not byte-compile erc-speak.el at all, and excludes erc-track.el too, if
-	ran for xemacs.
-
-	* debian/control 1.4: Added dependency on make
-
-	* debian/copyright 1.2: Updated copyright info
-
-	* debian/rules 1.10: Use $(wildcard *.el) instead of a hardcoded list
-
-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  <disumu@x3y2z1.net>
-
-	* erc-menu.el 1.8:
-	* changed how we check if we should activate "Track hidden channels" and
-	  whether it should be selected - fixes a bug Xemacs where whole menu bar
-	  does not work if menu is loaded
-
-	* erc-menu.el 1.7:
-	* added "Disconnect from server", only selectable if erc-connected is non-nil
-
-	* topic is allowed to be set by normal users if channel mode is not +t
-
-	* add " ..." after description if arguments needed after selecting menu item
-
-	* only allow selecting of menu points needing a channel if current buffer is
-	  a channel buffer - done by testing if channel-members is non-nil
-
-	* put erc-match functions in new group "Pals, fools and other keywords"
-
-	* erc.el 1.291:
-	* moved definition of erc-show-my-nick to GUI variables section
-
-	* erc-connected variable now defined with defvar
-	  now set in channel and query buffers, was only in server buffer before
-	  upon disconnect, set erc-connected to nil in all the server's buffers
-
-	* added erc-cmd-GQUIT and its alias erc-cmd-GQ - quit all servers at once
-
-	* added interactive function erc-quit-server, bound to C-c C-q
-
-	* added erc-server-WALLOPS
-
-	* added WALLOPS to english catalog, fixed s461 (was showing message twice)
-
-	* typo fixes, spacing change
-
-2002-06-29  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.290: Use pp-to-string in /set (without args)
-
-	* erc-netsplit.el 1.5:
-	Make /set anonymous-lign set erc-anonymous-login, also report
-	which var was set to which val.
-
-2002-06-28  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-menu.el 1.6: added "Customize ERC"
-
-2002-06-25  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.289: New variable: erc-use-info-buffers, defaults to nil.
-	  This prevents info-buffers from being created/updated.
-	  Set to t if you use :INFO buffers.
-	  (by rw)
-	Delete (erc-display-prompt) from reconnect to avoid clutter
-
-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-insert-mode-command is taken care of by this function as well
-
-2002-06-21  Mario Lang  <mlang@delysid.org>
-
-	* erc-track.el 1.15:
-	Fixed bug where buffer-names suddenly had text-properties.
-
-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  <disumu@x3y2z1.net>
-
-	* erc-match.el 1.10: fixed spelling error
-
-	* erc-track.el 1.14, erc-match.el 1.9: * erc-match.el:
-	  highlight current nickname in its own face (deactivated by default):
-	  - added erc-current-nick-highlight-type, erc-current-nick-face,
-	    erc-current-nick-p
-
-	* erc-track.el:
-	  added support for erc-current-nick-face
-
-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  <disumu@x3y2z1.net>
-
-	* erc.el 1.286:
-	* bugfix: when pasting lines with blank lines in between, remove the blank lines
-	  but send the rest
-
-	* since we know the command, use it when checking what's in erc-hide-list
-	  added check to erc-server-KICK
-
-	* added some blank lines for better readability
-
-2002-06-16  Alex Schroeder  <alex@gnu.org>
-
-	* erc-nickserv.el 1.5 (erc-nickserv-alist): Fixed typo.
-
-2002-06-15  Alex Schroeder  <alex@gnu.org>
-
-	* erc-nickserv.el 1.4 (erc-networks): Added doc string.
-	(erc-nickserv-alist): Added doc string.
-
-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
-
-2002-06-10  Mario Lang  <mlang@delysid.org>
-
-	* erc-nickserv.el 1.3: Added iip support.
-	Added :type for erc-nickserv-passwords custom.
-	Fixed hook usage.
-
-2002-06-07  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-nickserv.el 1.2: * added GalaxyNet
-
-	* erc-nickserv-alist:
-	  - sorting networks alphabetically
-	  - added two more pieces of information in erc-nickserv-alist:
-	    word to use for identification and whether to use the nickname
-
-	* erc-current-network:
-	  - made regex case insensitive, downcase server to match
-	  - uses the new information
-	  - now uses new variable erc-networks instead of doing checking manually
-
-	* added variable erc-networks
-
-	* fixed some indentation, documentation
-
-2002-06-07  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.285: Fix for kill-buffer hook stuff
-
-2002-06-06  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.284: Added /squery command
-
-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
-	  - added secret, moderated, no external send, topic lock, limit, key
-
-	* check that user is in a channel buffer and user is a channel operator
-	  for all op-related actions
-
-	* "Identify to nickserv" needs erc-nickserv-identify defined
-
-	* added "Show ERC version"
-
-	* erc.el 1.283:
-	* added erc-set-channel-limit, erc-set-channel-key, erc-toggle-channel-mode
-
-	* added erc-get-channel-mode-from-keypress, which is binded to C-c m
-	  sends the next character which is typed to one of the 3 new functions
-	  - did not remove erc-invite-only-mode and it's key binding in case
-	    people are used to it, although it probably should be removed...
-
-	* in erc-server-MODE:
-	  added check if tgt equal to user's nick
-	  removed erc-display-line, only using the erc-display-message
-
-	* added s461 to english catalog
-
-	* fixed bug where Xemacs would not quit if erc-quit-reason was
-	  set to erc-quit-reason-various and assoc-default was not defined
-
-2002-06-04  Andreas Fuchs  <asf@void.at>
-
-	* erc-ezbounce.el 1.1, erc-match.el 1.8:
-	* erc-ezbounce.el: Added. Provides support for ezbouncer; automatic login,
-	                   session management implemented. I've contacted the author
-			   about stuff in EZBounce's logging.
-	* erc-match.el: Fixed a stupid mistake where
-	                "*** Your new nick is <foo>" would trigger an error.
-
-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
-	  (require 'erc-nickserv) is now necessary for this to work
-
-	* erc.el 1.281:
-	* results of /COUNTRY now formatted as notice; errors are ignored, 
-	  fixing
-	  bug which made prompt disappear
-
-	* added undefined-ctcp error message to english catalog
-
-	* changed some (when (not erc-disable-ctcp-replies) to use unless instead
-	  and some if's without else statments to use when or use
-
-	* CTCP replies now use erc-display-message, formatted as notices
-
-	* added following to english catalog:
-	  - undefined-ctcp
-	  - CTCP-CLIENTINFO, CTCP-ECHO, CTCP-FINGER, CTCP-PAGE, CTCP-PING,
-	    CTCP-SOUND, CTCP-TIME, CTCP-UNKNOWN, CTCP-VERSION
-	  - s303, s305, s306, s353
-
-	* split erc-server-305-or-306 into erc-server-305 and erc-server-306
-
-	* KICK already had buffer set, using it
-
-	* erc.el 1.280:
-	* erc-format-timestamp now only called from erc-display-message and
-	  erc-send-current-line
-
-	* all instances of erc-display-line with erc-highlight-error
-	  changed to use erc-display-message
-
-	* added following error messages to english catalog:
-	  bad-ping-response, bad-syntax, cannot-find-file, cannot-read-file,
-	  ctcp-request, flood-ctcp-off, flood-strict-mode, no-default-channel,
-	  no-target, variable-not-bound
-
-	* added following server related messages to english catalog:
-	  s324, s329, s331, s332, s333, s341, s406, KICK, KICK-you, KICK-by-you, MODE-nick
-
-	* ignoring server codes 315, 369
-
-	* added erc-server-341, erc-server-406
-
-	* channel topic and mode notices displayed in respective channel buffers if they
-	  exist
-
-	* erc-server-KICK: display the message before removing this channel so that we
-	  can track the kick
-
-	* send parsed to erc-ctcp-query-ACTION-hook so that actions can be checked
-	  by erc-match
-
-	* fixed bug where nil was shown if no reason was given by users on /PART
-
-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  <disumu@x3y2z1.net>
-
-	* erc-button.el 1.18:
-	* made action case insensitive in erc-nick-popup and added a more descriptive
-	  error message
-
-2002-05-30  Brian P Templeton  <bpt@tunes.org>
-
-	* erc.el 1.279:
-	Removed multiple calls of `erc-prompt' in `erc-display-prompt'
-
-2002-05-29  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.278:
-	First step timestampkiller cleanup. I'm tired, do the rest tomorrow.
-
-	* erc.el 1.277:
-	New functionality: Catch channel/server buffer kills through kill-buffer-hook.
-	Currently, it only does a PART if you kill a channel buffer.
-
-2002-05-28  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.276:
-	defvar'ed some buffer-local variables to make elint at least a bit more happy.
-	  Moved comments into docstrings.
-	Changed some instances of member to memq.
-
-	* erc-track.el 1.13, erc.el 1.275:
-	erc.el: (erc-message-type-member): New function, used to test
-	for message type. Require erc-parsed text-property.
-	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  <disumu@x3y2z1.net>
-
-	* CREDITS 1.5: added myself, vain as it sounds ;)
-
-2002-05-25  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.274: * Some small docstring fixes
-	* (erc-display-line): Now takes also a process object in the buffer argument.
-	  Used for easy sending to the server buffer.
-	* Several places: Just pass proc, not (process-buffer proc)
-
-2002-05-24  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.273: Mostly docstring fixes/additions
-
-	* erc-netsplit.el 1.4: Doc fixes, and a new netjoin-done message.
-
-	* erc-fill.el 1.11: Doc fixes, erc-fill custom group, autoloads.
-
-	* erc-netsplit.el 1.3: Fix to erc-netsplit-timer.
-
-	* erc-netsplit.el 1.2: Fixed a silly typo
-
-	* erc-maint.el 1.1: is this really necessary?
-
-	* erc.el 1.272: Added new variable erc-hide-list.
-	It affects erc globally right now, and is used to hide certain IRC type messages like JOIN and PART.
-
-	* Makefile 1.3: Doh, I should really test this before checkin :)
-
-	* Makefile 1.2: Silly cut&paste bug fixed
-
-	* erc-list.el 1.6: Added autoload cookie
-
-	* erc-match.el 1.6: Added missing require erc.
-
-	* erc-notify.el 1.2: Autoload cookies and a -initialize function.
-
-	* erc-chess.el 1.18: Added autoload cookies
-
-	* Makefile 1.1: Finally, we have a Makefile.
-	Primarily used for autoload definition generation right now.
-
-	* erc-auto.in 1.1: First version.
-
-	* erc-track.el 1.12: Added autoload cookie
-
-	* erc-netsplit.el 1.1:
-	New module, used to autodetect and hide netsplits.
-	(Untested, no netsplit happened yet :) )
-
-	* erc-nets.el 1.3: Added some old code I once worked on.
-	Added autoload cookie
-
-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
-
-	* erc.el 1.271:
-	* added new function erc-connection-established which is called after receiving
-	  end of MOTD (does nothing if it's been called before)
-
-	* added new hook erc-after-connect which is called from
-	  erc-connection-established with the arguments server (the announced server)
-	  and nick - which other arguments should be sent??
-
-	* added buffer variable erc-connected which is set to t the first time
-	  erc-connection-established is called, set to nil again if we've been
-	  disconnected
-
-	* set initial user mode
-	  - added custom variable erc-user-mode which can be a string or a function
-	    which returns a string
-	  - new function erc-set-initial-user-mode gets called from
-	    erc-connection-established
-
-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  <disumu@x3y2z1.net>
-
-	* erc.el 1.269:
-	in erc-nickserv-identify: if network is unknown, just use "Nickserv"
-
-	* erc.el 1.268: * fixed some typos
-
-	* timestamping
-	  - ctcp request messages and replies now have timestamp
-	  - timestamps in front of error messages now in timestamp face
-	  - added timestamp to more error messages
-
-	* ctcp reply messages, server ping message updated
-
-	* added variable erc-verbose-server-ping - check this instead of erc-paranoid
-
-	* added whowas on no such nick:
-	  - added variable erc-whowas-on-nosuchnick
-	  - in erc-server-401 do WHOWAS if erc-whowas-on-nosuchnick is non-nil
-
-	* erc.el 1.267: forgot documentaion for erc-nickserv-alist
-
-	* erc.el 1.266: NickServ identification changed and enhanced:
-	- erc-nickserv-identify-autodetect now called from erc-server-NOTICE-hook
-	- now possible to identify automatically without prompt:
-	  - added custom variables erc-prompt-for-nickserv-password and
-	    erc-nickserv-passwords
-	- added erc-nickserv-alist containing the different networks' nickserv details
-	- added function erc-current-network to determine the network symbol
-	- fixed bug where identification on dalnet didn't work, because they now
-	  require NickServ@services.dal.net
-	  now sends to all NickServ with nick@server where possible
-
-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:
-	  - changed erc-fill-column from defvar to defcustom
-	  - in erc-fill-variable: set fill-column to value of erc-fill-column
-
-	* erc.el 1.265: erc.el:
-	* fixed bug where topic wasn't being set when chanel name was provided
-
-	erc-fill.el:
-	* filling with erc-fill-variable now works with custom defined fill width:
-	  - changed erc-fill-column from defvar to defcustom
-	  - in erc-fill-variable: set fill-column to value of erc-fill-column
-
-2002-05-16  John Wiegley  <johnw@gnu.org>
-
-	* erc.el 1.264: whitespace fix
-
-2002-05-15  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el 1.263:
-	* added explanation of empty string working in erc-quit-reason-various-alist
-	* removed the text property from erc-send-message, it caused problems
-	  with /SV (as noticed by gbvb on IRC) and is obviously not needed
-	* when receiving a ctcp query, convert type to uppercase to allow for
-	  "/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  <disumu@x3y2z1.net>
-
-	* erc.el 1.262:
-	- in erc-format-privmessage: `erc-format-timestamp' added to message after
-	  message's text properties are applied so that it doesn't lose its face
-
-	- /quit without reason now works when `erc-quit-reason' is set to
-	  `erc-quit-reason-various' and the empty string "" is defined in
-	  `erc-quit-reason-various-alist'
-
-2002-05-13  Andreas Fuchs  <asf@void.at>
-
-	* erc-bbdb.el 1.16:
-	* Applied Drewies patch to pop-up on nick changes when -popup-type is 'visible
-
-2002-05-12  Andreas Fuchs  <asf@void.at>
-
-	* erc-bbdb.el 1.15, erc.el 1.261:
-	* erc-bbdb.el: pop up the buffer on /whois when erc-bbdb-popup-type is 'visible
-	* erc.el: fix for empty quit reason problem by drewie.
-
-2002-05-12  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.260: disumu nick patch
-	- added erc-show-my-nick (default t)
-	  if t, show nickname like <nickname>
-	  if nil, only show a > character before the message
-	- added faces erc-nick-default-face and erc-nick-msg-face
-	  - nicknames (channel, msgs, notices) are now in bold face by default
-	  - the msg face matches the erc-direct-msg-face color
-
-2002-05-10  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.259 (erc-send-pre-hook): Doc change.
-
-	* CREDITS 1.4: Alexander L. Belikoff is confirmed original author.
-
-2002-05-10  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.258:
-	timestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumutimestamp fix by disumu
-
-2002-05-09  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.257: *** empty log message ***
-
-2002-05-06  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.256:
-	New var: erc-echo-notices-in-minibuffer-flag. defaults to t.
-
-2002-05-04  John Wiegley  <johnw@gnu.org>
-
-	* TODO 1.3: *** empty log message ***
-
-2002-05-03  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.255: Copyright notice, version string updates.
-
-2002-05-02  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.254: Comment: dme is David Edmondson
-
-2002-05-01  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.253 (erc-warn-about-blank-lines): New option.
-	(erc-send-current-line): Use it.
-	(erc-quit-reason-various-alist): New option.
-	(erc-quit-reason): New option.
-	(erc-quit-reason-normal): New function.
-	(erc-quit-reason-zippy): New function.
-	(erc-quit-reason-various): New function.
-	(erc-cmd-QUIT): Use them.
-
-2002-04-30  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.252: Version 2.92
-
-	* erc.el 1.251 (erc-send-modify-hook): Default value is nil.
-
-2002-04-27  John Wiegley  <johnw@gnu.org>
-
-	* erc.el 1.250:
-	Don't redisplay the prompt if the ERC buffer is no longer alive.
-
-2002-04-26  John Wiegley  <johnw@gnu.org>
-
-	* erc.el 1.249:
-	Don't call `set-buffer' on old-buf unless the buffer is valid.  It's
-	often not when separate frames are being used.
-
-2002-04-23  Mario Lang  <mlang@delysid.org>
-
-	* erc-button.el 1.17: fixed up erc-nick-regexp
-
-2002-04-22  Brian P Templeton  <bpt@tunes.org>
-
-	* erc.el 1.248:
-	`erc-prompt' may now be a function that returns a string (which is
-	used as the prompt). I don't use Customize but I think customization
-	of it may be broken if it's not a string.
-
-	There is a new `erc-prompt' function that returns the prompt as a
-	string (e.g., returning either the result of `(funcall erc-prompt)' or
-	`erc-prompt').
-
-	This allows for dynamic prompts, such as a LispWorks-like prompt, or
-	one containing simply the current channel name. It was requested by
-	Mojo Nichols (nick michols) in #emacs today, 21-Apr-2002; cf. the
-	#emacs logs at <URL:http://www.tunes.org/~nef/logs/emacs/02.04.21.
-
-2002-04-17  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.247:
-	fix erc-send-current-line to work on empty lines again (without sending the prompt)
-	Fix C-c C-t to not include the nick/time info
-	(both from antifuchs)
-
-	* erc-complete.el 1.9: Fix for xemacs elt behaviour
-
-2002-04-17  John Wiegley  <johnw@gnu.org>
-
-	* erc-chess.el 1.17:
-	Added a missing arg in a call to erc-chess-handler.
-
-2002-04-15  John Wiegley  <johnw@gnu.org>
-
-	* erc-chess.el 1.16: *** empty log message ***
-
-2002-04-14  John Wiegley  <johnw@gnu.org>
-
-	* erc-chess.el 1.15: *** empty log message ***
-
-2002-04-12  John Wiegley  <johnw@gnu.org>
-
-	* erc-chess.el 1.14: *** empty log message ***
-
-	* erc-chess.el 1.12: bug fixes
-
-	* erc-chess.el 1.11: *** empty log message ***
-
-2002-04-12  Mario Lang  <mlang@delysid.org>
-
-	* erc-chess.el 1.6: change order.
-
-	* erc-chess.el 1.5: more fixing.
-
-	Now, the 'match question works. It sends an accept back.
-	But display popup doesnt work..
-
-	* erc-chess.el 1.4: fixup (still far from working)
-
-2002-04-11  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.246:
-	* Added :options entry for erc-mode-hook (erc-add-scroll-to-bottom)
-
-2002-04-11  John Wiegley  <johnw@gnu.org>
-
-	* erc.el 1.245: remove trailing \n from any sent text
-
-	* servers.pl 1.2, erc-bbdb.el 1.14, erc-button.el 1.16, erc-chess.el 1.3, 
-	  erc-complete.el 1.8, erc-fill.el 1.8, erc-ibuffer.el 1.14, erc-list.el 1.5, 
-	  erc-match.el 1.5, erc-menu.el 1.4, erc-nets.el 1.2, erc-replace.el 1.3, 
-	  erc-speak.el 1.22, erc-speedbar.el 1.8, erc-track.el 1.11, erc.el 1.244:
-	clean whitespace
-
-	* erc.el 1.243: Replaced erc-scroll-to-bottom.
-
-2002-04-11  Mario Lang  <mlang@delysid.org>
-
-	* erc-track.el 1.10:
-	try to fix behaviour when used with different frames.
-
-2002-04-09  Mario Lang  <mlang@delysid.org>
-
-	* erc-chess.el 1.2:
-	fixup release, far from ready for real usage, but it appears to work.
-
-	* erc.el 1.242:
-	speed improvments based on elp-instrument-package RET erc- RET results
-
-	* erc-chess.el 1.1: initial version.
-	please test it
-	Get chess.el from johnw's cvs:
-	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot login
-	cvs -d:pserver:anonymous@alice.dynodns.net:/usr/local/cvsroot co chess
-
-	(as usual, blank password)
-
-	Add the resulting dir to your load-path and reqire erc-chess.
-
-	Usage: Just do /chess nickname
-	The remote end much use erc, as no other irc client I know of supports this ...
-
-	See erc-chess-default-display and maybe set it to chess-images or chess-ics1 if you prefer those over chess-plain.
-	Also, see erc-chess-user-full-name to set the name you use in chess games.
-
-2002-04-04  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.241: New hackery latenightwise
-
-	* erc.el 1.240: upupadowndowncase
-
-2002-04-04  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.15: Updated for the new snapshot
-
-	* debian/rules 1.9: Install README.Debian into the package
-
-	* debian/README.Debian 1.1: Initial check-in
-
-2002-04-04  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.239:
-	Fixed that /me in query buffers ended up in server buffer
-
-	* erc.el 1.238: * Implemented joining +k channels
-
-2002-03-14  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.237: New utility function: erc-channel-list
-	minor fix to erc-get-buffer. hopefully that helps shapr
-
-2002-03-12  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.236:
-	New /command: /QUOTE for sending directly to the IRC server
-	Removed erc-fill from erc-insert-modify-hook. To activate filling, simply customize that var.
-
-2002-03-09  Brian P Templeton  <bpt@tunes.org>
-
-	* CREDITS 1.3: *** empty log message ***
-
-2002-03-09  Mario Lang  <mlang@delysid.org>
-
-	* erc-complete.el 1.7:
-	New variable: erc-nick-completion-ignore-case. Defaults to t.
-
-	* erc-track.el 1.9:
-	* erc-track-shorten-name-function can now be set to nil to avoid treating of channel names at all.
-
-2002-03-06  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.14, debian/rules 1.8: update to new snapshot
-
-2002-03-06  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.235:
-	Fixed nasty bug which prevented channel limit from correctly display/handling
-
-	* erc-track.el 1.8: Made shortening code highly customizable.
-	Now, there is the variable erc-track-shorten-function which holds
-	a function which gets called with one argument, CHANNEL-NAMES, which is a list
-	of strings of the channel names.
-	It needs to return a list of strings of the same length with the modified values...
-
-	* erc-track.el 1.7:
-	Added erc-track-shorten-aggressively, default to nil
-	if it is set to t, erc will shorten a bit more.
-	if nil, erc will shorten the name only if it would get shorter than just
-	one char...
-
-	* erc-speak.el 1.21: added iirc to the abbreviation expansion list.
-
-	* erc-track.el 1.6:
-	Added customization variable: erc-track-use-faces. defaults to t.
-
-	* erc-track.el 1.5: *** empty log message ***
-
-	* erc-track.el 1.4:
-	experimental: Added face support to mode-line channel activity tracker.
-	Currently we use the faces used for indicating in the buffer (erc-pal-face for channels with pal acitivity...)
-
-2002-03-05  Mario Lang  <mlang@delysid.org>
-
-	* erc-complete.el 1.6: * added docfixes (thanks ore)
-
-	* erc-track.el 1.3: Fixed channel-name reduction.
-	thanks again alex.
-	Renamed the vars to erc-track-opt-start and erc-track-opt-cutoff.
-
-	* erc.el 1.234: fixed another silly error
-
-	* erc-track.el 1.2: Implemented channel name shortening.
-	Vars erc-track-cutoff says: all channel names longer than this will be shortened.
-	Var erc-track-minimum-channel-length says: dont make names shorten than this.
-	(Thanks go out to kensanata for the nice unique-substrings utility function).
-
-	* erc.el 1.233: silly typo corrected
-
-	* erc.el 1.232:	* erc.el 1.232: * New varialbe: erc-common-server-name-suffixes
-	  This alist can be used to change the server names displayed in mode-line
-	  to a shorter version..
-	* New function: erc-shorten-server-name (uses var above)
-	* Changed erc-prepare-mode-line to use erc-shorten-server-name.
-
-2002-02-25  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.231:
-	CTCP handling rewritten. Seems to work. please test and report probs.
-
-2002-02-24  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.230:
-	Fixed emacs20 backward compatibility (new defun/alias: erc-propertize)
-
-2002-02-22  Mario Lang  <mlang@delysid.org>
-
-	* erc-button.el 1.15: *** empty log message ***
-
-2002-02-21  Mario Lang  <mlang@delysid.org>
-
-	* erc-button.el 1.14, erc.el 1.229:
-	minor fixup related to read-only prompts and command renaming.
-
-2002-02-21  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.228: * modify `erc-remove-text-properties-region' to work.
-	  Could even be a little faster now. (-:
-
-2002-02-21  Mario Lang  <mlang@delysid.org>
-
-	* erc-ring.el 1.3:
-	fixed erc-replace-command to behave right when text is read-only.
-	Also, use erc-insert-marker and (point-max) now.
-
-	* erc.el 1.227: * Made erc-prompt read-only
-	* new function: erc-make-read-only. Can be used on erc-insert-post-hook and erc-send-post-hook to ensure read-only buffer text too
-
-2002-02-19  Mario Lang  <mlang@delysid.org>
-
-	* erc-list.el 1.4: added comment to docstring
-
-	* erc-speak.el 1.20: minor updates, use erc-nick-regexp now
-
-	* erc.el 1.226:
-	ensure that erc-timer-hook is called inside the server-buffer.
-
-2002-02-19  Andreas Fuchs  <asf@void.at>
-
-	* erc-match.el 1.4:
-	* Probably fixed the "number-char-or-marker-p: nil" bug.
-
-2002-02-19  Mario Lang  <mlang@delysid.org>
-
-	* erc-notify.el 1.1: Initial release.
-
-	* erc.el 1.225: added #303 handling
-	moved timer and added an arg (erc-current-time)
-
-	* erc-list.el 1.3, erc.el 1.224:
-	slightly changed the erc-once-with-server-event macro
-
-	* erc-button.el 1.13: erc-button-alist: doc fix and custom type fix
-
-2002-02-18  Mario Lang  <mlang@delysid.org>
-
-	* erc-list.el 1.2, erc.el 1.223: new macro: erc-once-with-server-event
-	erc-list.el: use it
-
-	* erc-match.el 1.3:
-	Minor fix related to hook call method change (-until-seccess now)
-
-	* erc.el 1.222: fixed ctcp behaviour abit (with auto-query on)
-
-	* erc-list.el 1.1: ChanList mode.
-	Load it, and type M-x erc-chanlist RET
-	Demonstrates how the new hook system can be nicely used.
-
-	* erc.el 1.221:
-	new hook: erc-default-server-hook. This one gets called if we dont have anything defined for a certain IRC server message.
-	New function: erc-default-server-handler. (used by above hook).
-	New function: erc-debug-missing-hooks: Used by above hook to save a list of unimplemented server messages.
-	New function: erc-server-buffer, erc-server-buffer-p.
-	Various places: use it.
-	Minor fixup.
-
-	* erc-button.el 1.12: fix regexp to not buttonize ~user@host hostnames
-
-2002-02-17  Mario Lang  <mlang@delysid.org>
-
-	* erc-complete.el 1.5, erc.el 1.220: Eliminated erc-command-table
-	Upcased the command defuns (erc-cmd-join is now erc-cmd-JOIN)
-	Fixed erc-complete to not require erc-command-table.
-	Implemented erc-cmd-HELP
-	  (You have to try that, its tooo coool!)
-	  e.g. /help auto-q
-	fixed autoloads for erc-add-pal and so on to be interactive.
-
-2002-02-17  Andreas Fuchs  <asf@void.at>
-
-	* erc-match.el 1.2:
-	* Fix unfunctional code in `erc-get-parsed-vector-type'.
-
-	* erc-bbdb.el 1.13, erc-button.el 1.11, erc-match.el 1.1, erc.el 1.219:
-	* Be careful: MANY changes ahead. I won't go into too much details.
-
-	* erc.el, new file erc-match.el: split out all pattern-matching code.
-	* erc.el: removed all defcusts for erc-{...}-highlight-props. They are
-	  quite useless, anyway.
-	* moved erc-add-entry-to-list and -remove- over to erc-match. changed
-	  their arg list.
-	* erc.el: add autoloads for erc-{add,delete}-{keyword,pal,fool,dangerous-host}
-	* erc.el: erc-server-PRIVMSG-or-NOTICE:
-	  - remove all the highlighting crap
-	  - add a (when (eq s nil) ...) so that untreated CTCP messages don't
-	    get misdisplayed.
-	* erc.el: erc-mark-message: removed this function, it's useless
-	* erc.el: minor bugfixes.
-
-	* erc-match.el: first checkin. This file now contains all the pattern
-	  matching stuff. there is now another defcust group, erc-match,
-	  containing all match related stuff (erc-keywords, ...)
-	* erc-match.el: added functionality to log matching lines. Quite
-	  customizable, check out the docstring of defun erc-log-matches
-	* erc-match.el: added functionality to make foolish messages
-	  invisible/intangible. This could replace erc-ignore-list
-	  sometime. it's more powerful right now, anyway.
-	* erc-match.el erc-text-matched-hook: new hook. run when Text matches
-	  anything (pal, fool, etc.).
-
-	* erc-button.el: Make nick buttonization customizable.
-	* erc-button.el: Give nick buttonization a lower priority so that it
-	  does not break url buttons.
-
-	* erc-bbdb.el: Add \n to the separators by which we split nicknames.
-
-2002-02-17  Mario Lang  <mlang@delysid.org>
-
-	* TODO 1.2: Added item
-
-2002-02-17  Brian P Templeton  <bpt@tunes.org>
-
-	* CREDITS 1.2, erc.el 1.218: Added invisible timestamp support.
-
-2002-02-16  Gergely Nagy  <algernon@debian.org>
-
-	* debian/changelog 1.13, debian/rules 1.7, debian/scripts/install 1.5:
-	updated to new snapshot
-
-2002-02-16  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.217:
-	Fixed channel limit format overflow in mode-line display.
-	(Having to use floats if integers are to large is quite strange, isn't it?)
-
-	* TODO 1.1: TODO list created.
-	Add comments and expand it.
-
-	* erc.el 1.216:
-	Fixed bug in query buffer handling (only happend in mixed-case situations)
-
-	* erc.el 1.215: shapr checkdoc patch #1
-	massive docfixes! yay, keep going!
-
-2002-02-15  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.214: various other fixes
-	make s301 a catalog entry
-
-2002-02-15  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.213: * erc-server-NICK and erc-server-INVITE: fixed to use
-	  `erc-display-message'. These I missed in the first checkin.  I
-	  didn't say it in the last log message, but please test these.
-
-	* erc-fill.el 1.7, erc.el 1.212:
-	* erc.el: updated many functions to use `erc-display-message'. Now, we
-	  should go for getting highlighting out of
-	  erc-server-PRIVMSG-or-NOTICE. The part I want to attack has been
-	  marked.
-	* erc-fill.el: updated static filling to leave the erc-parsed property alone.
-
-2002-02-15  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.211:
-	first step, new function: erc-display-message
-
-	* erc.el 1.210: added numreply 379 and 405.
-
-	* erc.el 1.209: stupid typo fixed
-
-	* erc.el 1.208:
-	Finally renamed erc-frame-dedicated-p to erc-frame-dedicated-flag
-	Removed usage of erc-interpret-controls from info buffer drawing (major speedup)
-	Other speedups based on the results from elp.
-	ERC is now about 300%-500% faster in some situations with very full channels!!!!!
-
-2002-02-14  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.207:
-	* erc-downcase now downcases {}|^ with []\~ -- 'stolen' from zenirc.
-	* various checkdoc fixes. Just the upper third of the file, but that
-	  should help a little, too. (-: Again, if you have any writing
-	  skills, take out that dusty keyboard and tap it to the beat of M-x
-	  checkdoc!
-
-2002-02-14  Gergely Nagy  <algernon@debian.org>
-
-	* erc.el 1.206 (erc-format-privmessage):
-	fix it, so timestamp-coloring works again (patch from antifuchs)
-
-2002-02-14  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.205: Many fixes based on M-x checkdoc RET.
-	If you have write access, and some english knowledge, help document erc too!
-	M-x checkdoc RET, and follow the instructions.
-
-	* erc-button.el 1.10, erc-ibuffer.el 1.13: minor fixes
-
-	* erc.el 1.204: Use nreverse instead of reverse.
-	Use eq instead of equal where possible.
-	Rewrote erc-get-buffer to not use find-if (find-if does very deep function-call nesting, which isnt good ina  defun which is called so often)
-
-2002-02-13  Mario Lang  <mlang@delysid.org>
-
-	* erc-button.el 1.9, erc.el 1.203:
-	In erc.el, new hook: erc-channel-members-changed-hook.
-	erc-button.el: Now highlight all nicknames. uses regexp-opt.
-
-2002-02-04  Mario Lang  <mlang@delysid.org>
-
-	* erc-nets.el 1.1:
-	Database of irc networks. Use erc-server-select to interactively select one.
-
-	* erc.el 1.202: * erc-format-nick-function: New variable.
-	* (erc-format-nick): The default for above var. Just return the nick.
-	* (erc-format-@nick): Prefix NICK with @ or + if OP or VOICE.
-	* Removed erc-track-modified-channels related code and moved into erc-tracke.l
-	   Its auto-loaded now
-
-	* erc-track.el 1.1: Split code from erc.el
-
-2002-02-01  Mario Lang  <mlang@delysid.org>
-
-	* erc-ibuffer.el 1.12:
-	* erc-target now uses erc-port-to-string
-
-	* servers.pl 1.1:
-	Script to convert mircs servers.ini to a elisp salist kind of thing.
-	(development tool, it doesnt help you much as a user)
-
-	* erc.el 1.201:
-	* erc-display-line-buffer: renamed to erc-display-line-1
-	* erc-port-equal: New function.
-	* erc-normalize-port: Used by erc-port-equal
-	* minor docstring fixes
-
-2002-02-01  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.200:
-	* erc-already-logged-in-p: compare ports is more robust now.
-
-	* erc-button.el 1.8: * Add buttonization to erc-send-modify-hook, too
-
-2002-01-31  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.199:
-	Use insert-before-markers instead of insert in erc-display-line-buffer
-	This fixed point@column 0 problem and gives us some speedup! yay
-
-	* erc-ibuffer.el 1.11, erc.el 1.198: minor fixes
-
-	* erc.el 1.197:
-	* (erc-line-beginning-position): Renamed to erc-beg-of-input-line.
-	* (erc-line-end-position): Renamed to erc-end-of-input-line.
-	* erc-multiline-input-p: Variable removed.
-
-	* erc.el 1.196:
-	Minor docstring fixes (using M-x checkdoc-current-buffer)
-	  If you find time, and you are native english speaker, do that too!!
-
-	* erc.el 1.195: fixed macro-invokation
-
-2002-01-31  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.194: * erc-with-all-buffers-of-server: use erc-list-buffers
-	* erc-process-away, erc-{save,kill}-query-buffers: use it.
-	* erc-cmd-away-all: new command. Set away/back on all servers.
-
-	* erc.el 1.193:
-	* Fix last multiline bug in erc-send-distinguish-noncommands.
-
-2002-01-31  Mario Lang  <mlang@delysid.org>
-
-	* erc-ibuffer.el 1.10, erc.el 1.192: minor fixes
-
-2002-01-30  Mario Lang  <mlang@delysid.org>
-
-	* erc-ibuffer.el 1.9, erc-menu.el 1.3, erc-speak.el 1.19, erc.el 1.191:
-	Renamed erc-track-modified-channels-minor-mode to erc-track-modified-channels-mode (at least, its a bit shorter)
-	Added docstring to erc-server-hooks (through the macro)
-	Minor docfix in obsolete hook
-
-2002-01-30  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.190:
-	* erc-send-current-line: fix behaviour where buffer changes.
-	* erc-mark-message: fix stupid face bug. highlighting of pals should work now.
-
-	* erc-ring.el 1.2, erc.el 1.189:
-	* new hooks: erc-send-pre-hook, erc-send-modify-hook, erc-send-post-hook
-	* erc-send-this: new variable
-	* erc-noncommands-list: new constant.
-	* erc-send-distinguish-noncommands: use it. (First filter function for sending! yay!)
-	* erc-send-current-line: nearly completely rewritten.
-	  - now handles multiline input. (yay!)
-	  - now uses the three hooks from above.
-	* erc-process-line: new arg, no-command: don't process this line as a command.
-
-2002-01-30  Mario Lang  <mlang@delysid.org>
-
-	* erc-bbdb.el 1.12, erc-button.el 1.7, erc-speak.el 1.18, erc.el 1.188:
-	hook handling rewrite phase 1.
-
-2002-01-30  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.187: * Rework erc-server-PRIVMSG-or-NOTICE
-	* New function: erc-is-message-ctcp-p
-	* New function: erc-format-privmessage
-	* New function: erc-mark-message
-	* erc-server-PRIVMSG-or-NOTICE: use them.
-
-2002-01-30  Mario Lang  <mlang@delysid.org>
-
-	* CREDITS 1.1, HISTORY 1.1:
-	Initial checkin.
-
-2002-01-29  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.186: * erc-put-text-properties: make OBJECT optional
-	* erc-put-text-property: same
-	* erc-server-PRIVMSG-or-NOTICE: use them.
-	* Make erc-display-line-buffer: add the "\n" even when the string would be invisible.
-	* same: make the \n invisible, too (:
-
-2002-01-29  Mario Lang  <mlang@delysid.org>
-
-	* erc-ibuffer.el 1.8, erc.el 1.185:
-	Rewrote channel tracking using window-configuration-change-hook instead of defadvices.
-
-2002-01-28  Andreas Fuchs  <asf@void.at>
-
-	* erc-fill.el 1.6, erc.el 1.184:
-	* Macro define-erc-highlight-customization: Ease up defining
-	  erc-{fool,pal,..}-highlight-props defcusts.
-	* defcusts:
-	  - erc-fool-highlight-props
-	  - erc-pal-highlight-props
-	  - erc-dangerous-host-highlight-props
-	  - erc-keyword-highlight-props
-
-	  Customizable to either nil or "Hide message".
-	* erc-string-invisible-p: check for invisible chars in string
-	* erc-display-line-buffer: use it.
-	* erc-put-text-properties: put a list of props into a piece of text.
-	* erc-server-PRIVMSG-or-NOTICE: use it; set appropriate
-	  highlight-props for entire incoming message. This set of changes
-	  allows you to e.g. auto-ignore fools.
-
-2002-01-28  Mario Lang  <mlang@delysid.org>
-
-	* erc-ibuffer.el 1.7:
-	Added highlight detection support to the Mark column.
-	Now p, k, f, and d indicate pal, keyword, fool and dangerous-host related activity.
-
-	* erc.el 1.183:
-	Highlight tracking finished. All necessary info should now be in erc-modified-channels.
-
-	* erc.el 1.182, erc-ibuffer.el 1.6, erc-speedbar.el 1.7:
-	Added highlight tracking to track-modified-channels
-	   no display code yet, the info is just kept in erc-modified-channels
-	Added erc-modified column to ibuffer
-	speedbar update
-
-	* erc-ibuffer.el 1.5: Added erc-members column
-
-	* erc-ibuffer.el 1.4: *** empty log message ***
-
-2002-01-28  Andreas Fuchs  <asf@void.at>
-
-	* erc-bbdb.el 1.11:
-	* Fix a slight typo. The hook function should be called in
-	  erc-server-376-hook (-:
-
-2002-01-28  Mario Lang  <mlang@delysid.org>
-
-	* erc-ibuffer.el 1.3: *** empty log message ***
-
-2002-01-27  Mario Lang  <mlang@delysid.org>
-
-	* erc-ibuffer.el 1.2: Fixup, it sort of works now. Try it
-
-	* erc-ibuffer.el 1.1: Initial version
-
-2002-01-26  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.181: *** empty log message ***
-
-2002-01-25  Andreas Fuchs  <asf@void.at>
-
-	* erc-bbdb.el 1.10: * fix two bad things:
-	  - fix the "proc trick": pass proc as an arg through
-	    ...-insinuate-... to ...-show-entry
-	  - hook highlighting into the 376 hook. This one is bound to get
-	    called (-:
-	* We now only append to hooks only.
-	* Highlighting of changing records gets updated automatically.
-
-2002-01-25  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.180: *** empty log message ***
-
-2002-01-25  Andreas Fuchs  <asf@void.at>
-
-	* erc-bbdb.el 1.9: * nearly complete rewrite of erc-bbdb:
-	  -  Removed code duplication in erc-bbdb-NICK and -JOIN.
-	  -  Made erc-bbdb-show-entry more general and intelligent.
-	  -  erc-bbdb-insinuate-entry is now erc-bbdb-insinuate-and-show-entry
-	     (note the different arglist!):
-	  -  erc-search-name-and-create now creates "John Doe" users if name
-	     is not specified.
-	  -  No sign of "mail" anywhere anymore. It's all finger-host. (-:
-	  -  erc-bbdb-popup-p is now called erc-bbdb-popup-type.
-	  -  New customize values:
-	     . erc-bbdb-irc-channel-field     channel field name
-	     . erc-bbdb-irc-highlight-field   (see below)
-	     . erc-bbdb-auto-create-on-nick-p auto-create record on join
-
-	* Highlighting based on BBDB is now here! Specify which type of
-	  highlighting a person in the BBDB (whose nick you know) and have
-	  fun! Read help to erc-bbdb-init-highlighting for details. Changes:
-	  -  new function erc-bbdb-init-highlighting: gets called on server
-	     connect.
-	  -  new function erc-bbdb-highlight-record: highlights a person's
-	     nick names.
-
-2002-01-24  Andreas Fuchs  <asf@void.at>
-
-	* erc-button.el 1.6:
-	* Fix the erc-button-alist regexp for EmacsWiki stuff. delYsid's version
-	  is better (-:
-
-	* erc-button.el 1.5: * Added an Ewiki: specifier to the url-regexp.
-	  <nickname> EmacsWiki: EmacsIRCClient tells you <bla>
-	  should highlight "EmacsWiki: EmacsIRCClient" and allow you to
-	  browse to the wiki when the button is activated.
-	* new custom: erc-emacswiki-url.
-	* new function: erc-browse-emacswiki: use it.
-
-2002-01-23  Mario Lang  <mlang@delysid.org>
-
-	* erc-bbdb.el 1.8:
-	erc-bbdb-NICK: Added regexp-quote around fingerhost search.
-
-2002-01-10  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.179:
-	* Channel saving/killing on quit from server implemented:
-	 - defcust erc-save-queries-on-quit: Save server's channel buffers on quitting from server
-	 - defcust erc-kill-queries-on-quit: Kill server's channel buffers on quitting from server
-	 - Macro erc-with-all-buffers-of-server: Run a form inside all the server's query buffers
-	 - Functions erc-{kill,save}-query-buffers: use it.
-	* Added indent-tabs-mode: t to Local Variables section.
-
-2002-01-07  Andreas Fuchs  <asf@void.at>
-
-	* erc-replace.el 1.2: * fix stupid documentation errors.
-
-2002-01-07  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.178:
-	* (toplevel): Revert previous change. This resulted ina  recursive load...
-	   You have to put (require 'erc-button) into your .emacs for now
-
-2002-01-05  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.177:
-	* Added require for erc-button. This is devel. so I need testers :)
-
-	* erc-button.el 1.4: * Added proper file headers (GPL).
-
-2002-01-04  Mario Lang  <mlang@delysid.org>
-
-	* erc-button.el 1.3: * erc-button-alist: Added entry for finger
-
-	* erc-button.el 1.2: * Removed bogus usage of :button-keymap.
-	P
-	   Does anyone know what this was supposed to do anyway?
-
-	* erc-button.el 1.1: * Initial version.
-	* This module allows a way of buttonizing text in IRC buffers.
-	  Default it is used for URLs, but other things could be added.
-	  see if you can find another use, erc-button-alist
-
-See ChangeLog.2001 for earlier changes.
-
-    Copyright (C) 2002 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.
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
-;; arch-tag: a6779d5e-99fa-442b-98cf-90e73eb2c272
--- a/lisp/erc/ChangeLog.2003	Mon Feb 06 18:44:57 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2151 +0,0 @@
-2003-12-30  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.595 (erc-cmd-HELP):
-	Changed to prefer giving help for erc-cmd-* functions over
-	   similarly-named Elisp functions (e.g., erc-cmd-LIST vs. list).
-
-2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.594 (erc-query-buffer-p): Added this function.
-
-2003-12-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.593 (erc-cmd-SV): Use erc-emacs-build-time.
-
-	* erc-compat.el 1.15: erc-emacs-build-time: New variable.
-
-	* erc.el 1.592 (erc-cmd-SAY):
-	Reintroduced the feature where the spaces between
-	"/SAY" and the rest of the line were being sent with the message.
-
-2003-12-28  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.591 (erc-server-buffer-p):
-	Fixed a bug where this function sometimes would return
-	    nil when it should return t.
-
-2003-12-27  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.590 (erc-generate-new-buffer-name):
-	Really fixed a bug where ERC would reuse
-	    a connected server buffer when erc-reuse-buffers is non-nil.
-	(erc-cmd-JOIN): Now we tell the user when he attempts to join the same
-	    channel twice on the same server.
-
-	* erc.el 1.589 (erc-generate-new-buffer-name):
-	Fixed a bug where ERC would reuse a connected server buffer when erc-reuse-buffers is non-nil.
-
-	* erc.el 1.588 (erc-cmd-SAY):
-	Fixed a bug where the spaces between "/SAY" and the rest of the
-	    line were being sent with the message.
-
-	* erc-list.el 1.15: Fixed another typo.
-
-	* erc-list.el 1.14: Fixed a typo.
-
-	* erc-list.el 1.13:
-	Added text to the top of the channel list buffer describing the keybinding for
-	function erc-chanlist-join-channel.
-
-	* erc-list.el 1.12: Minor appearance changes.  No functional change.
-
-	* erc-list.el 1.11:
-	Implemented function erc-chanlist-join-channel.  Added variable
-	erc-chanlist-channel-line-regexp.  Got rid of function
-	erc-chanlist-pre-command-hook.  Changed the logic for how channel lines are
-	highlighted.
-
-2003-12-26  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-list.el 1.10:
-	Removed a bunch of unused code.  No semantic change.
-
-	* erc-list.el 1.9: Added lots of functionality.
-
-2003-12-15  Mario Lang  <mlang@delysid.org>
-
-	* erc-track.el 1.58, erc.el 1.587:
-	New custom type erc-message-type, use it in erc-hide-list and erc-track-exclude-types
-
-2003-12-14  Alex Schroeder  <alex@gnu.org>
-
-	* erc-track.el 1.57 (track-when-inactive): New module.
-	(erc-track-visibility): New option.
-	(erc-buffer-activity): New variable.
-	(erc-buffer-activity-timeout): New variable.
-	(erc-user-is-active): New function.
-	(erc-buffer-visible): New function.
-	(erc-modified-channels-update): Replace get-buffer-window call
-	with call to erc-buffer-visible.
-	(erc-track-modified-channels): Ditto.
-
-2003-12-14  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc-track.el 1.56 (erc-modified-channels-update):
-	Force update of modeline.  Makes sure
-	that the tracked channels disappear in other buffers too.
-
-2003-12-06  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc.el 1.586 (define-erc-module):
-	New optional argument LOCAL-P.  If non-nil, then
-	mode will be created as buffer-local rather than a global mode.
-	(erc-cmd-CTCP): Fix indentation from last commit.
-
-	* erc-compat.el 1.14 (erc-define-minor-mode):
-	Deal with :global and :group keywords.
-
-	* erc-nickserv.el 1.13 (erc-current-network):
-	Make server regex more permissive.
-
-	* erc.el 1.585 (erc-cmd-CTCP):
-	Don't add a space to end of command when ARGS are
-	empty.  This fixes a bug whereby requests of the form "VERSION " were
-	being sent, and ignored.
-
-2003-11-27  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc-log.el 1.9: From Adrian Aichner <adrian@xemacs.org>
-	* erc-log.el (erc-log-file-coding-system): Use 'binary
-	coding-system under XEmacs (instead of 'emacs-mule).
-	* erc-log.el (erc-w32-invalid-file-characters): Removed as no
-	longer needed.
-	* erc-log.el (erc-generate-log-file-name-long): Use
-	`convert-standard-filename', which exists in XEmacs too.
-
-2003-11-16  Mario Lang  <mlang@delysid.org>
-
-	* erc-identd.el 1.1: Code provided by johnw, thanks!
-
-2003-11-09  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc.el 1.584 (erc-latest-version): Clean up docstring.
-	Remove requirement for w3, wrap REQUIRE statement in IGNORE-ERRORS.
-	Update viewcvs url to correct location.
-	(erc-ediff-latest-version): Make sure that we find the uncompiled
-	erc.el, error if not.
-
-2003-11-07  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.583: Add more info to /sv
-
-2003-11-06  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.582: Added optional argument BUFFER to erc-server-buffer-p.
-
-2003-11-04  Mario Lang  <mlang@delysid.org>
-
-	* AUTHORS 1.6: Add sachac
-
-2003-11-02  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc.el 1.581 (erc-server-366):
-	chnl is 4th element of parsed, not fifth.
-	(erc-channel-end-receiving-names): Pass correct number of arguments
-	to delete-if-not.
-
-	* erc.el 1.580 (erc-update-current-channel-member):
-	 Use erc-downcase when comparing
-	nick entries.  Cleanup indentation.
-
-2003-11-01  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc-sound.el 1.4: Added a (provide 'erc-sound) line.
-
-	* erc.el 1.579 (erc-cmd-NAMES): send to TGT, not CHANNEL.
-
-2003-10-29  Sandra Jean Chua  <sacha@free.net.ph>
-
-	* erc-pcomplete.el 1.21, erc.el 1.578, CREDITS 1.6:
-	Merged Jeremy Maitin-Shepard's patch for time-sensitive nick completion.
-
-2003-10-27  Mario Lang  <mlang@delysid.org>
-
-	* Makefile 1.19, debian/changelog 1.24:
-	New Debian package 4.0.cvs.20031027
-
-2003-10-25  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.577: Fix typo tuncate->rruncate
-
-2003-10-24  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.80: From Stephan Stahl <stl@isogmbh.de>:
-	 * (erc-dcc-send-block): Kill buffer if transfer completed correctly.
-
-2003-10-22  Mario Lang  <mlang@delysid.org>
-
-	* erc-track.el 1.55 (erc-track-disable):
-	Do not deactivate all advices for `switch-to-buffer',
-	just disable the erc specific one. (Bug#217022).
-
-2003-10-18  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc-log.el 1.8 (erc-log-file-coding-system): New variable.
-	(erc-save-buffer-in-logs): Use it.
-
-2003-10-17  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.576 (erc-interpret-mirc-color): New boolean defcustom
-
-	* erc.el 1.575: Do not use -nowait on darwin (thanks johnw)
-
-2003-10-15  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc.el 1.574 (define-erc-module):
-	Set erc-FOO-mode appropriately in erc-FOO-enable
-	and erc-FOO-disable.
-
-2003-10-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-autoaway.el 1.12 (erc-mode):
-	Reset idletime on connect. Fixes an annoying bug which
-	flooded the server with aways on reconnect.
-	(erc-autoway-reset-idletime): Accept optional args so we can hook it
-	onto erc-server-001-hook.
-
-2003-10-10  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.573 (erc-hide-list): Add a nice defcustom type
-
-2003-10-08  Mario Lang  <mlang@delysid.org>
-
-	* Makefile 1.18, debian/changelog 1.23, debian/control 1.8:
-	Debian snapshot 20031008
-
-	* erc-speedbar.el 1.11:
-	Patch from Eric M. Ludlam <eric@siege-engine.com>:
-	 - (erc-install-speedbar-variables): Add functions list (needs new speedbar?)
-	 - (erc-speedbar-buttons): Add doc.  Clear the buffer
-	 - (erc-speedbar-sort-channel-members): New function.
-	 - (erc-speedbar-expand-channel): Call new sort function.  Change some visuals.
-	 - (erc-speedbar-insert-user): Change some visuals based on channel data.
-	 - (erc-speedbar-line-text, erc-speedbar-item-info): New functions
-	Add proper elisp file header.
-
-2003-10-02  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc-match.el 1.22 (erc-match-syntax-table): New variable.
-	(erc-match-current-nick-p): Use it.
-
-	* erc.el 1.572 (erc-quit-reason-zippy, erc-part-reason-zippy): Use
-	`erc-replace-regexp-in-string' rather than
-	`replace-regexp-in-string'.
-	(erc-command-indicator-face): New face, used to show commands if
-	`erc-hide-prompt' is nil and `erc-command-indicator' is non-nil.
-	(erc-command-indicator): Clean up doc-string.
-	(erc-display-prompt): New optional argument FACE, use this rather
-	than `erc-prompt-face' to fontify the prompt if non-nil.
-	(erc-send-current-line): Pass in `erc-command-indicator-face' to
-	`erc-display-prompt'.
-
-	* erc-compat.el 1.13 (erc-replace-regexp-in-string): New function.
-	Alias for `replace-regexp-in-string' on Emacs 21.
-	Argument massaging for `replace-in-string' for XEmacs.
-
-2003-09-28  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.571 (erc-keywords): Removed. Wasn't used by anything.
-
-2003-09-25  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc.el 1.570: ERC-HIDE-PROMPT: add custom group
-	ERC-COMMAND-INDICATOR: new variable.
-	ERC-COMMAND-INDICATOR: new function.
-	ERC-DISPLAY-PROMPT: new argument, PROMPT, used to override default
-	prompt.
-	ERC-SEND-CURRENT-LINE: pass ERC-COMMAND-INDICATOR to ERC-DISPLAY-PROMPT.
-
-2003-09-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.569 (erc-parse-line-from-server):
-	Ignore empty lines as required by RFC.
-
-2003-09-17  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.568: Add lag time calculation
-
-2003-09-13  Mario Lang  <mlang@delysid.org>
-
-	* Makefile 1.17, debian/README.Debian 1.7, debian/changelog 1.22:
-	New debian release
-
-	* erc-notify.el 1.22:
-	Call erc-notify-install-message-catalogs on load, not on module init
-
-	* erc.el 1.567 (erc-update-modules):
-	Use `load' instead of `require'.  XEmacs appears
-	to have the NOERROR arg only sometimes... Strange
-
-	* erc.el 1.566: No fboundp if we have a defvar
-
-	* erc.el 1.565: Properly defvar erc-ping-handler
-
-2003-09-11  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.564 (erc-setup-periodical-server-ping):
-	check if erc-ping-handler is
-	    bound before referencing it
-
-2003-09-10  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.563 (erc-cmd-NICK):
-	Warn about exceeded NICKLEN if we know it.
-
-	* erc.el 1.562: Make erc-server-PONG obey erc-verbose-server-ping.
-	Cancel old `erc-ping-handler' timer when restablishing connection in the same
-	buffer.
-
-	* debian/changelog 1.21, Makefile 1.16: New debian snapshot
-
-	* erc-dcc.el 1.79, erc-xdcc.el 1.6:
-	Use new function erc-dcc-file-to-name to convert spaces to underscores
-
-	* erc-xdcc.el 1.5: Add autoload for erc-xdcc-add-file
-
-2003-09-08  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.78: indent fixes and copyright update
-
-	* erc.el 1.561:
-	erc-send-ping-interval: New defcustom which defaults to 60.
-	Every 60 seconds, we send PING now.
-	This should fix the "connection silently lost" bug.
-	Please test this change extensively, and report problems.
-
-2003-09-07  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.560 (erc-default-coding-system):
-	Test for undecided and utf-8
-	before setting.
-
-2003-09-01  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.559 (erc-modules): Add some more symbols to the set
-
-	* erc.el 1.558 (erc-modules):	* erc.el 1.558 (erc-modules): Add :greedy t to the set in 
-
-	* erc-dcc.el 1.77:
-	More autoloads which make dcc autoload upon ctcp dcc query received.
-
-	* erc-dcc.el 1.76 (erc-cmd-DCC): Add Autoload.
-	(pcomplete/erc-mode/DCC): Ditto, makes DCC autoloadable just by using
-	completion.
-	Also only offer "send" if fboundp make-network-process.
-
-	* erc-autojoin.el 1.6: Update copyright
-
-	* erc-autojoin.el 1.5 (erc-autojoin-add):
-	Only add the channel if it is not already there.
-
-	* erc-notify.el 1.21:
-	Use `define-erc-module' instead of old `erc-notify-initialize'.
-	Now defines the global minor mode erc-notify-mode, and should also
-	be controllable via `erc-modules' with symbol `notify'.
-
-	* erc.el 1.557 (erc-modules):
-	Fix paren-in-column-zero bug in docstring.
-	Add a sort of bogus, but still better :type.
-	Add autojoin and netsplit by default.
-	(erc-update-modules): Dont barf with an error if `require' fails.
-	We can still error out if the mode is not defined.
-
-2003-08-31  Andreas Fuchs  <asf@void.at>
-
-	* erc.el 1.556:
-	* make 353 (NAMES reply) output go into the appropriate channel buffer
-	  (if it exists) or into the active erc buffer (if not).
-
-2003-08-29  mtoledo  <mtoledo@confusibombus>
-
-	* erc.el 1.555:
-	Added the variable erc-echo-notices-in-current-buffer to make possible display notices in the current buffer (queries to nickserv/chanserv/memoserv). Defaults to nil so nothing changes from what we have today.
-
-2003-08-29  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.554: Fix typo in varname which led to a compiler warning
-
-	* AUTHORS 1.5: Added lawrence
-
-2003-08-27  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.75:
-	Set process and file-coding system to 'binary (for Windows)
-
-	* erc-stamp.el 1.30: Rename custom group erc-timestamp to erc-stamp.
-
-2003-08-07  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc-fill.el 1.23 (erc-fill-disable):
-	Remove erc-fill, not erc-fill-static from
-	erc-insert-modify-hook.
-
-2003-08-05  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.553 (erc-send-current-line):
-	Now we display the prompt for previously entered commands
-	    based on the value of customization variable erc-hide-prompt.  This change is
-	    closely related to revision 1.552 by wencem.
-
-2003-08-04  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc.el 1.552 (erc-send-current-line):
-	If we're sending a command, don't display
-	the prompt.
-
-2003-08-04  Damien Elmes  <erc@repose.cx>
-
-	* erc-track.el 1.54: patch from David Edmondson (dme AT dme DOT org)
-
-	This patch makes button 3 on the erc-track buffer names in the
-	modeline show the selected buffer in another window. It's analogous to
-	button 2 which shows the buffer in the current window.
-
-2003-07-31  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.551 (erc-display-line-1):
-	Fixed bad indentation on one line.  No semantic change.
-
-2003-07-29  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc-match.el 1.21:
-	Quote open paren in docstring of erc-text-matched-hook
-
-	* erc.el 1.550: Anchor match only at beginning in erc-ignored-user-p.
-
-	* erc-button.el 1.47: New variable erc-button-wrap-long-urls.
-	Modified erc-button-add-buttons:
-	  New optional argument REGEXP.
-	  If we're buttonising a URL and erc-button-wrap-long-urls is
-	  non-nil, try and wrap them
-
-	Modified erc-button-add-buttons-1:
-	  Pass regexp to erc-button-add-buttons.
-
-2003-07-28  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.549 (erc-network-name):
-	Improved docstring.  Removed an unnecessary call to erc-server-buffer.
-
-2003-07-28  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.548: By lawrence:
-	(erc-ignored-user-p): Use anchored regexp.
-	(smiley): Fix missing quote in `remove-hook' call.
-
-2003-07-26  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-nets.el 1.4, erc-nickserv.el 1.12, erc.el 1.547:
-	Changed all references to Openprojects into references to Freenode.
-
-2003-07-25  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.546:
-	Now variable erc-debug-irc-protocol is defvar'ed instead of defcustom'ed.
-	Made the docstring clearer too.
-
-	* erc.el 1.545: Fixed a wrong-type-argument error from window-live-p.
-
-2003-07-15  Damien Elmes  <erc@repose.cx>
-
-	* erc-log.el 1.7 (erc-log-setup-logging):
-	set buffer-file-name to "", as (basic-save-buffer)
-	    will prompt for a buffer name before invoking hooks. the buffer-file-name
-	    will be overridden by (erc-save-buffer-in-logs) anyway - the main danger
-	    of doing this is write-file-contents hooks. Let's see if anyone complains.
-	(erc-save-buffer-in-logs): return t, so that further write hooks are not run
-
-2003-07-09  Damien Elmes  <erc@repose.cx>
-
-	* erc-dcc.el 1.74 (erc-dcc-open-network-stream):
-	-nowait still crashes emacs cvs - disable for now
-
-2003-07-02  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.544 (erc): Minor docstring modification.
-
-2003-07-01  Damien Elmes  <erc@repose.cx>
-
-	* erc-match.el 1.20 (erc-match-current-nick-p):
-	match only on word boundaries
-
-	* erc-log.el 1.6 (erc-log-setup-logging):
-	not sure how this crept in again - make sure we set
-	    buffer-file-name to nil, since otherwise it is not possible to open
-	    previous correspondence in another buffer while a conversation is open
-
-2003-06-28  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.543 (erc-network-name):
-	Now makes some intelligent guesses if the server didn't tell
-	    us the network name.
-
-2003-06-28  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.542 (erc-default-coding-system): Use utf-8 as the default
-	encoding for outgoing stuff and undecided as the default for
-	incoming stuff.
-	(erc-coding-sytem-for-target): New.
-	(erc-encode-string-for-target): Use it.
-	(erc-decode-string-from-target): Use it.  Removed the flet
-	erc-default-target hack and documented the dynamically bound
-	variable `target' instead.
-
-2003-06-25  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.541 (erc-log-irc-protocol):
-	Now we keep point on the bottom line of the window
-	    displaying the *erc-protocol* buffer if it is at the end of the
-	    *erc-protocol* buffer.
-
-	* erc.el 1.540:
-	Added some text to the docstring for variable erc-debug-irc-protocol.
-
-2003-06-23  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-dcc.el 1.73 (erc-dcc-auto-mask-p):
-	Fixed a docstring typo that caused a load-time error.
-
-	* erc-dcc.el 1.72 (erc-dcc-auto-mask-p):
-	Changed reference to undefined variable erc-dcc-auto-mask-list
-	    to erc-dcc-auto-masks.
-	Changed default value of variable erc-dcc-auto-masks to nil and added text to its
-	    docstring.
-
-	* erc-notify.el 1.20 (erc-notify-timer and erc-notify-QUIT):
-	Added network name to notify_off message.
-
-	* erc.el 1.539 (erc-network-name):
-	Now returns the name of the IRC server if the network name
-	    cannot be determined.
-
-	* erc-notify.el 1.19 (erc-notify-JOIN and erc-notify-NICK):
-	Added argument ?m to call to erc-display-message.
-
-	* erc-dcc.el 1.71 (erc-dcc-do-LIST-command):
-	Fixed a bug where I assumed (plist-get elt :type)
-	    returns a string -- it really returns a symbol.
-
-	* erc-notify.el 1.18 (erc-notify-timer):
-	Now we include the network name in the notify_on message.
-
-	* erc.el 1.538:
-	New function: erc-network-name.  Returns the name of the network that the
-	    current buffer is associate with.  Not every server sends the 005 messages
-	    that enable the network name to be known.  If the network name is
-	    not known, the string "UNKNOWN" is returned.
-
-	* erc-dcc.el 1.70 (erc-dcc-chat-setup):
-	Added a comment.  Fixed a bug where a DCC CHAT buffer has no
-	    prompt when it first appears.
-
-	* erc-dcc.el 1.69 (erc-dcc-chat-parse-output):
-	Now a DCC chat buffer displays the nick using
-	    erc-nick-default-face just like in a channel buffer.
-
-2003-06-22  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.537 (erc-display-prompt):
-	Fixed incorrect indentation.  No semantic change.
-
-	* erc.el 1.536 (erc-strip-controls):
-	Minor change to regexp that matches IRC color control
-	    codes.  I was seeing usage as follows: ^C07colored text^C^C04other color.
-	    Now we strip a ^C followed by zero, one, or two digits.  Before this change,
-	    we stripped a ^C followed by one or two digits.
-
-	* erc-dcc.el 1.68 (erc-dcc-do-LIST-command):
-	Improved format of output of /DCC LIST.  Now the
-	    "Size" column for a DCC GET includes the percentage of the file that has
-	    been retrieved.
-	(erc-dcc-do-GET-command): Now it works if erc-dcc-default-directory is set.
-
-2003-06-19  Damien Elmes  <erc@repose.cx>
-
-	* erc-log.el 1.5:
-	* added quickstart information to the comments up the top
-
-2003-06-16  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.535:
-	Default to open-network-stream on MS Windows. (thanks lawrence)
-
-2003-06-11  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.534 (erc-process-input-line):
-	refactor so that wrong-number-of-arguments is
-	    caught when using do-not-parse-args - this lets do-not-parse-args
-	    commands display help messages on incorrect syntax in a uniform manner.
-	    This no longer raises a bad-syntax error - was this a catch-all to stop a
-	    backtrace? Does it belong?
-	(erc-cmd-APPENDTOPIC): the correct way to display help when you want to
-	    accept an abitrary string is to (signal 'wrong-number-of-arguments nil).
-	    This fixes a bug where people could not /at topics with a space in them.
-
-2003-06-09  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.533:
-	Re-add the last few changes which weren't merged for some reason.
-
-	* erc.el 1.532 (erc-cmd-APPENDTOPIC): show help when given no arguments
-
-	Patch from MrBump. Fixes problem with erc-set-topic inserting ^C characters
-	into the topic. Also removes dependency on CL.
-
-2003-06-08  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.531:
-	Added comment to explain (eval-after-load "erc" '(erc-update-modules)).
-
-2003-06-01  Mario Lang  <mlang@delysid.org>
-
-	* erc-pcomplete.el 1.20: Add completion for /unignore
-
-2003-05-31  Alex Schroeder  <alex@gnu.org>
-
-	* erc-compat.el 1.12 (erc-encode-coding-string): The default binding,
-	if encode-coding-string was not available, must be a defun that
-	takes multiple arguments.  Did that.
-
-2003-05-30  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.530:
-	Add handlers for 313 and 330 (by arne@rfc2549.org, thanks)
-
-2003-05-30  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.529:
-	patch from MrBump to make /mode #foo +b work again (erc-cmd-BANLIST only
-	temporarily changes them now)
-
-2003-05-29  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.528 (erc-select):
-	server is now defaulted with erc-compute-server.
-	A few cosmetic fixes.
-	(erc-default-coding-system): Renamed from erc-encoding-default.
-	(erc-encoding-default): Renamed to erc-default-coding-system.
-	(erc-encoding-coding-alist): Documentation updated to cover regexps.
-	(erc-encode-string-for-target): Now considers keys of
-	erc-encoding-coding-alist to be regexps.  Rely on erc-compat
-	wrt. MULE support.
-	(erc-decode-string-from-target): New function.
-	(erc-send-current-line): eq -> char-equal fix.
-	(erc-server-TOPIC): topic is now decoded with
-	erc-decode-string-from-target.
-	(erc-parse-line-from-server): Line from server is no longer decoded
-	here.
-	(erc-server-PRIVMSG-or-NOTICE): Message from a user is decoded here,
-	sspec -> sender-spec for clarity.  Cosmetic if -> when fix.
-	(erc-server-TOPIC): sspec -> sender-spec
-	(erc-server-WALLOPS): Ditto.
-
-	* erc-compat.el 1.11 (erc-decode-coding-string):
-	Now requires coding-system as an argument.
-
-2003-05-15  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.527:
-	erc-part|quit-hook is only run on a part|quit directed to our nick, reflect that in the docstring to avoid confusion
-
-2003-05-01  Andreas Fuchs  <asf@void.at>
-
-	* erc-truncate.el 1.3:
-	* erc-truncate-buffer-to-size: use fboundp. Scheme takes its toll...
-
-2003-05-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-truncate.el 1.2: remove require of erc-log
-	(erc-truncate-buffer-to-size): use erc-save-buffer-in-logs when it's
-	there, else, dont.
-
-2003-04-29  Andreas Fuchs  <asf@void.at>
-
-	* erc-log.el 1.4, erc-truncate.el 1.1, erc.el 1.526: erc.el:
-		* erc-cmd-QUIT: Remove references to code in erc-log.el, to
-		  not force autoloading of erc-log.el
-		* erc-server-PART: ditto.
-		* erc-quit-hook: new hook, run when /quit command is
-		  processed.
-		* erc-cmd-QUIT: use it.
-		* erc-part-hook: new hook, run then PART message is
-		  processed.
-		* erc-cmd-PART: use it.
-		* erc-connect-pre-hook: new hook, run before connection to IRC
-		  server is started.
-		* erc: use it.
-		* erc-max-buffer-size: Move truncation variables and functions
-		  to erc-truncate.el
-		* erc-truncate-buffer-on-save: moved to erc-log.el
-		* erc-initialize-log-marker: new function.
-	erc-log.el:
-		* erc-truncate-buffer-on-save: New defcust here; from erc.el
-		* erc-truncate-buffer-on-save: Put it in group `erc-log'
-		* erc-log-channels-directory: Remove trailing slash from
-		  default value.
-		* Add functions to erc-connect-pre-hook, erc-part-hook and
-		  erc-quit-hook to avoid getting autoloaded.
-
-	erc-truncate.el:
-		* Contains the truncation functions and defcusts from erc.el.
-		* define-erc-module clause added; new erc-truncate-mode.
-
-2003-04-29  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.525 (erc):
-	Check wether erc-save-buffer-in-logs is bound, too
-
-	* erc.el 1.524 (erc):
-	Check wether erc-logging-enabled is bound before using it - not
-	everyone is using erc-log.el!
-
-2003-04-28  Andreas Fuchs  <asf@void.at>
-
-	* erc-log.el 1.3:
-	* while we're at it, remove the (declare (ignore ignore)) statements.
-
-	* erc-log.el 1.2:
-	* add autoload statement for erc-log-mode/etc. Sorry for the delay.
-
-	* erc-log.el 1.1, erc.el 1.523: * erc.el:
-		- move variables and functions to erc-log.el:
-			 defgroup `erc-log'
-	                 defcustom `erc-log-channels-directory'
-			 defcustom `erc-log-insert-log-on-open'
-			 defcustom `erc-generate-log-file-name-function'
-			 defun `erc-save-buffer-in-logs' (autoloads from erc-log.el)
-	 		 defuns `erc-generate-log-file-name-*'
-			 defun `erc-current-logfile'
-			 defun `erc-logging-enabled' (autoloads from erc-log.el)
-		- erc-truncate-buffer-to-size: fix for double-saving bug when
-		  writing out truncated buffer contents. Thanks, lawrence mitchell <wence@gmx.li>!
-		- erc-remove-text-properties-region: Fix case for read-only text.
-		- erc-send-current-line: update insert-marker before calling the hooks.
-		                         also, wrap (erc-display-prompt) so that it doesn't toggle
-					 buffer-modified-p.
-		- erc-interpret-controls: remove /very/ old commented-out function
-		- erc-last-saved-position: make it a marker
-		- erc: use it.
-
-	* erc-log.el: (thanks, lawrence mitchell <wence@gmx.li>!)
-		- Move logging code from erc.el here
-		- define-erc-module log: add; minor mode erc-log-mode is the
-		  same as adding the `erc-save-buffer-in-logs' to
-		  erc-send-post-hook and `erc-insert-post-hook'.
-		- erc-w32-invalid-file-characters: add.
-		- erc-enable-logging: add.
-		- erc-logging-enabled: use it.
-		- erc-logging-enabled: autoload.
-		- erc-save-buffer-in-logs: fix for truncating saved buffer with read-only text.
-		- erc-save-buffer-in-logs: use erc-last-saved-position.
-		- erc-save-buffer-in-logs: fix saving half-written messages on
-		  the prompt when saving the log file. (simply uses
-		  erc-insert-marker as an upper bound for saving).
-
-2003-04-27  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.522:	* erc.el 1.522: erc-modules: added 
-
-2003-04-27  Alex Schroeder  <alex@gnu.org>
-
-	* Makefile 1.15 (UNCOMPILED): Added erc-compat.el.
-	(clean): Remove .elc files, too.
-	Patch by Hynek Schlawack <hynek+erc@hys.in-berlin.de>
-
-2003-04-22  Damien Elmes  <erc@repose.cx>
-
-	* erc-button.el 1.46:
-	erc-button-keymap: set the parent keymap to erc-mode-map
-
-2003-04-20  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.521:
-	erc-official-location: shouldn't the official location be the base URL of erc?
-
-	* erc.el 1.520:
-	erc-modules: updated the docstring to make the semantics clearer
-
-2003-04-19  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.519:
-	Fix problem where % in NOTICE produced errors (from mmc)
-
-2003-04-18  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.518 (erc-toggle-debug-irc-protocol):
-	moved a reference to 'buf' inside the let
-	    statement which defines it. it's difficult to tell what the original
-	    intentions were here - at the moment the debug window is displayed when
-	    toggling either way.
-
-	* README 1.3, erc.el 1.517:
-	(erc-update-modules: added a condition in for erc-nickserv -> erc-services
-
-	* erc-pcomplete.el 1.19:
-	- that change to erc-update-modules making it require the modules first means
-	  we don't need any special case handling here, so i reverted the previous
-	  change
-
-	* erc.el 1.516:
-	- don't require 'erc-auto, since windows users don't have access to make.
-	  instead, we handle it in (erc-update-modules)
-
-2003-04-17  Damien Elmes  <erc@repose.cx>
-
-	* README 1.2, Makefile 1.14:
-	Updated Makefile and documentation to reflect the new release
-
-	* erc.el 1.515:
-	- note the previous change also updated the release number to erc 4.0!
-	(erc-connect): fix a bug introduced by the previous release
-
-	* erc.el 1.514:
-	fixed about 20 instances of (message (format ...)) which will break if the
-	format returns a string with %s in it
-
-	* erc.el 1.513: erc-error-face: make it red, not pink
-
-	* erc-pcomplete.el 1.18:
-	since pcomplete is autoloaded via erc-completion-mode, and completion is in
-	erc-modules by default, we remove completion when pcomplete is added
-
-	* erc.el 1.512 (define-erc-module): no need for delete, use delq
-
-	* erc-members.el 1.5 (erc-nick-channels):
-	(erc-person-channels) takes one arg
-	(erc-format-user): again, they all take an arg
-
-	* erc.el 1.511:
-	- require erc-auto when loading, so the default `erc-modules' can be loaded.
-	  this makes erc-auto no longer a convenience but a necessity - all the name
-	  of user friendliness.
-	(define-erc-module): the enable and disable routines now update erc-modules
-	    accordingly
-	erc-modules: new variable controllig the modules which erc has loaded/will
-	    load. when customising, it will automatically enable modules. it won't
-	    automatically disable modules which are removed, yet.
-	(erc-update-modules): enable all modules in `erc-modules'
-
-	* erc-dcc.el 1.67 (erc-dcc-open-network-stream):
-	use the -nowait equiv if available
-	erc-dcc-server-port: removed
-	erc-dcc-port-range: allows a range of values, so you can have more than one
-	    dcc
-	(erc-dcc-server): support erc-dcc-port-range
-	(erc-dcc-chat): use OCHAT for outgoing chat for now. we need to fix the
-	    issues with allowing more than one chat with the same person
-
-	* erc.el 1.510:
-	erc-log-channels: removed; set the directory to start logging
-	(erc-directory-writeable-p): create directory if it doesn't exist, check if
-	    it's writeable
-	(erc-logging-enabled): don't reference erc-log-channels
-
-2003-04-07  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.509 (erc):
-	but when inserting the contents of a previous logfile, use the logfile
-	    name, not ""!
-
-	* erc.el 1.508 (erc):
-	set buffer-file-name to "", since we have a custom saving function and
-	    it's not needed. this enables one to open a log file with previous
-	    correspondence, while talking to the person at the same time
-
-2003-03-29  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.507 (erc-prepare-mode-line-format):
-	Now strips all text properties from the target before
-	    putting it in the mode line.  Keeps the mode line looking consistent.
-	(erc-channel-p): Improved docstring.
-
-2003-03-28  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.506 (erc-generate-log-file-name-with-date): New function.
-	(erc-generate-log-file-name-function): Make it available.
-
-2003-03-24  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.505:
-	Fix erc-prompt and erc-user-mode custom :type (Closes: #185794)
-
-2003-03-20  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.504:
-	erc-server-hook-list: correct documentation of ordering of (proc parsed)
-
-2003-03-16  Alex Schroeder  <alex@gnu.org>
-
-	* erc-track.el 1.53 (erc-modified-channels-string):
-	Make it a risky-local-variable.
-
-2003-03-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-track.el 1.52 (erc-track-modified-channels):
-	Use (point-min) if we don't find a
-	parsed-property, so it won't error out with nil...
-
-2003-03-16  Damien Elmes  <erc@repose.cx>
-
-	* erc-track.el 1.51 (erc-track-switch-buffer):
-	removed call to erc-modified-channels-update, as
-	    this is done correctly on buffer switching in both emacs and xemacs now
-
-2003-03-15  Damien Elmes  <erc@repose.cx>
-
-	* erc-track.el 1.50 (erc-find-parsed-property):
-	simplified a little, so it shouldn't return nil anymore
-
-	* erc.el 1.503: erc-send-post-hook: document narrowing which occurs
-
-2003-03-14  Alex Schroeder  <alex@gnu.org>
-
-	* erc-track.el 1.49 (erc-find-parsed-property): New function.
-	(erc-track-modified-channels): Use it instead of relying on
-	point-min.
-
-2003-03-12  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.502:
-	Fix erc-set-topic to accept a channel name as first word
-
-2003-03-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-dcc.el 1.66:
-	Small patch (<10 lines, also slightly modified by Jorgen Schäfer) from
-	David Spreen <netzwurm@debian.org> to add hostmask-authentication to
-	DCC auto-accept.
-
-	erc-dcc-auto-mask-list: New variable
-	(erc-dcc-handle-ctcp-send): Check erc-dcc-auto-mask-list
-	(erc-dcc-auto-mask-p): New function
-	erc-dcc-send-request: Docstring now mentions erc-dcc-auto-mask-list
-
-2003-03-10  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-ring.el 1.11 (erc-clear-input-ring):
-	New function.  Erases the contents of the input ring for
-	   the current ERC buffer.
-
-2003-03-08  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.501:
-	(erc-display-line-1) and (erc-send-current-line): Now these functions reset erc-insert-this
-	    to t as soon as possible after consuming the value of that variable.  See the comments in
-	    the code for the strange symptom this fixes.
-	(erc-bol): Changed to call point-at-eol instead of line-end-position.  This increases XEmacs
-	    portability, since XEmacs doesn't have line-end-position.  Patch suggested by Scott Evans
-	    on the ERC mailing list.
-
-2003-03-04  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.500: banlist*: patch from mrbump to avoid using cl packages
-
-2003-03-04  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.499:
-	Changed erc-noncommands-list from a constant to variable, so that users can
-	    add their own erc-cmd-* functions to the list.  Improved the docstring too.
-
-2003-03-02  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.498 (erc-server-353):
-	Now the output of "/NAMES #channel" appears in the currently
-	    active ERC buffer, even if the user is not a member of #channel.
-
-	* erc.el 1.497 (erc-cmd-DEOP):
-	Fixed a syntax error: invalid read syntax ")" caused by my last change.
-
-2003-03-01  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.496 (erc-cmd-DEOP):
-	Fixed a wrong-type-argument error caused by calling split-string
-	    on a list instead of on a string.  Removed the call to split-string entirely,
-	    because it wasn't needed.
-
-	* erc.el 1.495 (erc-cmd-HELP):
-	Changed to use intern-soft instead of intern.  Now "/HELP floob"
-	    doesn't create a void function symbol erc-cmd-FLOOB.
-
-2003-02-25  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.494 (erc-cmd-SERVER):
-	remove erroneous references to line, use server instead
-
-2003-02-23  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.493 (erc-toggle-debug-irc-protocol):
-	Fixed a bug where the global value of
-	    kill-buffer-hook was being modified instead of the buffer-local value.
-
-2003-02-22  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.492 (erc-cmd-KICK):
-	Now supports any number of words in the REASON string.  Examples
-	    of the /KICK command are:
-	      /KICK franl You don't belong here
-	      /KICK franl Bye
-	      /KICK franl
-	      /KICK #channel franl Go away now
-	      /KICK #channel franl Bye
-	      /KICK #channel franl
-
-2003-02-16  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-stamp.el 1.29 (erc-insert-timestamp-right):
-	Make the timestamp rear-nonsticky, so
-	C-e works at the beginning of the next line.
-
-2003-02-16  Andreas Fuchs  <asf@void.at>
-
-	* erc-stamp.el 1.28:
-	* s/choose/choice/ in customize options, as kensanata requested.
-
-2003-02-15  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.491 (erc-toggle-debug-irc-protocol):
-	Now if the *erc-protocol* buffer is killed,
-	    logging is turned off.  Prior to this change, the buffer would come back
-	    into existence (generally unbeknownst to the user) after being killed.
-
-2003-02-11  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.490 (erc-send-current-line):
-	we can't inhibit everything here when not connected,
-	    as the user will expect commands like /server still to work. the
-	    erc-cmd-handler should recover from errors instead
-
-2003-02-10  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.489:
-	* we now run erc-after-connect on 422 (no motd) messages as well as the motd
-	  messages
-	(erc-login): revert the previous change
-
-	* erc.el 1.488 (erc-login): register that we're connected
-
-2003-02-10  Mario Lang  <mlang@delysid.org>
-
-	* erc-members.el 1.4: * Provide erc-members
-	* Fix excessive )
-	* Comment out broken self-tests
-
-2003-02-07  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.487 (erc-connect):
-	notify the user we're trying to connect when using asych
-	    connections
-
-	* erc.el 1.486 (erc-connect): support an asyncronous connection
-	(erc-process-sentinel): ditto
-
-	* erc-track.el 1.48:
-	* advise switch-to-buffer in the case of xemacs, since it doesn't have
-	  window-configuration-change-hook
-
-	* erc.el 1.485 (erc-send-current-line):
-	if not connected, refuse to send either a message or
-	    a command
-
-	* erc.el 1.484: (erc-save-buffer-in-logs):
-	    - check for a sensibile region before saving the buffer. if the
-	      connection process is killed early on, there is not a sensible region
-	      to save
-	    - don't set buffer-file-name on save. we don't need it, and it means we
-	      can now find-file a log while an existing query is open with that
-	      user
-
-	* erc.el 1.483 (erc-process-input-line):
-	when displaying the help for a function, if no
-	    documentation exists, don't fall over
-	(erc-cmd-SAY): new function for quoting lines begining with /
-	(erc-server-NICK):
-	    - fix a bug where the "is now known as" message doesn't appear on newly
-	      created /query buffers
-	    - when a user changes their nick, update the query to point to the new
-	      nick
-
-	* erc.el 1.482 (erc-send-current-command):
-	don't reject multi-line commands. since
-	    multiline-p is used as the no-command arg to erc-process-current-line,
-	    multi-line text is never interpreted as a command. i believe this is the
-	    correct behavior - it allows people to post the output of things like df
-	    (sans header). if you want to change this, please provide a rationale
-	    in the changelog
-
-	* erc.el 1.481 (erc-send-current-line):
-	only match the first line when determining if a
-	    multi-line command is allowed
-
-2003-02-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-bbdb.el 1.21 (erc-bbdb-highlight-record):
-	Use alternate strings, not character
-	classes to split the nick-field.
-
-2003-02-06  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.479 (erc-process-sentinel):
-	Now we set erc-connected to nil every time we disconnect
-	    from a server, not just when an unexpected disconnect happens.
-
-	* erc.el 1.478 (erc-connected):
-	Removed redundant defvar of this variable.  Improved the
-	    docstring.
-	(erc-login): Changed to send a correct RFC2812 USER message (see section
-	    3.1.3 of RFC2812 for the documentation of the semantics of each argument
-	    of the USER message.
-
-2003-02-02  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.477 (erc-cmd-NOTICE): fix from mrbump
-
-2003-01-31  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.476 (erc-cmd-JOIN):
-	Now we only send one JOIN command to the server when a channel
-	    key is provided.
-
-2003-01-30  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.475 (erc-remove-channel-member):
-	Fixed so that it runs erc-channel-members-changed-hook
-	    with the channel buffer current, as is documented in the docstring for variable
-	    erc-channel-members-changed-hook: "The buffer where the change happened is
-	    current while this hook is called."
-
-2003-01-28  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.474:
-	(erc-ignored-user-p),(erc-cmd-IGNORE),(erc-cmd-UNIGNORE): Now nicks are ignored
-	    on a per-server basis.  Now, erc-ignore-list is only valid in server
-	    buffers!  Do not reference it in channel buffers.
-
-	* erc.el 1.473 (erc-cmd-IGNORE):
-	Now says "Ignore list is empty" if it erc-ignore-list is empty
-	    instead of showing an empty list.
-
-2003-01-25  Alex Schroeder  <alex@gnu.org>
-
-	* erc-nickserv.el 1.11 (services): Defined a module
-
-2003-01-25  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.472 (erc-process-ctcp-query):
-	Display recipient of CTCP query if it's not
-	our current nick.
-
-	* erc.el 1.471 (erc-cmd-WHOIS):
-	Accept an optional second argument SERVER.
-
-2003-01-25  Alex Schroeder  <alex@gnu.org>
-
-	* erc-stamp.el 1.27 (stamp): erc-add-timestamp must always be added
-	with the APPEND parameter -- not only when adding it on the right.
-
-2003-01-24  Alex Schroeder  <alex@gnu.org>
-
-	* erc-members.el 1.3 (erc-channel-members-changed-hook): Obsolete, use
-	erc-members-changed-hook instead.  When it is set, add its content
-	to erc-members-changed-hook.
-	(erc-update-channel-member): Obsolete, use erc-update-member
-	instead.  Defalias to that effect.
-	(erc-remove-channel-member): New and already obsolete.  Use
-	erc-remove-nick-from-channel instead.
-	(erc-update-channel-info-buffer): Obsolete, use ignore instead.
-	Yes, these have to go.
-	(erc-channel-member-to-user-spec): Obsolete, use erc-format-user
-	instead.
-	(erc-format-user): New.
-	(erc-ignored-reply-p): New, use it.
-
-	* erc-members.el 1.2:
-	Further along the way.  Any function from erc.el that uses
-	channel-members should end up in this file, rewritten to use
-	erc-members.
-
-	(erc-person): Call erc-downcase before getting
-	something from the hash.
-	(erc-nick-in-channel): Checking wether erc-process must be used is
-	unnecessary -- this will be done in erc-person.
-	(erc-nick-channels): New.
-	(erc-add-nick-to-channel, erc-update-member): Call erc-downcase
-	before putting something into the hash.
-	(erc-buffer-list-with-nick): New.
-	(erc-format-nick, erc-format-@nick): New, backwards incompatible.
-	Must check for other places that call these!
-	(erc-server-PRIVMSG-or-NOTICE): Use the new version.
-
-	* erc-compat.el 1.10 (view-mode-enter): defalias to view-mode, if
-	view-mode-enter is not fboundp and view-mode is -- as is the case
-	in XEmacs.  We need view-mode-enter in erc-match.el.
-
-2003-01-23  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.470 (erc-default-server-handler):
-	Minor performance improvement: allow the lambda
-	    expression to be byte-compiled.
-
-2003-01-23  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.469 (erc-cmd-BANLIST):
-	in the absence of a fill-column, use the screen width
-
-2003-01-22  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.468:
-	patch from MrBump to delay fetching the banlist until /bl is run, so we don't
-	fetch it when joining a channel anymore
-
-	* erc-ring.el 1.10:
-	* instead of adjusting hooks when loaded, provide (erc-ring-mode). you'll
-	  need to run (erc-ring-mode 1) now to get the ring
-	* (erc-previous-command), (erc-next-command):
-	    - check if the ring exists and create it if necessary
-	    - don't do anything if the ring is empty
-
-	* erc-pcomplete.el 1.17:
-	Put "how to use" documentation in the comments up the top
-
-2003-01-21  Alex Schroeder  <alex@gnu.org>
-
-	* erc-autojoin.el 1.4 (erc-autojoin-version): New.
-
-	* erc-autojoin.el 1.3 (erc-autojoin-add): Added body.
-	(erc-autojoin-remove): Added body.
-	(erc-autojoin): Provide it.
-
-2003-01-21  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.467: erc-cmd-*: removed a bunch of references to force
-
-2003-01-21  Alex Schroeder  <alex@gnu.org>
-
-	* erc-autojoin.el 1.2 (erc-autojoin-channels-alist): More doc.
-
-2003-01-20  Alex Schroeder  <alex@gnu.org>
-
-	* erc-autojoin.el 1.1:
-	new, based on resolve's mail, and the stuff on the wiki
-
-	* erc-members.el 1.1: new
-
-2003-01-19  Mario Lang  <mlang@delysid.org>
-
-	* debian/README.Debian 1.6, debian/changelog 1.20, debian/scripts/install 1.11, 
-	  debian/scripts/startup.erc 1.4, Makefile 1.13:
-	Prepare for 20030119 debian package
-
-	* erc-dcc.el 1.65: <rant>
-	* (erc-decimal-to-ip): Since XEmacs decides that return a completely
-	and utterly wrong number from string-to-number if it is larger than
-	the integer boundary, instead of sanely converting the thing to
-	a float, we now (concat dec ".0").
-	</rant>
-
-	* erc.el 1.466:
-	* (erc-log-irc-protocol): Use erc-propertize, not propertize
-
-2003-01-19  Alex Schroeder  <alex@gnu.org>
-
-	* erc-button.el 1.45 (erc-button-add-buttons): Added regexp-quote for
-	the list case, too.
-
-2003-01-19  Damien Elmes  <erc@repose.cx>
-
-	* erc-dcc.el 1.64 (erc-dcc-member): fix for case where a prop is nil
-
-	* erc-dcc.el 1.63 (erc-dcc-member):
-	fix for xemacs's version of plist-member
-
-2003-01-19  Mario Lang  <mlang@delysid.org>
-
-	* erc-notify.el 1.17: Delete empty strings from the ison-list
-
-	* erc-track.el 1.47:
-	* (erc-track-switch-buffer): Call erc-modified-channels-update here.
-
-	* erc-track.el 1.46: * toplevel: require 'erc-match
-
-	* erc-track.el 1.45: * (erc-track-mode): Make autoload interactive
-
-	* erc-button.el 1.44: * (button): Make the autoload interactive
-
-	* erc.el 1.465:
-	* (erc-mode): Comment out the case-table stuff, breaks xemacs
-	* (erc-downcase): Revert.
-
-	* erc-dcc.el 1.62:
-	* (erc-dcc-handle-ctcp-send): Use erc-decimal-to-ip on the ip we get...
-
-	* erc-speak.el 1.25:
-	Eliminate reference to erc-nick-regexp, which no longer exists
-
-2003-01-19  Alex Schroeder  <alex@gnu.org>
-
-	* erc-stamp.el 1.26 (erc-timestamp-right-column): New, default nil.
-	(erc-insert-timestamp-right): Use it, if non-nil.  Verbose
-	doc string.
-
-2003-01-18  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.464 (erc-downcase): Use the old behavior in non-CVS Emacs.
-
-	* erc.el 1.463 (erc-cmd-QUIT): Remove &rest. The correct fix follows.
-	(erc-cmd-GQUIT): Pass "" to erc-cmd-QUIT.
-	(erc-mode): Use the case-table only in CVS Emacs. See comment.
-
-	* erc.el 1.462 (erc-cmd-QUIT): make reason optional.
-
-	* erc.el 1.461 (erc-cmd-GQUIT): Fixed typo.
-
-2003-01-17  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.460:
-	* (erc-current-logfile): call expand-file-name, so that downcase doesn't mess up ~
-
-	* erc.el 1.459: * (erc-mode): Define a proper case-table.
-	* (erc-downcase): just call downcase for now, lets see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway...
-
-	* erc-button.el 1.43: * (erc-button-add-buttons): regex-quote the nick
-
-2003-01-17  Alex Schroeder  <alex@gnu.org>
-
-	* erc-button.el 1.42 (button): erc-channel-members-changed-hook no
-	longer has erc-recompute-nick-regexp.
-	(erc-button-alist): Use channel-members instead of
-	erc-nick-regexp.
-	(erc-button-add-buttons): Split some code into
-	erc-button-add-buttons-1, and now handle strings, lists, and
-	alists.  Regular expressions in lists and alists are enclosed in
-	< and >.
-	(erc-button-add-buttons-1): New.
-	(erc-nick-regexp): Deleted.
-	(erc-recompute-nick-regexp): Deleted.
-
-	* erc-button.el 1.41: Remove require cl again.
-	(erc-mode-map): No longer bind widget-backward and widget-forward.
-	(erc-button-alist): Explain why byte-compiling makes no sense, and
-	remove all calls to byte-compile.
-	(erc-button-keymap): Define it the standard way, without exposing
-	the list nature of the keymap.
-	(erc-button-marker-list): Deleted.
-	(erc-button-add-buttons): Simplify.  In particular, create the
-	button using the real callback, instead of using the intermediate
-	erc-button-push, and only store the data as described for
-	erc-button-alist.
-	(erc-button-remove-old-buttons): Simplify.  No more list munging.
-	Instead, just remove all the properties that we add in
-	erc-button-add-button.
-	(erc-widget-press-button): Deleted.
-	(erc-button-click-button): New, for mouse clicks.  Moves point to
-	where the mouse is, and calls erc-button-push.
-	(erc-button-push): Instead of matching again, just use the
-	erc-callback and erc-data properties at point to do the right
-	thing.
-	(erc-button-entry): Deleted.
-	(erc-button-next): Use error instead of the beep plus message
-	combo.
-
-2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-autoaway.el 1.11 (erc-autoaway-set-back):
-	Don't pass a force argument to erc-cmd-GAWAY.
-
-	* erc.el 1.458 (erc-cmd-AWAY): Removed usage of the force variable.
-
-2003-01-17  Alex Schroeder  <alex@gnu.org>
-
-	* erc-button.el 1.40 (button):
-	erc-recompute-nick-regexp is no longer added to
-	erc-channel-members-changed-hook unconditionally, but only if
-	erc-button-mode is enabled, and if it is disabled, it is removed
-	again.
-	(erc): Require cl for delete-if.
-	(erc-button-remove-old-buttons): Rewrote using delete-if to
-	prevent exceesive consing.  Having the marker list is still ugly,
-	so another solution needs to be found.
-
-2003-01-17  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.457 (erc-banlist-store):
-	Don't assume there's always a setter in the banlist reply.
-
-2003-01-17  Alex Schroeder  <alex@gnu.org>
-
-	* erc-button.el 1.39 (erc-button-url-regexp): Changed regexp according
-	to a suggestion by Max Froumentin <mf@w3.org>.
-
-2003-01-17  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.456:
-	fix erc-remove-channel-member again to not error out on nil as first arg...
-
-	* erc.el 1.455: * (erc-occur): New function
-
-2003-01-17  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.454: erc-banlist-*: return nil so further hooks are called
-
-	* erc.el 1.453 (erc-server-368):
-	supress "end of ban list" messages - use /listbans now
-
-	* erc.el 1.452 (erc-send-current-line):
-	removed the check for leading whitespace again - the
-	    only time we want to prohibit multi-line commands is if / is the first
-	    thing on the line
-	(erc-get-arglist): new defun for reading a function's arglist which should
-	    work with older copies of emacs. we use help-function-arglist if it's
-	    available, though, since that has support for reading subrs, etc
-
-	* erc.el 1.451 (erc-cmd-JOIN): fixed (again)
-
-	* erc.el 1.450: * fixed call to erc-cmd-NICK when connecting
-	* support for listing bans and mass unbanning, again thanks to MrBump
-
-	* erc.el 1.449 (erc-set-topic):
-	patch from MrBump (Mark Triggs, mst@dishvelled.net) to strip
-	    control chars and topic attribution in C-c C-t
-
-2003-01-16  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.448:
-	* (erc-remove-channel-member): Do not use delq, modify the list using setcdr like delq does.
-	In theory, this should be way faster since the list doesnt get traverse two times.
-	Measurement didn't show any real difference though :(, this system is flawed for channels with >300 users it seems...
-	Also moved some defcustoms up.
-
-2003-01-16  Brian P Templeton  <bpt@tunes.org>
-
-	* erc.el 1.447: moved misplaced paren
-
-2003-01-16  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.446 (erc-cmd-UNIGNORE):
-	reference argument directly - no string matching
-
-	* erc.el 1.445 (erc-extract-command-from-line):
-	hmm, thinko in the canonicalisation. should
-	    be fixed
-
-2003-01-16  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.444 (erc-send-current-line):
-	Changed the regexp used to match /COMMANDs so that leading
-	    whitespace is taken into account.
-
-2003-01-16  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.61: * (erc-dcc-do-SEND-command): Fix it
-
-	* erc-ezbounce.el 1.4, erc-lang.el 1.2: Arglist changes...
-
-	* erc.el 1.443: Various docstring fixes and additions.
-
-	* erc-notify.el 1.16:
-	* (erc-cmd-NOTIFY): Change the function arglist to (&rest args)
-
-	* erc-netsplit.el 1.8: * (erc-cmd-WHOLEFT): Has no args...
-
-2003-01-16  Damien Elmes  <erc@repose.cx>
-
-	* erc-fill.el 1.22:
-	erc-fill-column: default to 78, so things like docstrings don't get wrapped
-	    in an ugly manner
-
-2003-01-16  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.442:
-	* (erc-cmd-default): Take a substring, now /mode works again.
-	* (erc-cmd-AWAY): Put do-not-parse-args t
-	* (erc-cmd-GAWAY): Ditto, and fix it.
-	* (erc-cmd-CTCP): Switch to argument system.
-	* (erc-cmd-KICK): Do the same.
-
-2003-01-15  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.60:
-	* (erc-cmd-DCC): Fixed for the new scheme, simplified.
-	* (erc-dcc-do-CHAT-command): Ditto.
-	* (erc-dcc-do-CLOSE-command): Ditto.
-	* (erc-dcc-do-LIST-command): Ditto.
-
-2003-01-15  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.441:
-	erc-error-face: setting a background doesn't work so well with multi-line
-	    messages, so we don't. fg colour is negotiable ;-)
-	(erc-cmd-QUERY): fixed, new doco, supress (erc-delete-query) until we fix it
-	(erc-send-current-line): allow multi-line messages provided they don't start
-	    with a slash - there's no need to prohibit them if the slash isn't the
-	    first character
-
-	* erc.el 1.440: * bad-syntax now reports like incorrect-args
-	* bunch of extra cmds fixed, nick, sv etc.
-
-	* erc.el 1.439 (erc-cmd-HELP): fixed
-	(erc-extract-command-from-line): when deterimining canon-defun, make sure we
-	    have a valid symbol
-	(erc-cmd-KICK): fixed
-
-	* erc.el 1.438:
-	* removed duplicate do-no-parse-args properties for the defaliased defuns
-	(erc-process-input-line): show function signature when incorrect args
-	(erc-extract-command-from-line): canonicalise defaliases before extracting
-	    plist
-	(erc-cmd-CLEAR): fixed
-	(erc-cmd-UNIGNORE): fixed again
-
-	* erc.el 1.437 (erc-cmd-SET): fixed
-	(erc-cmd-UNIGNORE): fixed
-	(erc-process-input-line): report when incorrect arguments are provided to a
-	    command, and show the command's docstring
-
-	* erc.el 1.436 (erc-cmd-APPENDTOPIC): fixed
-	(erc-process-input-line): more informative error message than 'bad syntax'
-
-2003-01-15  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.435: * (erc-cmd-IGNORE): fixed
-
-	* erc.el 1.434: * (erc-cmd-NAMES): fixed
-
-	* erc.el 1.433:
-	* (erc-cmd-CLEARTOPIC): Simplify, fix doc, make interactive
-
-2003-01-15  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.432 (erc-cmd-JOIN):
-	correct invite behavior, and document it.
-
-2003-01-15  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.431: * (erc-cmd-PART): Put 'do-not-parse-args t
-
-2003-01-15  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.430 (erc-cmd-JOIN): new cmd argument syntax
-	(erc-process-input-line): check if (erc-extract-command-from-line) returned a
-	    list, and apply if that's the case
-
-	* erc.el 1.429:
-	erc-cmd-*: remove optional force and references to `force' in the code
-	(erc-cmd-AMSG): call erc-trim-string, not trim-string
-
-2003-01-15  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.428:
-	* (erc-cmd-CLEARTOPIC): LINE is now ARGS and already parsed.
-	Set erc-cmd-TOPIC to 'do-not-parse-args for now.
-	(comment: I think we should have 'first, so that only first word is parsed...
-	 Or we could autodetect erc-channel-p in the parser before that somehow...)
-
-	* erc.el 1.427: * (erc-cmd-OP): LINE is PEOPLE now, and already parsed.
-
-	* erc-notify.el 1.15:
-	* (erc-cmd-NOTIFY): Arg LINE is now ARGS, and already parsed.
-
-2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-stamp.el 1.25 (erc-insert-timestamp-right):
-	Prefer erc-fill-column to window-width,
-	because on wide screens the timestamp could wander off too far to the
-	right.
-
-2003-01-15  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.426: This is the "everything is suddenly broken!" release
-	You know, this is CVS, you can still go back, and wait until the transition
-	is finished, but here is patch one, which basicly breaks every command
-	which is typed on the prompt.
-	Hit me, we can still revert, but something needs to be done about this.
-	* (erc-extract-command-from-line): intern-soft the function here.
-	If the function symbol has a property 'do-not-parse-args, operate as before,
-	otherwise, split the arguments prior to calling the command handler.
-	* (erc-process-input-line): Updated to accomodate the change above.
-	* (erc-send-distinguish-noncommands): Ditto.
-	* (erc-cmd-NAMES): Ditto.
-	* (erc-cmd-ME): Put 'do-not-parse-args property.
-
-	* erc-dcc.el 1.59:nick:	* erc-dcc.el 1.59: * erc-dcc-list: Renamed 
-	* (erc-dcc-member). Treat :nick as either a nick!user@host or nick,
-	do appropriate comparisons, simplified.
-	* (erc-dcc-list-add): New functions
-	various callers of (cons (list ...) erc-dcc-list) updated.
-	Other stuff I'm to bored to document now
-
-2003-01-15  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-stamp.el 1.24 (erc-insert-timestamp-right):
-	Removed redundant code that overrid the
-	window-width. Now substracts (length string) from every found
-	indentation positions.
-
-2003-01-14  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.425:
-	* (erc-cmd-AMSG): Remove useless call to erc-display-message.
-
-	* erc-dcc.el 1.58:
-	* erc-dcc-chat/send-request: New variables, control how to treat
-	incoming dcc chat or send requests. Can be set to 'ask, which behaves
-	like it did before, 'auto, which accepts automatically, and
-	'ignore, which ignores those type of requests completely.
-	* (erc-cmd-CREQ): New user-level command.
-	* (erc-cmd-SREQ): Ditto.
-
-	* erc.el 1.424: * (erc-cmd-AMSG). New command.
-
-	* erc-xdcc.el 1.4: * (erc-xdcc): delete empty strings from ARGS
-
-	* erc-dcc.el 1.57: * erc-dcc-ipv4-regexp: New constant
-	* (erc-ip-to-decimal): Use it.
-	* erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp:	* erc-dcc-host: :type
-	* (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE.
-	* Some docstring/comment fixes.
-
-	* erc-stamp.el 1.23:
-	* (erc-insert-timestamp-right): Subtract (length string) from
-	POS in any case, otherwise, linewrap occurs.
-
-	* erc-dcc.el 1.56:
-	* Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), 
-	  and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it!
-	* Added :start-time plist property/value to GET handling so that we can calculate elapsed-time.
-	* Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...)
-
-2003-01-13  Mario Lang  <mlang@delysid.org>
-
-	* erc-xdcc.el 1.3:
-	* erc-xdcc-help-text: New variable which makes replies to the originator
-	much more flexible.
-	* erc-xdcc-help-format: Removed.
-	* (erc-xdcc-help): Handle the new variable.
-	* (erc-xdcc): Simplified
-
-	* erc-xdcc.el 1.2: * erc-xdcc-handler-alist: New variable.
-	* (erc-xdcc): Move code for list and send sub-commands into
-	* (erc-xdcc-help): New function.
-	* (erc-xdcc-list): New function.
-	* (erc-xdcc-send): New function.
-
-2003-01-12  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.423 (erc-server-JOIN):
-	Oops, send MODE command only when *we* joined a channel.
-
-	* erc.el 1.422:
-	Fixing ERCs behavior wrt IRCnet's !channels have a different name for
-	JOIN than in reality (e.g. you can join !forcertest or !!forcertest
-	and really get to !ABCDEforcertest)
-
-	(erc-cmd-JOIN): Removed erc-send-command MODE.
-	(erc-server-JOIN): Ask for MODE now.
-
-2003-01-12  Damien Elmes  <erc@repose.cx>
-
-	* erc-dcc.el 1.55:
-	(erc-dcc-get-filter), (erc-dcc-get-file): store size as a string, not an
-	    integer. check size > 0 for the case where a size wasn't provided, since
-	    string-to-int will return 0 on an empty string
-
-2003-01-12  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.54: * Use RAWFILE arg with find-file-noselect
-	* Fix alist/plist conversion left-over
-	* Add verbose-info about sending blocks.
-
-2003-01-11  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.53: * (pcomplete-erc-mode/DCC): Fixes
-
-	* erc-xdcc.el 1.1: Initial version.
-
-	* erc-pcomplete.el 1.16:
-	* (erc-pcomplete): Fix so that cycle-completion works again.
-	* (pcomplete-parse-erc-arguments): If there is a space after the last word
-	before point, we need to return a "" arg, and it's position.
-
-	* erc-dcc.el 1.52: Fix to pcomplete/erc-mode/DCC
-
-	* erc-dcc.el 1.51: * (pcomplete/erc-mode/DCC): New function
-
-	* erc-dcc.el 1.50: *** empty log message ***
-
-	* erc-dcc.el 1.49: Move code around, just basic changes
-
-2003-01-11  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-stamp.el 1.22 (erc-insert-timestamp-right):
-	Check wether erc-fill-column is
-	available before using it. Else default to fill-column or if
-	everything else fails, the window width of the current window. For the
-	fill-columns, use them directly as the starting position for the
-	timestamp.
-
-2003-01-11  Andreas Fuchs  <asf@void.at>
-
-	* erc-stamp.el 1.21:
-	erc-insert-timestamp-right: use correct window's window-width. If
-	                  buffer is not in a window, use erc-fill-column.
-
-2003-01-11  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.48:	* erc-dcc.el 1.48: * (erc-dcc-do-LIST-command): Fix 
-
-	* erc-dcc.el 1.47:
-	* buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed
-	  Keep This info in erc-dcc-member :sent and :confirmed plist values
-	* :	* :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer 
-	* erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-conntected, which now prints a msg...
-
-	* erc-dcc.el 1.46:
-	* (erc-dcc-chat-accept): Renamed from erc-dcc-chat. Callers updated.
-	* (erc-dcc-chat): Renamed from erc-dcc-chat-request.
-	Callers updated, and interactive form added.
-	* (erc-dcc-server-accept): No longer do any type-specific stuff.
-	* (erc-dcc-chat-sentinel): Call erc-dcc-chat-setup if event is "open from "
-	from here, otherwise call erc-dcc-chat-close.
-
-	* (
-
-	* erc-dcc.el 1.45: *** empty log message ***
-
-	* erc-dcc.el 1.43: Moved some functions around.
-	Doc string fixes.
-	"/dcc send nick filename" works now
-
-2003-01-11  Alex Schroeder  <alex@gnu.org>
-
-	* erc.el 1.421 (erc-send-command): Fixed flood protect message.
-
-	* erc-button.el 1.38 (erc-button-syntax-table): Make `-' a legal nick
-	constituent.
-
-2003-01-10  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.42: Some more steps toward dcc send.
-
-2003-01-10  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-notify.el 1.14 (erc-notify-timer):
-	Changed to make it IRC-case-insensitive when comparing nicks.
-	(erc-notify-JOIN): Changed to make it IRC-case-insensitive when comparing nicks.
-	(erc-notify-NICK): Changed to make it IRC-case-insensitive when comparing nicks.
-	(erc-notify-QUIT): Changed to make it IRC-case-insensitive when comparing nicks.
-	(erc-cmd-NOTIFY): Now "/notify -l" lists the nicks on your notify list.  Now
-	    when you remove a nick from your notify list, you no longer recieve a spurious
-	    signoff notification for that nick.  Changed to make it IRC-case-insensitive when
-	    comparing nicks.
-
-	* erc.el 1.420 (erc-ison-p):
-	Fixed so it calls erc-member-ignore-case instead of member.
-
-	* erc.el 1.419 (erc-member-ignore-case):
-	New function.  Just like member-ignore-case, but obeys
-	    the IRC protocol case matching rules.
-
-2003-01-10  Damien Elmes  <erc@repose.cx>
-
-	* erc-dcc.el 1.41:
-	(erc-dcc-do-GET-command), (erc-dcc-get-file): use the plist syntax, this
-	    fixes dcc get again
-
-2003-01-10  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.418: erc-complete-functions: New variable.
-	erc-mode-map: Bind \t to 'erc-complete-word
-	erc-complete-word: New function.
-
-	* erc-pcomplete.el 1.15 (erc-pcomplete-mode):
-	Use new erc-complete-functions
-	(erc-pcomplete): Check that we're in the input line, else return nil.
-
-	* erc-button.el 1.37 (erc-button-mode): Use new erc-complete-functions
-	erc-button-old-tab-command: Removed.
-	(erc-button-next-or-old): Removed
-	(erc-button-next): check that we're not in the input line, else just return nil.
-
-2003-01-10  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.40: cleanup
-
-	* erc-dcc.el 1.39:
-	* (erc-dcc-chat-request): No longer use erc-send-ctcp-message.
-
-	* erc-dcc.el 1.38:
-	* (erc-dcc-no-such-nick): Also call delete-process if we have a peer already
-
-	* erc-dcc.el 1.37:
-	* (erc-dcc-no-such-nick): New function, server event handler for event 401.
-	If we send a CTCP message requesting something dcc related, we set up an
-	entry in erc-dcc-list before sending the request (for the server proc object
-	for listening conns for example).  But if that nick does not exist
-	on that server, we now nicely cleanup erc-dcc-list again.
-
-2003-01-09  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.36: Moved code around a bit, and doc fixes
-
-	* erc-dcc.el 1.35: *** empty log message ***
-
-	* erc-dcc.el 1.34: Rename erc-dcc-plist to erc-dcc-list
-
-2003-01-09  Damien Elmes  <erc@repose.cx>
-
-	* erc-dcc.el 1.33 (erc-dcc-server (erc-dcc-chat-setup):
-	use erc's (erc-setup-buffer) to determine how to
-	    display new DCC windows
-	(erc-dcc-chat-buffer-killed): buffer-local hook for DCC buffers to close the
-	    process
-	(erc-dcc-chat-close): code common to a killed buffer or a disconnection from
-	    the other side
-	(erc-dcc-chat-sentinel): use (erc-dcc-chat-close)
-	(erc-dcc-server-accept): use (erc-log) instead of (message)
-
-	* erc.el 1.417:
-	(erc), (erc-setup-buffer): factor out window generation code so DCC can use
-	    it too
-
-	* erc-dcc.el 1.32:
-	(erc-dcc-do-CLOSE-command), (erc-dcc-do-LIST-command): work with erc-dcc-plist
-
-	* erc-dcc.el 1.31:
-	erc-dcc-alist: became erc-dcc-plist, so we can more easily grab particular
-	    properties
-	dcc catalog: unify use of DCC: and [dcc] (either's fine, but let's be
-	    consistent)
-	(erc-dcc-member): takes an arbitrary list of constraints now
-	(erc-dcc-proc-member): removed, as (erc-dcc-member) can be used for this
-	(erc-dcc-do-CHAT-command): use the catalog to show the user what's going on
-	(erc-dcc-chat-server): removed
-	(erc-dcc-server): takes name sentinel and filter arguments, can be used for
-	    both send and chat now
-
-	.. this release means all send/get support is broken until we fix up the
-	things that still expect to be using an alist. this include /dcc list, /dcc
-	close
-
-2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-ring.el 1.9 (erc-previous-command):
-	If you have a partially typed input line and press M-p,
-	    you lose what you typed.  Now we save it so you can come back to it.
-
-2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-ring.el 1.8 (erc-add-to-input-ring): s/nullp/null/
-
-2003-01-09  Damien Elmes  <erc@repose.cx>
-
-	* erc-ring.el 1.7 (erc-add-to-input-ring):
-	set up the ring if it's not already setup
-
-	* erc-dcc.el 1.30 (erc-dcc-member): case insensitive match of nicknames
-	(erc-dcc-do-CHAT-command): echo what we're doing (at least for now)
-
-2003-01-09  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.29: (temporarily) fix erc-process setting...
-
-	* erc-dcc.el 1.28: * (erc-dcc-chat-send-line): Removed
-
-	* erc.el 1.416:
-	Check if target is stringp (we can now also have 'dcc as value...)
-
-	* erc-dcc.el 1.27 (erc-dcc-chat-send-input-line):
-	New function, used for
-	erc-send-input-line-function.
-	Use erc-send-current-line now.
-
-	* erc-dcc.el 1.26: evt to elt...
-
-	* erc-dcc.el 1.25: Remove () from a var (how silly!)
-
-	* erc-dcc.el 1.24: * (erc-dcc-get-host): Use format-network-address.
-	* (erc-dcc-host): Change semantic.  If erc-dcc-host is set, use it.
-	Otherwise, try to figure out the host by calling erc-dcc-get-host.
-	* (erc-dcc-server-port): New variable.
-	* erc-dcc-chat-log: Renamed to erc-dcc-server-accept
-
-	* erc-dcc.el 1.23 (erc-dcc-do-CHAT-command):
-	Change arg of call to erc-dcc-chat-request from elt to nick
-
-2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.415 (erc-send-current-line):
-	Now rejects multi-line commands (i.e., lines that
-	    start with "/" and contain newlines).
-
-2003-01-09  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-button.el 1.36:
-	Functionality to use TAB to jump to the next button:
-
-	(erc-button-next-or-old): New function.
-	(erc-button-next): New function.
-	erc-button-keymap: added erc-button-next
-	erc-button-old-tab-command: New variable.
-	define-erc-module button: Add and remove 'erc-button-next-or-old as
-	appropriate.
-
-2003-01-09  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.414:
-	New variable: erc-auto-reconnect (defaults to t).  If non-nil, ERC will
-	    automatically reconnect to a server after an unexpected disconnection.
-	(erc-process-sentinel): Changed to refer to variable erc-auto-reconnect.
-
-2003-01-08  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.413:
-	* erc-send-input-line-function: New variable, used for dispatch...
-
-2003-01-08  Damien Elmes  <erc@repose.cx>
-
-	* erc-dcc.el 1.22 (erc-dcc-chat-sentinel):
-	check event type before killing process
-	(erc-dcc-chat-log): new, handles the setup of dcc chats for incoming
-	    connections
-	(erc-dcc-chat): use (erc-dcc-chat-setup)
-	(erc-dcc-chat-setup): code common to incoming and outgoing DCC chats
-	(erc-dcc-chat-request): request a DCC chat with another user
-	(erc-dcc-proc-member): locate a member in erc-dcc-alist by process
-
-	The very first ERC to ERC DCC chat was held between delysid and resolve today!
-
-2003-01-08  Mario Lang  <mlang@delysid.org>
-
-	* erc-track.el 1.44 (erc-all-buffer-names):
-	Check for erc-dcc-chat-mode too
-
-2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-ring.el 1.6, erc.el 1.412 (erc-kill-input):
-	Resets erc-input-ring-index to nil, so that invoking this
-	    command conceptually puts you after your most recent input in the input
-	    history.
-	(erc-previous-command and erc-next-command): Changed so that history movement
-	    is more intuitive.  Also preserves the blank input line that marks the
-	    place after the newest command in the history ring (i.e., you'll see a
-	    blank command once every trip around the ring in either direction).
-
-2003-01-08  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.21 (erc-dcc-chat): Add docstring
-	Add self-test.
-	Fix error if /dcc chat nick doesnt find the nick
-
-2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
-
-	* Makefile 1.12:
-	Changed so that "make" works correctly under Cygwin.  Before this change, the
-	pathname passed to Emacs on the command line under Cygwin had the form
-	"/cygwin/c/...", which prevented emacs from finding the file.  Now the pathname
-	has the form "c:/...".  This works for any drive letter.
-
-2003-01-08  Mario Lang  <mlang@delysid.org>
-
-	* erc-button.el 1.35: reindent some code, and add TODO to comments
-
-	* erc-dcc.el 1.20: *** empty log message ***
-
-	* erc-dcc.el 1.19: Make dcc-chat-ended a notice
-	Remove now bogus comment
-
-2003-01-08  Damien Elmes  <erc@repose.cx>
-
-	* erc-dcc.el 1.18 (erc-pack-int): from erc-packed-int
-	(erc-unpack-int): new
-
-	* erc-dcc.el 1.17 (erc-unpack-str): added
-
-2003-01-08  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.411 (erc-server-482):
-	New handler, handles KICK reply if you're not channel-op
-
-	* erc-dcc.el 1.16: Document SEND in erc-dcc-alist.
-	Move sproc, parent-proc and file into erc-dcc-alist
-
-	* erc-dcc.el 1.15: stubs
-
-	* erc-dcc.el 1.14 (erc-dcc-get-host):
-	Change :iface to :local since Kim committed it now to CVS emacs
-
-	* erc-dcc.el 1.13 (erc-dcc-get-host):
-	New function, requires the not-yet-in-CVS-emacs local-address.patch to process.c.
-	Some other minor additions
-
-2003-01-08  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.410 (erc-cmd-IGNORE):
-	Now returns t to prevent "Bad syntax" error.
-	(erc-cmd-UNIGNORE): Now returns t to prevent "Bad syntax" error.
-	(erc-server-PRIVMSG-or-NOTICE): Capitalized first word in message to user.
-
-	* erc.el 1.409 (erc-scroll-to-bottom):
-	Temporarilly bind resize-mini-windows to nil so that
-	    users who have it set to a non-nil value will not suffer from premature
-	    minibuffer shrinkage due to the below recenter call.  I have no idea why
-	    this works, but it solves the problem, and has no negative side effects.
-
-2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc-dcc.el 1.12:
-	erc-dcc-ctcp-query-chat-regexp: The IP is not really an IP, but a
-	number (no . allowed there).
-	(erc-dcc-send-ctcp-string): use let* here to avoid cluttering up the
-	match data.
-	Also, use erc-decimal-to-ip to get the IP.
-	(erc-ip-to-decimal): Removed some pasted ERC timestamps
-	(erc-decimal-to-ip): New function.
-	erc-dcc-chat-mode-map: Return map in the initialization.
-
-2003-01-07  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc-match.el 1.19 (erc-match-fool-p):
-	Changed to call erc-match-directed-at-fool-p instead of
-	     erc-directed-at-fool-p.
-
-2003-01-07  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.11 (erc-cmd-DCC):
-	Change (cond ... (t nil)) to (when ...)
-
-	* erc-dcc.el 1.10: Use erc-current-nick-p
-
-2003-01-07  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.408:
-	erc-join-buffer: Added 'window-noselect to docstring and :type.
-	erc-auto-query: Added 'window-noselect to :type.
-	(erc): Treat erc-join-buffer being 'window-noselect appropriately.
-
-	* erc.el 1.407 (erc-current-nick-p): New function.
-	(erc-nick-equal-p): New function.
-	(erc-already-logged-in), (erc-server-JOIN), (erc-auto-query),
-	(erc-server-PRIVMSG-or-NOTICE): Use erc-current-nick-p.
-	(erc-update-channel-member): Use erc-nick-equal-p.
-
-	* erc-match.el 1.18 (erc-match-current-nick-p):
-	Renamed from erc-current-nick-p
-	(erc-match-pal-p): Renamed from erc-pal-p
-	(erc-match-fool-p): Renamed from erc-fool-p
-	(erc-match-keyword-p): Renamed from erc-keyword-p
-	(erc-match-dangerous-host-p): Renamed from erc-dangerous-host-p
-	(erc-match-directed-at-fool-p): Renamed from erc-directed-at-fool-p
-	(erc-match-message): Use erc-match-TYPE-p instead of erc-TYPE-p
-
-	* erc.el 1.406:
-	Support for IRCnets' "nick/channel temporarily unavailable"
-
-	(erc-nickname-in-use): New function (mostly copied from erc-server-433).
-	(erc-server-433): Use erc-nickname-in-use
-	(erc-server-437): New function.
-	erc-server-hook-list: Added (437 erc-server-437).
-
-2003-01-07  Mario Lang  <mlang@delysid.org>
-
-	* erc-fill.el 1.21: Add autoload cookie
-
-	* erc-notify.el 1.13:
-	Now also pass SERVER argument to signon/off hooks, and provide a erc-notify-signon/off function for echo-area printing
-
-	* erc-notify.el 1.12 (erc-notiy-QUIT):
-	Change use of delq to delete, delq does not work with strings
-
-2003-01-06  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.405 (erc-ctcp-query-VERSION):
-	v%s -> %s, so we are no longer vVersion...
-
-2003-01-06  Mario Lang  <mlang@delysid.org>
-
-	* erc.el 1.404: Small change to erc-ison-p, and fixme tag
-
-2003-01-06  Francis Litterio  <franl@users.sourceforge.net>
-
-	* erc.el 1.403 (erc):
-	Fixed bug where variable "away" would be nil in new channel buffers
-	       even if the user is away when joining the channel.
-	(erc-strip-controls): Fixed a bug where erc-strip-controls accidentally
-	       removed all text properties from the string.
-
-2003-01-06  Mario Lang  <mlang@delysid.org>
-
-	* erc-dcc.el 1.9:
-	Some stub functions, some code, nothing really works yet
-
-	* erc.el 1.402 (erc-ison-p): New function
-
-	* erc-dcc.el 1.8: Some functions which will be needed for dcc send
-
-	* erc-dcc.el 1.7 (erc-ip-address-to-decimal):
-	New function, thanks lawrence
-
-	* erc-dcc.el 1.6: Again, simplify code, fix stuff, DCC CHAT works now
-
-	* erc-dcc.el 1.5: Many fixes, chat nearly works now
-
-	* erc-netsplit.el 1.7: Also detect fast netsplit/joins
-
-	* erc-dcc.el 1.4: some more fixes
-
-	* erc-dcc.el 1.3: Fixup stage 1, now dcc get works
-
-	* erc-dcc.el 1.2: make /dcc LIST work
-
-	* erc-dcc.el 1.1:
-	Initial checkin, dont use it!  its really far from complete.  Hackers: help!
-
-	* erc-notify.el 1.11:
-	New function erc-notify-NICK, and added signon/off hooks which were missing
-
-2003-01-05  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el 1.401 (erc-truncate-buffer-to-size):
-	set inhibit-read-only to t for the
-	deletion. This is usually done by the function calling the hook, but
-	not if it's called interactively. Also, rewrote some weird if/if
-	combination.
-
-	* erc-track.el 1.43 (erc-track-shortennames):
-	Documentation fix (erc-all-buffers is really
-	erc-all-buffer-names)
-
-	These changes make server buffers be tracked as well, as there are
-	quite a few interesting things going on there (e.g. CTCP etc.)
-	(erc-all-buffer-names): Check for (eq major-mode 'erc-mode) instead of
-	erc-default-recipients.
-	(erc-track-modified-channels): Don't require a default target (e.g.,
-	this-channel being non-nil)
-
-2003-01-03  Damien Elmes  <erc@repose.cx>
-
-	* erc.el 1.400:
-	erc-auto-query: can now be set to a symbol to control how new messages should
-	    be popped up (or not popped up, as the case may be)
-	(erc-query): new function which handles the bulk of what (erc-cmd-QUERY) did
-	    previously
-	(erc-cmd-QUERY): use (erc-query)
-	(erc-auto-query): use (erc-query)
-
-	* erc.el 1.399 (erc-current-logfile):
-	Downcase result of log generation function, as IRC is
-	case insensitive. Fixes problems where "/query user" results in a different
-	log file to a query from "User". Avoided adding an extra flag to control this
-	behavior - if you think this was the wrong decision, please correct it and
-	I'll remember it for next time.
-
-See ChangeLog.2002 for earlier changes.
-
-    Copyright (C) 2003 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.
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
-;; arch-tag: 808865e1-3cce-4c5b-9997-95a8b7a9d384
--- a/lisp/erc/ChangeLog.2004	Mon Feb 06 18:44:57 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2080 +0,0 @@
-2004-12-29  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-goodies.el (erc-interpret-controls-p): Changed docstring to
-	reflect the new meaning if this is set to 'remove.
-	(erc-controls-interpret): Rephrased docstring to be more accurate.
-	(erc-controls-strip): New function that behaves like the
-	recently-removed erc-strip-controls -- it removes all IRC color
-	and highlighting control characters.
-	(erc-controls-highlight): Changed to support the new 'remove value
-	that variable erc-interpret-controls-p might have.
-
-2004-12-28  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-ibuffer.el, erc-list.el, erc-page.el, erc-speedbar.el:
-	Changed all calls to erc-interpret-controls (which no longer
-	exists) to call erc-controls-interpret (the new name of the same
-	function).
-
-2004-12-28  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-goodies.el (erc-controls-interpret): Added this function to
-	replace the recently-removed erc-interpret-controls.  Also added
-	a (require 'erc) to solve a byte-compile problem.
-
-2004-12-28  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-controls-interpret): Added this function to replace
-	the recently-removed erc-interpret-controls.
-
-2004-12-27  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-truncate.el (erc-truncate-buffer-to-size): Check for
-	logging even better (via lawrence).
-
-2004-12-26  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-truncate.el (erc-truncate-buffer-to-size): Much saner
-	logging detection (via lawrence).
-
-2004-12-25  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-goodies.el (erc-controls-highlight): Treat single C-c
-	correctly.
-
-2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-goodies.el, erc.el: Deleted IRC control character processing
-	and implemented a sane version in erc-goodies.el as a module.
-
-	* erc.el (erc-merge-controls, erc-interpret-controls,
-	erc-decode-controls, erc-strip-controls, erc-make-property-list,
-	erc-prepend-properties): Removed.
-
-	(erc-interpret-controls-p, erc-interpret-mirc-color, erc-bold-face
-	erc-inverse-face, erc-underline-face, fg:erc-color-face0,
-	fg:erc-color-face1, fg:erc-color-face2, fg:erc-color-face3,
-	fg:erc-color-face4, fg:erc-color-face5, fg:erc-color-face6,
-	fg:erc-color-face7, fg:erc-color-face8, fg:erc-color-face9,
-	fg:erc-color-face10, fg:erc-color-face11, fg:erc-color-face2,
-	fg:erc-color-face13, fg:erc-color-face14, fg:erc-color-face15,
-	bg:erc-color-face1, bg:erc-color-face2, bg:erc-color-face3,
-	bg:erc-color-face4, bg:erc-color-face5, bg:erc-color-face6,
-	bg:erc-color-face7, bg:erc-color-face8, bg:erc-color-face9,
-	bg:erc-color-face10, bg:erc-color-face11, bg:erc-color-face2,
-	bg:erc-color-face13, bg:erc-color-face14, bg:erc-color-face15,
-	erc-get-bg-color-face, erc-get-fg-color-face,
-	erc-toggle-interpret-controls): Moved.
-
-	* erc-goodies.el (erc-beep-p, irccontrols, erc-controls-highlight,
-	erc-controls-propertize): New.
-
-2004-12-24  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit.
-	 Moved some functions from erc.el to erc-goodies.el, and
-	transformed them to erc modules in the process.
-	- imenu autoload stuff moved. I don't know why it is here at all.
-	- Moved: scroll-to-bottom, make-read-only, distinguish-noncommands,
-	smiley,   unmorse, erc-occur (the last isn't a module, but still
-	moved)
-	(erc-input-line-position, erc-add-scroll-to-bottom,
-	erc-scroll-to-bottom, erc-make-read-only, erc-noncommands-list,
-	erc-send-distinguish-noncommands, erc-smiley, erc-unmorse,
-	erc-occur): Moved from erc.el to erc-goodies.el.
-	(smiley): Module moved from erc.el to erc-goodies.el.
-	(scrolltobottom, readonly, noncommands, unmorse): New modules.
-
-2004-12-20  Diane Murray <disumu@x3y2z1.net>
-
-	* erc.el: (erc-format-away-status): Use `a', not `away' - that's
-	why it's there.
-	(erc-update-mode-line-buffer): The values of `mode-line-process'
-	and `mode-line-buffer-identification' are normally lists.
-	Conform.
-
-2004-12-18  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: (erc-process-ctcp-query, erc-process-ctcp-reply): Display
-	message in the active window, not the server window.
-
-2004-12-16  Edward O'Connor <ted@oconnor.cx>
-
-	* erc-track.el (erc-track-position-in-mode-line): Check for
-	'erc-track-mode variable with boundp. From Adrian Aichner
-	<adrian@xemacs.org>.
-
-2004-12-16  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-upcase-first-word): New function. The old way used
-	in erc-send-ctcp-message would eat consecutive whitespace etc.
-	(erc-send-ctcp-message, erc-send-ctcp-notice): Use it.
-
-2004-12-15  Edward O'Connor <ted@oconnor.cx>
-
-	* erc.el (erc-send-ctcp-message): Fix braino with my previous
-	patch. It always helps to C-x C-s before `cvs commit'.
-
-2004-12-15  Edward O'Connor <ted@oconnor.cx>
-
-	* erc.el (erc-send-ctcp-message): Only upcase the ctcp command,
-	and not the entire message. Revision 1.707 had broken /me.
-	Shouting is bad! :)
-
-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 <disumu@x3y2z1.net>
-
-	* erc-backend.el: (def-edebug-spec): Only run this if 'edebug is
-	available.
-
-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
-	following changes fix the bug and simplify the mode-line handling
-	considerably.  (erc-mode-line-format): Now defined as a string
-	which will be formatted using `format-spec' and take the place of
-	`mode-line-buffer-identification' in the mode line.
-	(erc-header-line-format): Now defined as a string to be formatted
-	using `format-spec'.
-	(erc-prepare-mode-line-format): Removed.
-	(erc-format-target, erc-format-target-and/or-server,
-	erc-format-away-status, erc-format-channel-modes): New functions.
-	Basically the old `erc-prepare-mode-line-format' split apart.
-	(erc-update-mode-line-buffer): Set
-	`mode-line-buffer-identification' to the formatted
-	`erc-mode-line-format', set `mode-line-process' to ": CLOSED" if
-	the connection has been terminated, and set `header-line-format'
-	(if it is bound) to the formatted `erc-header-line-format', then
-	do a `force-mode-line-update'.
-
-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 <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,
-	erc-truncate.el: (erc-buffers, erc-coding-systems, erc-display,
-	erc-mode-line-and-header, erc-ignore, erc-query,
-	erc-quit-and-part, erc-paranoia, erc-scripts, erc-old-complete,
-	erc-list, erc-networks, erc-nicklist, erc-pcomplete, erc-replace,
-	erc-truncate): New customization groups.  (erc-join-buffer,
-	erc-frame-alist, erc-frame-dedicated-flag, erc-reuse-buffers): Use
-	'erc-buffers as `:group'.  (erc-default-coding-system,
-	erc-encoding-coding-alist): Use 'erc-coding-systems as `:group'.
-	(erc-hide-prompt, erc-show-my-nick, erc-prompt,
-	erc-input-line-position, erc-command-indicator, erc-notice-prefix,
-	erc-notice-highlight-type, erc-interpret-controls-p,
-	erc-interpret-mirc-color, erc-minibuffer-notice,
-	erc-format-nick-function): Use 'erc-display as `:group'.
-	(erc-mode-line-format, erc-header-line-format,
-	erc-header-line-uses-help-echo-p, erc-common-server-suffixes,
-	erc-mode-line-away-status-format): Use 'erc-mode-line-and-header
-	as `:group'.
-	(erc-hide-list, erc-ignore-list, erc-ignore-reply-list,
-	erc-minibuffer-ignored): Use 'erc-ignore as `:group'.
-	(erc-auto-query, erc-query-on-unjoined-chan-privmsg,
-	erc-format-query-as-channel-p): Use 'erc-query as `:group'.
-	(erc-kill-buffer-on-part, erc-kill-queries-on-quit,
-	erc-kill-server-buffer-on-quit, erc-quit-reason-various-alist,
-	erc-part-reason-various-alist, erc-quit-reason, erc-part-reason):
-	Use 'erc-quit-and-part as `:group'.
-	(erc-verbose-server-ping, erc-paranoid, erc-disable-ctcp-replies,
-	erc-anonymous-login, erc-show-channel-key-p): Use 'erc-paranoia as
-	`:group'.
-	(erc-startup-file-list, erc-script-path, erc-script-echo): Use
-	'erc-scripts as `:group'.
-	(erc-nick-completion, erc-nick-completion-ignore-case,
-	erc-nick-completion-postfix): Use 'erc-old-complete as `:group'.
-	(erc-chanlist-progress-message, erc-no-list-networks,
-	erc-chanlist-frame-parameters, erc-chanlist-hide-modeline,
-	erc-chanlist-mode-hook): Use 'erc-list as `:group'.
-	(erc-server-alist, erc-networks-alist): Use 'erc-networks as
-	`:group'.
-	(erc-settings): Use `defvar' instead of `defcustom' since this is
-	only a draft which doesn't work.
-	(erc-nicklist-window-size): Use 'erc-nicklist as `:group'.
-	(erc-pcomplete-nick-postfix,
-	erc-pcomplete-order-nickname-completions): Use 'erc-pcomplete as
-	`:group'.
-	(erc-replace-alist): Use 'erc-replace as `:group'.
-	(erc-speak-filter-timestamp): Use 'erc-speak as `:group'.
-	(erc-max-buffer-size): Use 'erc-truncate as `:group'.
-
-2004-12-12  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-scroll-to-bottom): Go to the end of the buffer
-	before recentering. This allows editing multiple lines more
-	conveniently in CVS Emacs. This also undos a change by antifuchs
-	who said this goto-char would mess up redisplay. Extensive testing
-	couldn't reproduce that problem.
-
-2004-12-12  Brian Palmer <bpalmer@gmail.com>
-
-	* erc.el (erc-send-ctcp-message): upcase the ctcp message (so that
-	version becomes VERSION, for example).
-	(erc-iswitchb): Make the argument optional in non-interactive
-	invocation, so erc-iswitchb can be substituted directly for
-	iswitchb in code.
-
-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 <disumu@x3y2z1.net>
-
-	* erc-track.el (erc-track-position-in-mode-line): New customizable
-	variable.  (erc-track-remove-from-mode-line): New function.
-	Remove `erc-modified-channels-string' from the mode-line.
-	(erc-track-add-to-mode-line): New function.  Add
-	`erc-modified-channels-string' to the mode-line using the value of
-	`erc-track-position-in-mode-line' to determine whether to add it
-	to the beginning or the end of `mode-line-modes' (only available
-	with GNU Emacs versions above 21.3) or to the end of
-	`global-mode-string'.
-	(erc-track-mode, erc-track-when-inactive-mode): Use the new
-	functions.
-
-2004-12-11  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: (erc-cmd-BANLIST): Use (buffer-name) and not
-	(erc-default-target) for the buffer name - buffer names are case
-	sensitive.
-
-2004-12-11  Brian Palmer <bpalmer@gmail.com>
-
-	* erc.el (erc-message-type): Added the message "MODE" to the known
-	erc-message-type widget, so that (for example) people can tell
-	erc-track-exclude-types to ignore mode changes. The others tag
-	also needed to be made an inline list, so that it's merged with
-	the given constants, instead of being inserted as a list.
-
-2004-12-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-track.el, erc.el: Update to get ERC look nicely in CVS Emacs.
-
-	* erc.el (erc-mode-line-format): When on CVS emacs, use the new
-	format.
-
-	* erc-track.el (track module): When on CVS emacs, modify
-	mode-line-modes instead of global-mode-string. The latter is way
-	to far too the right.
-
-2004-11-18  Mario Lang <mlang@delysid.org>
-
-	* Makefile, debian/changelog: debian release 20041118-1
-
-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
-	usage.
-
-2004-10-29  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* AUTHORS: Added self.
-
-2004-10-17  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-list.el: Added local variables for this file.
-	(erc-list-version): New.
-	(erc-cmd-LIST): Take &rest rather than &optional arguments, as was
-	done in revision 1.21.  Allow for input when called interactively.
-	(erc-prettify-channel-list, erc-chanlist-toggle-sort-state): Use
-	`unless' instead of when not.
-
-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
-	the server buffer if it's the first MOTD sent upon connection.
-	This is to avoid the problem of having the MOTD of one server
-	showing up in another server's buffer if it took a while to get
-	connected.
-	(004): Fixed to show the user modes and channel modes correctly.
-	(303): Now displays the nicknames returned by ISON instead of the
-	user's nickname.
-	(367, 368): Moved up into 300's section of the code.  Added
-	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 <disumu@x3y2z1.net>
-
-	* erc.el (erc-process-sentinel): Use CPROC instead of
-	`erc-process' in debug message.  Should fix a bug where an error
-	saying "Buffer *scratch* has no process" would occur when
-	disconnected.
-	(erc-cmd-SV): Check for X toolkit after checking for more specific
-	features.  (erc--kill-server): Set `quitting' to non-nil so that
-	we don't automatically reconnect.
-
-2004-10-05  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: (erc-ignored-user-p): Don't require regexes to match the
-	beginning.
-
-2004-09-11  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: group erc: Moved to 'applications (patch by bojohan)
-
-2004-09-08  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-button.el: (erc-button-remove-old-buttons): Remove 'keymap
-	not 'local-map.
-
-2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-backend.el: JOIN response handler: Typo fix of the last
-	commit.
-
-2004-09-03  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-backend.el: JOIN response handler: Run `erc-join-hook'
-	without arguments as specified in the docstring.
-
-2004-08-27  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-send-current-line): Removed unused variable SENTP.
-
-2004-08-19  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: ERC-SEND-COMPLETED-HOOK used to be run when the prompt
-	was already displayed. We restore this behavior (thanks to bojohan
-	and TerryP for noticing). We also fix the docstring of
-	ERC-SEND-COMPLETED-HOOK, since the hook is (and used to be) called
-	even if nothing was sent to the server.
-	(erc-send-completed-hook): Fixed docstring.
-	(erc-send-current-line): Add incantation for
-	erc-send-completed-hook.
-	(erc-send-input): Remove incantation for erc-send-completed-hook.
-
-2004-08-18  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-backend.el: response-handler 368: Use s368, not s367.
-
-2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-scroll-to-bottom): Don't scroll when we're not
-	connected anymore.
-
-2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-backend.el, erc.el: Handle /mode #emacs b output without
-	errors and such. First, handle unknown format specs gracefully
-	(that is, give a useful error). Then, provide handlers for the
-	banlist replies.
-
-	* erc-backend.el: New handler for 367 and 368. Removed from default
-	handler.
-
-	* erc.el: Provide english catalog for s367 and s368.
-	(erc-format-message): Give an error message when we don't find an
-	entry.
-
-2004-08-17  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-fill.el: erc-fill-variable could be confused about really
-	long nicks. We put an upper limit on the length of the fill prefix.
-	(erc-fill-variable): Adjust fill-prefix.
-	erc-fill-variable-maximum-indentation: New variable.
-
-2004-08-17  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-send-input): Fixed a bug where this function
-	referenced variable "input" instead of variable "str".
-
-2004-08-16  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-list.el (erc-chanlist-highlight-line): Fixed a bug where
-	this function failed to set the correct face for highlighting the
-	current line.
-
-2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-fill.el (erc-fill-variable): Don't fuck up when the
-	looking-at didn't work.
-
-2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-send-single-line): Call the hooks to change the
-	appearance for something only if we actually inserted something,
-	doh.
-	(erc-display-command): Display the prompt outside of the area that
-	set the text properties on.
-
-2004-08-14  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: Refactored erc-send-current-line. This should fix some
-	dormant bugs, and make the whole thing actually readable. Yay.
-	Some changes in behavior were made. Whitespace at the end of lines
-	sent is not removed anymore, but that shouldn't bother anyone.
-	Additionally, errors in commands or hooks shouldn't prevent the
-	prompt from showing up again now.
-	(erc-parse-current-line): Removed.
-	(erc-send-current-line): Refactored.
-	(erc-send-input): New function.
-	(erc-send-single-line): New function.
-	(erc-display-command): New function.
-	(erc-display-msg): New function.
-	(erc-user-input): New function.
-
-2004-08-13  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-cmd-SERVER): Use newer keyword call interface to
-	erc-select, and handle the error if it can't resolve the host.
-
-2004-08-11  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-backend.el, erc.el: erc-backend.el (404 response handler):
-	New function. We now support "cannot send to channel".
-
-	* erc.el (erc-define-catalog call): Added s404. erc.el
-	(erc-ctcp-ECHO-reply, erc-ctcp-CLIENTINFO-reply,
-	erc-ctcp-FINGER-reply, erc-ctcp-PING-reply, erc-ctcp-TIME-reply,
-	erc-ctcp-VERSION-reply): Display reply in the active window, not
-	the server window.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-with-all-buffers-of-server): Actually make it left
-	to right, doh.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-with-all-buffers-of-server): Evaluate left-to-right
-	so we don't surprise a user.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-process-input-line): Parentophobia! Another
-	paren-fix.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-backend.el: PRIVMSG NOTICE response handler: Killed one paren
-	too much. Poor paren. Got resurrected.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-track.el: Make server buffers showing up in the mode line
-	optional. Thanks to Daniel Knapp on the EmacsWiki for this patch.
-
-	erc-track-exclude-server-buffer: New variable.
-	(erc-track-modified-channels): Return a server buffer only if
-	erc-track-exclude-server-buffer is nil.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: (erc-cmd-DESCRIBE): Don't parse arguments.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-truncate.el: (erc-truncate-buffer-to-size): Use
-	erc-insert-marker, not (point-max), to decide the length of the
-	buffer. A long input line shouldn't make the buffer smaller.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-macs.el, erc-members.el: The change to hashes for channel
-	members has been made some time ago.  Clean up the various tries to
-	do this in the past.
-
-	erc-macs.el: Removed.  erc-members.el: Removed.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-backend.el, erc-ibuffer.el, erc-members.el, erc.el: Nothing
-	big changed here. Really. Uhm, maybe the info-buffers are gone or
-	so.  Can't really remember. Don't worry, nothing important is
-	missing.
-
-	erc-speedbar.el looks nice btw, did you know?
-
-	Adjusted various places in erc.el, erc-backend.el, erc-ibuffer.el
-	and erc-members.el - too numerous to list here, sorry.
-
-	* erc.el: erc-use-info-buffers: Removed.  erc-info-mode-map:
-	Removed.
-	(erc-info-mode): Removed.
-	(erc-find-channel-info-buffer): Removed.
-	(erc-update-channel-info-buffer): Removed.
-	(erc-update-channel-info-buffers): Removed.
-
-	* erc-members.el: erc-update-member renamed to
-	erc-update-channel-member for better clarity.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: This change improves the help output on a bogus command
-	invocation. We display the command as it would be typed by the
-	user, not as it is seen by Emacs.
-
-	(erc-get-arglist): Is now called erc-function-arglist, and returns
-	now an arglist without the enclosing parens.
-	(erc-command-name): New function.
-	(erc-process-input-line): Pass the command name, not the function
-	name.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: (erc-process-input-line): Fix bug when the command
-	doesn't have an arglist or no documentation. Thanks bojohan again
-	:)
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-match.el: (erc-add-entry-to-list),
-	(erc-remove-entry-from-list): Update docstring, a TEST argument is
-	not given.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-with-buffer): Really fix this docstring.
-
-2004-08-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-with-buffer): Fix double evaluation in macro, and
-	fix docstring.
-
-2004-08-10  Brian Palmer <bpalmer@gmail.com>
-
-	* erc.el (erc-cmd-JOIN): Use erc-member-ignore-case instead of
-	member-ignore-case.
-
-2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-backend.el: Define an "Edebug specification" for the
-	`define-erc-response-handler' macro. This means that one can step
-	through response handlers defined by this macro with edebug. Maybe
-	more macros would benefit from this?
-
-2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-pcomplete.el (pcomplete/erc-mode/CTCP): New function.
-	Completion for the /CTCP command.  (erc-pcomplete-ctcp-commands):
-	New variable. List of ctcp commands.
-
-2004-08-09  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-list.el: Clean up docstrings.
-	(erc-prettify-channel-list): Extend properties to cover the entire
-	line, including the newline, to make it look
-	better.
-	(erc-chanlist-highlight-line): Ditto.
-	(erc-chanlist-mode-hook): Make it a defcustom.
-
-2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-compute-full-name): Typo fix, should be full-name,
-	not name.
-
-2004-08-09  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc): Setup the buffer to be shown in a window at the
-	end of this function. This enables 'window-noselect to work
-	properly.
-	(erc, erc-send-current-line): Fix some
-	goto-char/open-line/goto-char to goto-char/insert.
-
-2004-08-08  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-parse-user): Live with bogus info from bouncers.
-
-2004-07-31  Brian Palmer <bpalmer@gmail.com>
-
-	* erc.el (erc-select): Change the docstring to reflect the new
-	arguments; include the arguments in the docstring for non-cvs
-	emacs. Change the parameters to call erc-compute-* instead of
-	using the erc-* variables directly.
-	(erc-compute-server): Made argument optional.
-	(erc-compute-nick): ditto.
-	(erc-compute-full-name): ditto.  (erc-compute-port): ditto.
-
-2004-07-30  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el: (erc-cmd-BANLIST): Fixed a bug where channel-banlist was
-	not reset to nil before fetching an updated banlist from the
-	server.
-
-2004-07-30  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el: (erc-cmd-BANLIST): Fixed a bug where the
-	'received-from-server property on variable channel-banlist was not
-	being reset to nil.  This fixes the symptom where one types
-	/BANLIST and sees "No bans for channel: #whatever" when you know
-	there are bans.
-
-2004-07-23  Brian Palmer <bpalmer@gmail.com>
-
-	* erc.el: (erc-select-read-args): Use erc-compute-nick to
-	calculate the default nickname
-
-2004-07-20  Brian Palmer <bpalmer@gmail.com>
-
-	* erc.el: (erc-process-sentinel-1): New function. This is an
-	auxiliary function refactored out of erc-process-sentinel to
-	decide a server buffer's fate (whether it should be killed, and
-	whether erc should attempt to auto-reconnect).  Michael Olson
-	<mwolson@gnu.org> helped with this.
-	(erc-kill-server-buffer-on-quit): New variable. Used in
-	erc-process-sentinel-1 to decide whether to kill a server buffer
-	when the user quit normally.
-	(erc-process-sentinel): Auxiliary function erc-process-sentinel-1
-	split out.  The function body has `with-current-buffer' wrapped
-	around it, to ensure separation of messages if multiple
-	connections were being made.  Use `if' instead of `cond' in places
-	where the decision is binary.  The last (useless, since the server
-	connection is closed) prompt in the server buffer is removed.
-	Color "erc terminated" and "erc finished" messages with
-	erc-error-face.  Mark the buffer unmodified so that, if not killed
-	automatically, the user is not prompted to save it.
-
-2004-07-16  Brian Palmer <bpalmer@gmail.com>
-
-	* erc.el (erc-select-read-args): New function. Prompts the user
-	for arguments to pass to erc-select and erc-select-ssl.
-	(erc-select): Use (erc-select-read-args) when called interactively
-	to get its arguments.  When non-interactively, use keyword
-	arguments.
-	(erc-select-ssl): Ditto.
-	(erc-compute-port): New function. Parallel to erc-compute-server,
-	but comes up with a default value for an IRC server's port.
-
-2004-07-16  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-match.el (erc-match-message): Quote the current nickname.
-
-2004-07-12  Brian Palmer <bpalmer@gmail.com>
-
-	* erc-list.el (erc-chanlist-mode): Remove explicit invocation of
-	erc-chanlist-mode-hook, since it's automatically invoked by
-	define-derived-mode
-
-2004-07-03  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-match.el (erc-match-current-nick-p): Quote current nick for
-	regexp parsing.
-
-2004-06-27  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-nickserv.el (erc-nickserv-identify-mode): Fix erroneous
-	parentheses in call to `completing-read'.
-
-2004-06-23  Alex Schroeder <alex@gnu.org>
-
-	* Makefile (release): Depend on autoloads, and copy erc-auto.el
-	into the tarball.
-
-2004-06-14  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-log-irc-protocol): Fixed minor bug where each line
-	received from a server was logged as two lines (one with text and
-	one blank).
-
-2004-06-08  Brian Palmer <bpalmer@gmail.com>
-
-	* erc-list.el (erc-chanlist-frame-parameters): Made customizable.
-	(erc-chanlist-header-face): Changed to use defface with some
-	reasonable defaults instead of make-face, and removed the
-	associated -face variable.
-	(erc-chanlist-odd-line-face): Ditto.
-	(erc-chanlist-even-line-face): Ditto.
-	(erc-chanlist-highlight-face): New variable. Holds a face used for
-	highlighting the current line.
-	(erc-cmd-LIST): Use erc-member-ignore-case instead of
-	member-ignore-case.
-	(erc-chanlist-post-command-hook): Change to move the highlight
-	overlay instead of refontifying the entire buffer.
-	(erc-chanlist-dehighlight-line): Added to detach the highlight
-	overlay from the buffer.
-
-2004-05-31  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: erc-mode-line-format: Add column numbers.
-
-2004-05-31  Adrian Aichner <adrian@xemacs.org>
-
-	* erc-autojoin.el: Typo fix.
-
-	* erc-dcc.el (erc-dcc-do-GET-command): Use expand-file-name.
-	(erc-dcc-get-file): XEmacs set-buffer-multibyte compatibility.
-
-	* erc-log.el: Append `erc-log-setup-logging' to
-	`erc-connect-pre-hook' so that `erc-initialize-log-marker' is run
-	first (markers are needed by `erc-log-setup-logging').
-	(erc-enable-logging): Docstring fix.
-	(erc-log-setup-logging): Move `erc-log-insert-log-on-open' to (1-
-	(point-max)) when doing `erc-log-insert-log-on-open'.  Modified
-	version of a patch by Lawrence Mitchell.
-	(erc-log-all-but-server-buffers): Do `save-excursion' as well.
-	(erc-current-logfile): Pass buffer name as target
-	argument to `erc-generate-log-file-name-function' if
-	`erc-default-target' is nil.
-	(erc-generate-log-file-name-with-date): Use expand-file-name.
-	(erc-generate-log-file-name-short): Ditto.
-	(erc-save-buffer-in-logs): Do `save-excursion' and test whether
-	erc-last-saved-position is a marker.
-
-	* erc-members.el: Avoid miscompiling macro `erc-log' and
-	`with-erc-channel-buffer' by requiring 'erc at compile time.
-
-	* erc-sound.el: Use expand-file-name.
-
-	* erc.el (erc-debug-log-file): Ditto.
-	(erc-find-file): Ditto.
-
-2004-05-26  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el, erc-backend.el (erc-cmd-BANLIST): Added a missing "'"
-	that was preventing /BANLIST from working.  In erc-backend.el,
-	added server repsonse handler for 367 and 368 reponses to get
-	/BANLIST working.
-
-2004-05-26  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el: Removed an eval-when-compile that was preventing the
-	byte-compiled version of this file from loading.
-
-2004-05-26  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el: Undid part of my last change.  I suspect it was wrong.
-
-2004-05-26  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el: Silenced several byte-compiler warnings.
-
-2004-05-26  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-log-irc-protocol): Fixed problem where this function
-	misformatted IRC protocol text if multiple lines were received from
-	the server at one time.
-
-2004-05-25  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-toggle-debug-irc-protocol): Cosmetic changes to the
-	informational text in the *erc-protocol* buffer.
-
-2004-05-24  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-log-irc-protocol, erc-process-filter): Now the lines
-	inserted in the *erc-protocol* buffer are prefixed with the name
-	of the network to/from which the data is going/coming.  This makes
-	reading the *erc-protocol* buffer much easier when connected to
-	multiple networks.
-
-2004-05-23  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
-
-	* erc-backend.el: Fixes server message parsing so that command
-	arguments specified after the colon are not treated specially. All
-	arguments are added to the `command-args' field, and the
-	`contents' points to the last element in the `command-args' list.
-	This allows ERC to connect to networks such as Undernet.  Although
-	keeping `contents' allows many of the response handlers to
-	continue to work as-is, many other are probably broken by this
-	patch.
-
-2004-05-20  Lawrence Mitchell <wence@gmx.li>
-
-	* 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 <disumu@x3y2z1.net>
-
-	* erc-speedbar.el: Ignore errors when attempting to require dframe
-	(there are a couple implementations of speedbar, one of which uses
-	of dframe).
-	(erc-speedbar-version): New.
-	(erc-speedbar-goto-buffer): Use dframe functions if dframe is
-	available.
-
-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'.
-
-2004-05-17  Mario Lang <mlang@delysid.org>
-
-	* erc-log.el: Dont autoload a define-key statement, erc-mode-map
-	might not be known yet
-
-2004-05-16  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-backend.el (erc-parse-server-response): Revert to original
-	`erc-parse-line-from-server' version, since new version breaks for
-	a number of edge cases.
-
-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
-	unknown responses to the user.
-	(221): Don't show nickname in modes list.
-	(254): Fixed to use 's254.
-	(303): Added docstring.
-	(315, 318, 323, 369): Ignored responses grouped together.
-	(391): New.
-	(406, 432): Use ?n, not ?c in `erc-display-message'.
-	(431, 445, 446, 451, 462, 463, 464, 465, 481, 483, 485, 491, 501,
-	502): All error responsess with no arguments grouped together.
-
-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.
-	(erc-cmd-TIME): Fixed to work with and without server given as
-	argument.
-	(erc-define-catalog): Added, s391, s431, s445, s446, s451, s462,
-	s463, s464, s465, s483, s484, s485, s491, s501, s502.
-
-2004-05-14  Lawrence Mitchell <wence@gmx.li>
-
-	* HACKING: Typo fix.
-
-2004-05-14  Lawrence Mitchell <wence@gmx.li>
-
-	* Makefile (erc-auto.el): Pass -f flag to rm so that we don't fail
-	if erc-auto.elc doesn't exist.
-
-2004-05-14  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-backend.el (erc-with-buffer): Autoload.
-	(erc-parse-server-response): XEmacs' `replace-match' only replaces
-	subexpressions when operating on buffers, not strings, work around
-	it.
-	(461): Command with invalid arguments is `second', not `third'.
-
-2004-05-14  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-notify.el (erc-notify-NICK): Use `erc-response.contents' to
-	get nickname.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-track.el: Indentation fixes.
-	(track-when-inactive): Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-notify.el (notify): Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-	(erc-notify-timer, erc-notify-JOIN, erc-notify-NICK)
-	(erc-notify-QUIT): Use new accessors for PARSED argument.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-nickserv.el (services, erc-nickserv-identify-mode): Use
-	`erc-server-FOO-functions', not `erc-server-FOO-hook.
-	(erc-nickserv-identify-autodetect): Use new accessors for PARSED
-	argument.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-netsplit.el (netsplit): Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-	(erc-netsplit-JOIN, erc-netsplit-MODE, erc-netsplit-QUIT): Use new
-	accessors for PARSED argument.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-nets.el: Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-menu.el (erc-menu-definition): Only allow listing of
-	channels if `erc-cmd-LIST' is fboundp.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-match.el: Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-	(erc-get-parsed-vector-nick, erc-get-parsed-vector-type): Use new
-	accessors for PARSED argument.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-list.el (erc-chanlist, erc-chanlist-322): Use new accessors
-	for PARSED argument.  Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-ezbounce.el (erc-ezb-notice-autodetect): Use new accessors
-	for PARSED argument.
-	(erc-ezb-initialize): Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-dcc.el: Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-	(erc-dcc-no-such-nick): Use new accessors for PARSED argument.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-bbdb.el (erc-bbdb-whois, erc-bbdb-JOIN, erc-bbdb-NICK): Use
-	new accessors for PARSED argument.
-	(BBDB): Use `erc-server-FOO-functions', not `erc-server-FOO-hook.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-autojoin.el (autojoin): Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-	(erc-autojoin-add, erc-autojoin-remove): Use new accessors for
-	PARSED argument.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-autoaway.el (autoaway): Use `erc-server-FOO-functions', not
-	`erc-server-FOO-hook.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-backend): Require.
-	(erc-disconnected-hook, erc-join-hook, erc-quit-hook)
-	(erc-part-hook, erc-kick-hook): Docstring fix, we now use
-	`erc-server-FOO-functions', rather than `erc-server-FOO-hook'.
-	(erc-event-to-hook-name, erc-event-to-hook): Remove.
-	(erc-once-with-server-event)
-	(erc-once-with-server-event-global): Use `erc-get-hook'
-	(erc-process-filter): Use `erc-parse-server-response'.
-	(erc-cmd-IDLE, erc-cmd-BANLIST, erc-cmd-MASSUNBAN): New accessors
-	for PARSED argument.  Rename all `erc-server-FOO-hook' to
-	`erc-server-FOO-functions'.
-	(erc-server-364-hook, erc-server-365-hook, erc-server-367-hook)
-	(erc-server-368-hook, erc-server-KILL-hook)
-	(erc-server-PONG-hook, erc-server-200-hook, erc-server-201-hook)
-	(erc-server-202-hook, erc-server-203-hook, erc-server-204-hook)
-	(erc-server-205-hook, erc-server-206-hook, erc-server-208-hook)
-	(erc-server-209-hook, erc-server-211-hook, erc-server-212-hook)
-	(erc-server-213-hook, erc-server-214-hook, erc-server-215-hook)
-	(erc-server-216-hook, erc-server-217-hook, erc-server-218-hook)
-	(erc-server-219-hook, erc-server-241-hook, erc-server-242-hook)
-	(erc-server-243-hook, erc-server-244-hook, erc-server-249-hook)
-	(erc-server-261-hook, erc-server-262-hook, erc-server-302-hook)
-	(erc-server-323-hook, erc-server-342-hook, erc-server-351-hook)
-	(erc-server-381-hook, erc-server-382-hook, erc-server-391-hook)
-	(erc-server-392-hook, erc-server-393-hook, erc-server-394-hook)
-	(erc-server-395-hook, erc-server-402-hook, erc-server-404-hook)
-	(erc-server-407-hook, erc-server-409-hook, erc-server-411-hook)
-	(erc-server-413-hook, erc-server-414-hook, erc-server-415-hook)
-	(erc-server-422-hook, erc-server-423-hook, erc-server-424-hook)
-	(erc-server-431-hook, erc-server-436-hook, erc-server-437-hook)
-	(erc-server-441-hook, erc-server-443-hook, erc-server-444-hook)
-	(erc-server-445-hook, erc-server-446-hook, erc-server-451-hook)
-	(erc-server-462-hook, erc-server-463-hook, erc-server-464-hook)
-	(erc-server-465-hook, erc-server-467-hook, erc-server-471-hook)
-	(erc-server-472-hook, erc-server-473-hook, erc-server-483-hook)
-	(erc-server-491-hook, erc-server-502-hook): Remove.
-	(erc-call-hooks, erc-parse-line-from-server): Remove
-	(erc-server-hook-list): Remove.  Remove top-level call too.
-	(erc-server-ERROR, erc-server-INVITE, erc-server-JOIN)
-	(erc-server-KICK, erc-server-MODE, erc-server-NICK)
-	(erc-server-PART, erc-server-PING, erc-server-PONG)
-	(erc-server-PRIVMSG-or-NOTICE, erc-server-QUIT)
-	(erc-server-TOPIC, erc-server-WALLOPS, erc-server-001)
-	(erc-server-004, erc-server-005, erc-server-221, erc-server-252)
-	(erc-server-253, erc-server-254, erc-server-301, erc-server-303)
-	(erc-server-305, erc-server-306, erc-server-311-or-314)
-	(erc-server-312, erc-server-313, erc-server-317, erc-server-319)
-	(erc-server-320, erc-server-321, erc-server-322, erc-server-324)
-	(erc-server-329, erc-server-330, erc-server-331, erc-server-332)
-	(erc-server-333, erc-server-341, erc-server-352, erc-server-353)
-	(erc-server-366, erc-server-MOTD, erc-server-379)
-	(erc-server-401, erc-server-403, erc-server-405, erc-server-406)
-	(erc-server-412, erc-server-421, erc-server-432, erc-server-433)
-	(erc-server-437, erc-server-442, erc-server-461, erc-server-474)
-	(erc-server-475, erc-server-477, erc-server-481, erc-server-482)
-	(erc-server-501): Move to erc-backend.el
-	(erc-auto-query, erc-banlist-store, erc-banlist-finished)
-	(erc-banlist-update, erc-connection-established)
-	(erc-process-ctcp-query, erc-display-server-message): Use new
-	accessors for PARSED argument.
-
-2004-05-13  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-backend.el: (erc-parse-server-response)
-	(erc-handle-parsed-server-response, erc-get-hook)
-	(define-erc-response-handler): New functions.
-	(erc-response): New struct for server responses.
-	(erc-server-responses): New variable.
-	(erc-call-hooks): Move from erc.el and rework.
-	(ERROR, INVITE, JOIN, KICK, MODE, NICK, PART, PING, PONG)
-	(PRIVMSG, NOTICE, QUIT, TOPIC, WALLOPS, 001, MOTD, 376, 004)
-	(252, 253, 254, 250, 301, 303, 305, 306, 311, 312, 313, 315)
-	(317, 318, 319, 320, 321, 322, 324, 329, 330, 331, 332, 333)
-	(341, 352, 353, 366, 369, 379, 401, 403, 405, 406, 412, 421)
-	(432, 433, 437, 442, 461, 474, 477, 481, 482, 501, 323, 221)
-	(002, 003, 371, 372, 374, 375, 422, 251, 255, 256, 257, 258)
-	(259, 265, 266, 377, 378, 314, 475, 364, 365, 367, 368, 381)
-	(382, 391, 392, 393, 394, 395, 200, 201, 202, 203, 204, 205)
-	(206, 208, 209, 211, 212, 213, 214, 215, 216, 217, 218, 219)
-	(241, 242, 243, 244, 249, 261, 262, 302, 342, 351, 402, 404)
-	(407, 409, 411, 413, 414, 415, 423, 424, 431, 436, 441, 443)
-	(444, 445, 446, 451, 462, 463, 464, 465, 467, 471, 472, 473)
-	(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 <disumu@x3y2z1.net>
-
-	* erc.el: A few bug fixes to avoid errors after disconnect,
-	including the "Selecting deleted buffer" bug.
-	(erc-channel-user-op-p, erc-channel-user-voice-p): Make sure NICK
-	is non-nil (`erc-current-nick' can return nil).
-	(erc-server-buffer): Make sure the buffer isn't a #<killed
-	buffer>.
-	(erc-server-buffer-live-p): New function.
-	(erc-display-line, erc-join-channel, erc-prepare-mode-line-format,
-	erc-away-p): Use `erc-server-buffer-live-p' to make sure process
-	buffer exists.
-	(erc-send-current-line): If there is no server buffer, let the
-	user know.
-
-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-log-version): New.
-	(erc-cmd-JOIN): Fix applied for bug where /join -invite causes
-	errors when there's no `invitation'.
-
-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 <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 <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-fill.el, erc-ibuffer.el, erc-imenu.el, erc-lang.el,
-	erc-list.el, erc-log.el, erc-macs.el, erc-match.el, erc-members.el,
-	erc-menu.el, erc-nets.el, erc-netsplit.el, erc-nickserv.el,
-	erc-notify.el, erc-page.el, erc-ring.el, erc-speak.el,
-	erc-speedbar.el, erc-stamp.el, erc-track.el, erc-truncate.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 <disumu@x3y2z1.net>
-
-	* erc-menu.el: Updated copyright years.
-
-2004-05-09  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-update-channel-info-buffer): Correct bug in sorting
-	of channel users.  Tiny change from Andreas Schwab
-	<schwab@suse.de>.
-
-2004-05-09  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-fill.el (erc-fill-variable): Fix docstring.
-
-2004-05-09  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-button.el (erc-button-add-button): Use 'keymap
-	text-property, rather than 'local-map, since it's cross-emacs
-	compatible.  Pass :mouse-down-action into `widget-convert-button'
-	as 'erc-button-click-button, to make XEmacs happy.  Replace bogus
-	reference to erc-widget-press-button with erc-button-press-button.
-	(erc-button-click-button): New (ignored) first argument, to make
-	XEmacs behave when pressing buttons.
-	(erc-button-press-button): New (ignored) &rest argument.
-
-2004-05-09  Adrian Aichner <adrian@xemacs.org>
-
-	* erc-log.el (erc-conditional-save-buffer): Fix docstring
-	reference to erc-save-queries-on-quit.
-	(erc-conditional-save-queries): Ditto.
-
-2004-05-06  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-speedbar.el: Updated copyright years.  Added local variables
-	for this file; fixed indenting.
-	(erc-speedbar): New group.
-	(erc-speedbar-sort-users-type): New variable.
-	(erc-speedbar-buttons): Handle query buffers (fixes a bug where an
-	error would be thrown if the current buffer was a query).  Ignore
-	unknown buffers.
-	(erc-speedbar-expand-channel): Show limit and key with channel
-	modes. Sort users according to `erc-speedbar-sort-users-type'.
-	(erc-speedbar-insert-user): Fixed bug where only nicks with more
-	info were being listed, and those were shown twice.
-	(erc-speedbar-goto-buffer): Don't use dframe functions, as dframe
-	isn't available with the default speedbar.
-
-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-server-412-hook, erc-server-432-hook, erc-server-475-hook):
-	Use them.
-	(erc-server-401, erc-server-403, erc-server-405)
-	(erc-server-421, erc-server-474, erc-server-481): Use catalog
-	messages.
-	(erc-define-catalog): Added s401, s403, s405, s412, s421, s432,
-	s474, s475, and s481.
-
-2004-05-06  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-nickserv.el: Added documentation to Commentary, Usage.
-	Removed `outline-mode' from file local variables.
-	(erc-services-mode): Use `erc-nickserv-identify-mode' to add
-	hooks.
-	(erc-nickserv-identify-mode): New function.
-	(erc-nickserv-identify-mode): New variable.
-	(erc-prompt-for-nickserv-password, erc-nickserv-passwords):
-	Changed docstring.
-	(erc-nickserv-identify-autodetect): Use
-	`erc-nickserv-call-identify-function'. Docstring change.
-	(erc-nickserv-identify-on-connect,
-	erc-nickserv-identify-on-nick-change,
-	erc-nickserv-call-identify-function): New functions.
-	(erc-nickserv-identify): PASSWORD is not optional.  Autoload
-	function.
-
-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-nick-changed-functions): New hook.
-	(erc-server-NICK): Run `erc-nick-changed-functions' with the
-	arguments NEW-NICK and OLD-NICK.
-	(erc-channel-user-voice-p, erc-channel-user-voice-p): Shortened
-	docstring.
-
-2004-05-05  Lawrence Mitchell <wence@gmx.li>
-
-	* HACKING: New section on function/variable naming and coding
-	conventions.
-
-2004-05-05  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-wash-quit-reason): Quote regexp special characters
-	in NICK, LOGIN and HOST.
-
-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
-	and nil.  (erc-mode-map): Bind `erc-get-channel-mode-from-keypress'
-	to C-c C-o instead of C-c RET (C-c C-m).  (erc-cmd-GQUIT): Use
-	REASON as argument when calling `erc-cmd-QUIT'.
-
-2004-05-03  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-nicklist.el: Initial version.
-
-2004-04-28  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-menu.el: Added local variables for file, fixed indenting.
-	(erc-menu-version): New variable.
-	(erc-menu-definition): "List channels": New.  "Join channel": Use
-	`erc-connected' as test.  "Start a query": New.  "List channel
-	operators": New.  "Input action": Moved up.  "Set topic": Fixed
-	test so it's only active in channels.  "Leave this channel": Moved
-	down.  "Track hidden channel buffers": Removed.  "Enable/Disable
-	ERC Modules": New.
-
-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 <disumu@x3y2z1.net>
-
-	* erc-log.el: Added local variables for this file.
-	(erc-log-channels-directory): Added directory as a choice in
-	`:type'.
-	(define-erc-module): Define and undefine key binding (C-c
-	C-l) for `erc-save-buffer-in-logs' here.
-
-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 <disumu@x3y2z1.net>
-
-	* erc-match.el: Added local variables for file.  (erc-keywords):
-	Use `list' instead of `cons' in `:type'.  Fixes bug where mismatch
-	was shown in customization.  (erc-current-nick-highlight-type):
-	Escape parentheses in docstring.  Added keyword, nick-or-keyword as
-	options in `:type'.
-
-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 <disumu@x3y2z1.net>
-
-	* erc.el (erc-modules): Added bbdb, log, match, sound, and stamp
-	as `:type' options; changed documentation for autojoin, fill,
-	pcomplete, track.  (erc-prompt-for-channel-key): New variable.
-	(erc-join-channel): Only prompt for key if
-	`erc-prompt-for-channel-key' is non-nil.  (erc-format-my-nick): New
-	function.  (erc-send-message, erc-send-current-line): Use it.
-
-2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-track.el: (erc-track-modified-channels): Fix indentation.
-
-2004-04-24  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-match.el: (erc-hide-fools): Docstring fix.
-	(erc-log-matches-types-alist): Added `current-nick' to valid
-	choices.
-
-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.
-	(erc-match, erc-track): `erc' is parent group.
-	(erc-ezb-regexp, erc-ezb-login-alist): Added `:group'.
-
-2004-04-20  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-fill.el: Fixed erc-fill-static so it breaks the lines at the
-	right column and respects timestamps. Patch by Simon Siegler
-	<simon@trz-kril.de>
-	(erc-fill-static): Major rewrite and split up into some functions.
-	(erc-count-lines): Removed.
-	(erc-fill-regarding-timestamp): New function.
-	(erc-timestamp-offset): New function.
-	(erc-restore-text-properties): New function.
-	(erc-fill-variable): Respect leftbound timestamp.  This is still
-	broken if someone has both erc-timestamp-only-if-changed-flag set
-	and erc-insert-timestamp-function set to
-	'erc-insert-timestamp-left, but otherwise it works now.
-
-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
-	shown).
-
-2004-04-19  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el: (erc-update-channel-topic); Error if `channel-topic' is
-	unbound.  Remove %-sign substitution.
-	(erc-update-mode-line-buffer): Escape %-signs in `channel-topic'
-	here.
-
-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'
-	propertize the message.
-	(erc-display-message-highlight): Allow for any erc-TYPE-face.
-	(erc-cmd-JOIN): Display error message instead of throwing an error
-	if there's no `invitation'.
-	(erc-cmd-PART): Allow for no reason if channel is provided.  Fixes
-	bug where user would part the current channel with the other
-	channel's name as reason when no reason was given.
-	(erc-server-vectors, erc-debug-missing-hooks): Added docstring.
-	(erc-server-JOIN): Moved `erc-join-hook' to JOIN-you section.
-	`erc-join-hook' called by `run-hook-with-args', sending the ARGS
-	`chnl' and the channel's buffer.  Changed an instance of if
-	without else to when.
-	(erc-server-477): New function.
-	(erc-server-477-hook): Use `erc-server-477'.
-	(erc-define-catalog): Added `no-invitation'.
-
-2004-04-14  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-nickserv.el: Local variables for file added.
-	(erc-nickserv-passwords): Customization: Network symbols updated
-	to reflect `erc-nickserv-alist'.  Allow user to type in network
-	symbol.
-	(erc-nickserv-alist): Now customizable variable.
-
-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 <disumu@x3y2z1.net>
-
-	* erc-autoaway.el (erc-autoaway-version): New variable.
-	(erc-auto-discard-away): Updated docstring.
-	(erc-autoaway-no-auto-back-regexp): New variable.
-	(erc-autoaway-reset-idletime): Use it.	Hopefully a better solution
-	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 <disumu@x3y2z1.net>
-
-	* erc-autoaway.el (erc-autoaway-reset-idletime): Forgot /gaway in
-	regexp.
-
-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
-	where ERC would send "/away" when user was already away and sent an
-	"/away reason".  Changed `l' to `line' for better understanding.
-	(erc-autoaway-set-back): Changed `l' to `line' for better
-	understanding.
-
-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 <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
-	changes during split.
-	(erc-show-channel-key-p): New variable.
-	(erc-prepare-mode-line-format): Only show key if
-	`erc-show-channel-key-p' is non-nil.
-
-2004-04-04  Diane Murray <disumu@x3y2z1.net>
-
- 	* erc.el (channel-key): New variable.
-	(erc-update-channel-key): New function.
-	(erc-set-modes, erc-parse-modes, erc-update-modes, erc,
-	erc-update-channel-info-buffer): Deal with channel keys.
-	(erc-prepare-mode-line-format): Show channel key in header-line.
-	(erc-server-NICK): Show nick change in server buffer as well.
-	(erc, erc-send-command, erc-banlist-store, erc-banlist-update,
-	erc-load-irc-script-lines,
-	erc-arrange-session-in-multiple-windows, erc-handle-login,
-	erc-find-channel-info-buffer): Changed when not to unless.
-	(erc-server-MODE): Changed if without else to when.
-
-2004-03-27  Adrian Aichner <adrian@xemacs.org>
-
-	* erc.el: (erc-cmd-BANLIST): Use `truncate-string-to-width'
-	instead of `truncate-string' alias.
-	(erc-nickname-in-use): Ditto.
-
-2004-03-27  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-list.el (erc-cmd-list): Fixed error caused by erc-cmd-LIST
-	passing a non-sequence to erc-chanlist.
-
-2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
-
-	* erc.el: Add new hook `erc-join-hook', which is run when we join a
-	channel.
-
-2004-03-22  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
-
-	* erc.el: Replaced existing notice user notification system and
-	the configuration options, which consisted of
-	`erc-echo-notices-in-minibuffer-flag' and
-	`erc-echo-notices-in-current-buffer' with two new hooks,
-	`erc-echo-notice-hook' and `erc-echo-notice-always-hook'.
-
-	When user notification is needed, `erc-echo-notice-always-hook' is
-	first run using `run-hook-with-args', then `erc-echo-notice-hook'
-	is run using `run-hook-with-args-until-success'.
-
-	In addition to these hooks, a large number of functions, which are
-	described in the documentation strings of those hooks, were added
-	which can be used to achieve a large variety of different
-	behaviors.
-
-	The current default behavior, which is identical to the existing
-	default behavior, is for `erc-echo-notice-always-hook' to be set to
-	`(erc-echo-notice-in-default-buffer).
-
-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 <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'
-	is nil, messages in the query buffer are formatted like private
-	messages.
-
-	(erc-server-252-hook, erc-server-253-hook, erc-server-254-hook,
-	erc-server-256-hook, erc-server-257-hook, erc-server-258-hook,
-	erc-server-259-hook, erc-server-371-hook, erc-server-372-hook,
-	erc-server-374-hook, erc-server-374-hook, erc-server-442-hook,
-	erc-server-477-hook): Removed, now defined in
-	`erc-server-hook-list'.
-	(erc-display-server-message): New function.
-	(erc-server-252, erc-server-253, erc-server-254, erc-server-442):
-	New functions.
-	(erc-server-hook-list): Added 250, 256, 257, 258, 259, 265, 266,
-	377, 378, 477 - using `erc-display-server-message'.  251, 255 now
-	use `erc-display-server-message'.  Added 252, 253, 254, 442 -
-	using respective erc-server-* functions.  371, 372, 374, 375 now
-	defined here.
-	(erc-define-catalog): Added s252, s253, s254, s442.
-	(erc-server-001, erc-server-004, erc-server-005): Fixed
-	documentation.
-
-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 <disumu@x3y2z1.net>
-
-	* erc.el (erc-send-action): Use `erc-input-face'.
-	(erc-display-message-highlight): If the requested highlighting
-	type doesn't match, just display the string with no highlighting
-	and warn about it with `erc-log'.. (erc-cmd-JOIN): If user is
-	already on the requested channel, switch to that channel's buffer.
-	(erc-ctcp-query-ACTION): Use `erc-action-face' for nick as well.
-	(erc-header-line-use-help-echo-p): New variable.
-	(erc-update-mode-line-buffer): Use `help-echo' for header-line if
-	`erc-header-line-use-help-echo-p' is non-nil.
-
-2004-03-18  Adrian Aichner <adrian@xemacs.org>
-
-	* erc-nets.el: Use two arguments version of `make-obsolete', if
-	third argument is not supported (for XEmacs).
-
-2004-03-18  Andreas Fuchs <asf@void.at>
-
-	* CREDITS: added CREDITS entry for Adrian Aichner
-
-2004-03-18  Andreas Fuchs <asf@void.at>
-
-	* erc-xdcc.el, erc.el, erc-autoaway.el, erc-autojoin.el,
-	erc-button.el, erc-dcc.el, erc-ezbounce.el, erc-imenu.el,
-	erc-list.el, erc-log.el, erc-match.el, erc-members.el,
-	erc-menu.el, erc-netsplit.el, erc-notify.el, erc-speedbar.el,
-	erc-stamp.el, erc-track.el, erc-truncate.el:
-	(erc-coding-sytem-for-target): Removed.
-	(erc-coding-system-for-target): New.
-	(erc-autoaway-use-emacs-idle): Typo fix.
-	(erc-auto-set-away): Ditto.
-	(erc-auto-discard-away): Ditto.
-	(autojoin): Ditto.
-	(erc-button-alist): Ditto.
-	(erc-dcc-auto-masks): Ditto.
-	(erc-dcc-chat-send-input-line): Ditto.
-	(erc-ezb-get-login): Ditto.
-	(erc-unfill-notice): Ditto.
-	(erc-save-buffer-in-logs): Ditto.
-	(match): Ditto.
-	(erc-log-matches-types-alist): Ditto.
-	(erc-match-directed-at-fool-p): Ditto.
-	(erc-match-message): Ditto.
-	(erc-update-member): Ditto.
-	(erc-ignored-reply-p): Ditto.
-	(erc-menu-definition): Ditto.
-	(erc-netsplit-QUIT): Ditto.
-	(erc-notify-list): Ditto.
-	(erc-speedbar-update-channel): Ditto.
-	(erc-speedbar-item-info): Ditto.
-	(erc-stamp): Ditto.
-	(erc-timestamp-intangible): Ditto.
-	(erc-add-timestamp): Ditto.
-	(erc-timestamp-only-if-changed-flag): Ditto.
-	(erc-show-timestamps): Ditto.
-	(erc-track-priority-faces-only): Ditto.
-	(erc-modified-channels-alist): Ditto.
-	(erc-unique-substrings): Ditto.
-	(erc-find-parsed-property): Ditto.
-	(erc-track-switch-direction): Ditto.
-	(erc-truncate-buffer-to-size): Ditto.
-	(erc-xdcc): Ditto.
-	(erc-auto-reconnect): Ditto.
-	(erc-startup-file-list): Ditto.
-	(erc-once-with-server-event): Ditto.
-	(erc-once-with-server-event-global): Ditto.
-	(erc-mode): Ditto.
-	(erc-generate-new-buffer-name): Ditto.
-	(erc): Ditto.
-	(erc-open-ssl-stream): Ditto.
-	(erc-default-coding-system): Ditto.
-	(erc-encode-string-for-target): Ditto.
-	(erc-decode-string-from-target): Ditto.
-	(erc-scroll-to-bottom): Ditto.
-	(erc-decode-controls): Ditto.
-	(erc-channel-members-changed-hook): Ditto.
-	(erc-put-text-property): Ditto.
-	(erc-add-default-channel): Ditto.
-
-2004-03-17  Diane Murray <disumu@x3y2z1.net>
-
-	* erc.el (erc-process-sentinel): Cancel ping timer upon
-	disconnect.
-	(erc-cmd-PART): Use same regexp as `erc-cmd-QUIT' when no #channel
-	is provided.
-	(erc-nick-uniquifier, erc-manual-set-nick-on-bad-nick-p): `:group'
-	was missing, added.
-	(erc-part-reason-zippy, erc-part-reason-zippy): Removed FIXME
-	comments.  I see no problem allowing typed in reasons.
-
-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-timestamp-only-if-changed-flag): Updated documentation.
-
-2004-03-13  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-nets.el (erc-network-name): No longer marked as obsolete.
-	Why was this function made obsolete?  There is no other function
-	that performs this task.  Some of us use these functions in our
-	personal ERC configs.
-
-2004-03-12  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-buffer-filter): Use `with-current-buffer'.
-	(erc-process-input-line): Append newline to documentation.  Fixes a
-	bug whereby the prompt would be put on the same line as the output.
-	(erc-cmd-GQUIT): Only try and send QUIT if the process is alive.
-
-2004-03-12  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-log.el: Only add top-level hooks if `erc-enable-logging' is
-	non-nil.
-
-2004-03-10  Damien Elmes <erc@repose.cx>
-
-	* 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 <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
-	send 004 (RPL_MYINFO) message.
-
-2004-03-10  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-nets.el (erc-server-alistm erc-settings): Use lowercase
-	"freenode", as in `erc-networks-alist'.
-
-2004-03-10  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-nickserv.el (erc-nickserv-alist): Use lowercase "freenode",
-	as in `erc-networks-alist'.
-
-2004-03-10  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-dcc.el (pcomplete/erc-mode/DCC): Append "send" as a list.
-
-2004-03-10  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-nets.el (erc-networks-alist): Changed "Freenode" to
-	"freenode".
-
-2004-03-10  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-list.el (erc-cmd-LIST): Improved the docstring.	Made
-	message to user more accurate	depending on whether a single
-	channel is being listed or not.
-
-2004-03-10  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-nets.el (erc-determine-network): Make matching logic simpler
-	(suggested by Damian Elmes).
-	(erc-current-network, erc-network-name): Add `make-obsolete' form.
-	(erc-set-network-name): Indentation fix.
-	(erc-ports-list): Add docstring.  Rework function body to use
-	`nconc'.
-
-2004-03-09  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-list.el, erc-notify.el: (require 'erc-nets): added
-
-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
-	`erc-network' in erc-nets.el do what this did before.  Deprecated.
-	Use (erc-network) instead.
-
-2004-03-08  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-nickserv.el: Changed copyright notice.  Now require
-	erc-nets.  erc-nets.el now takes care of network-related functions
-	and variables.
-	(erc-nickserv-alist): Changed network symbols to match those in
-	`erc-networks-alist' in erc-nets.el.
-	(erc-nickserv-identify-autodetect): Use `erc-network'.
-	(erc-nickserv-identify): Use `erc-network'.  Changed wording for
-	interactive use, now shows current nick.
-	(erc-networks): Removed.  Use `erc-networks-alist' as defined in
-	erc-nets.el.
-	(erc-current-network): Function definition moved to erc-nets.el.
-	The functions `erc-determine-network' and `erc-network' in
-	erc-nets.el do what this did before.  Deprecated.  Use
-	(erc-network) instead.
-
-2004-03-08  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-nets.el: Added commentary, `erc-nets-version'.
-	(erc-server-alist): Changed Brasnet to BRASnet.
-	(erc-networks-alist): All networks (except EFnet and IRCnet) now
-	have a MATCHER.  (erc-network): New variable.
-	(erc-determine-network): New function. Determine the network the
-	user is on.  Use the server parameter NETWORK, if provided, else
-	parse the server name and search for a match (regexp and loop by
-	wencem) in `erc-networks-alist'.  Return the name of the network
-	or "Unknown" as a symbol.
-	(erc-network): New function.  Returns value of `erc-network'.  Use
-	this when the current buffer is not the server process buffer.
-	(erc-current-network): Returns the value of `erc-network' as
-	expected by users who used the function as it was defined in
-	erc-nickserv.el.  Deprecated.
-	(erc-network-name): Returns the value of `erc-network' as expected
-	by users who used the function as it was defined in erc.el.
-	Deprecated.
-	(erc-set-network-name): New function.  Added to
-	`erc-server-375-hook' and `erc-server-422-hook'.
-	(erc-unset-network-name): New function.  Added to
-	`erc-disconnected-hook'.
-	(erc-server-select): Small documentation word change.
-
-2004-03-07  Diane Murray <disumu@x3y2z1.net>
-
-	* AUTHORS, CREDITS: disumu info updated
-
-2004-03-06  Lawrence Mitchell <wence@gmx.li>
-
-	* erc-list.el (erc-cmd-LIST): Take &rest rather than &optional
-	arguments.
-	(erc-chanlist): Construct correct LIST command from list of
-	channels.
-
-2004-03-06  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-update-mode-line-buffer): Add 'help-echo property to
-	header-line text.  This allows header lines longer than the width
-	of the current window to be seen.
-
-2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-match.el (erc-match-directed-at-fool-p): Also check for
-	"FOOL, "
-
-2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-match.el (erc-match-message): Only use nick-or-keyword if
-	we're matching our nick.
-
-2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-match.el: The highlight type for the current nickname can
-	now also be 'nick-or-keyword, to highlight the nick of the sender
-	if that is available, but fall back to highlighting your nickname
-	in the whole message otherwise.
-	(erc-current-nick-highlight-type): Adapted docstring accordingly.
-	(erc-match-message): Added new condition. Also added some comments
-	to this monster of a function.
-
-2004-03-06  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-is-valid-nick-p): Don't check for length less or
-	equal to 9.
-
-2004-03-06  Damien Elmes <erc@repose.cx>
-
-	* erc-nickserv.el (erc-current-network): the last change resulted
-	in this function failing when a network identifies itself as
-	anything other than var.netname.com, so for instance
-	'vic.au.austnet.org' fails. This version is only a marginal
-	improvement over the original, but if we want to be more flexible
-	we'll probably have to do the iteration ourselves instead of using
-	assoc.
-
-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
-	server's settings. This fixes a bug where nicks that were too long
-	and got truncated by ther server were still set to the old value.
-	(nickname-in-use): If user wants to try again manually, let user
-	know that the nick is taken.  If not, go through erc-default-nicks
-	until none are left, and then try one last time with
-	erc-nick-uniquifier.  If it's still a bad-nick, make the user
-	change nick manually.  When applying uniquifier, use NICKLEN if
-	it's in the server parameters, otherwise use what RFC 2812 says is
-	the max nick length (9 chars).  Added custom variable
-	erc-manual-set-nick-on-bad-nick-p, which is set to nil and
-	erc-nick-change-attempt-count.  Reset erc-default-nicks and
-	erc-nick-change-attempt-count when the nick has been changed
-	successfully.  This fixes the bug where ERC would get caught in a
-	neverending loop of trying to set the same nick if the nick was
-	too long and the uniquified nick was not available.
-
-	* added erc-cmd-WHOAMI
-
-	* added custom variable erc-mode-line-away-status-format, use this
-	instead of   the previous hard-coded setting
-
-	* erc-server-315|318|369-hook defvar lines removed - they're
-	already defined in erc-server-hook-list
-
-2004-03-04  Lawrence Mitchell <wence@gmx.li>
-
-	* HACKING: Initial commit.  Some thoughts on coding standards.
-
-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 <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 <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 <disumu@x3y2z1.net>
-
-	* erc-match.el: Added 'keyword option to
-	erc-current-nick-highlight-type highlights all instances of
-	current-nick in the message ('nickname option in cvs revisions 1.9
-	- 1.11 had same effect)
-
-2004-02-28  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-button.el: Add Lisp: prefix for the EmacsWiki Elisp area.
-	(erc-button-alist): Added Lisp: prefix.
-	(erc-emacswiki-lisp-url): New variable.
-	(erc-browse-emacswiki-lisp): New function.
-
-2004-02-27  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-get-arglist): Use `substitute-command-keys', rather
-	than hard-coding C-h f for `describe-function'.
-
-2004-02-26  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-log.el (erc-save-buffer-in-logs): bind `inhibit-read-only'
-	to t around call to `erase-buffer'.
-
-2004-02-23  Edward O'Connor <ted@oconnor.cx>
-
-	* erc-chess.el, erc-dcc.el, erc-ezbounce.el, erc-list.el,
-	erc-macs.el, erc-ring.el, erc-stamp.el, erc.el: Normalized buffer
-	local variable creation.
-
-2004-02-17  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-scroll-to-bottom, erc-add-scroll-to-bottom): Mention
-	`erc-input-line-position' in docstring.
-
-2004-02-13  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-kick-hook): Typo fix.
-
-2004-02-13  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
-
-	* erc.el: Added `erc-kick-hook', which is called when the local
-	user is kicked from a channel.  Fixed a bug in `erc-cmd-OPS', such
-	that the command now works.  Added `erc-remove-channel-users', in
-	order to fix a number of significant bugs relating to channel
-	parting.
-
-2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-display-prompt): Remove last change. This caused a
-	lot of trouble :(
-
-2004-02-12  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-display-prompt): Also set 'field property, so C-j
-	works on an empty prompt.
-
-2004-02-12  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-update-channel-topic): Ensure that `channel-topic'
-	does not contain any bare format controls.
-
-2004-02-10  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc-stamp.el (erc-timestamp-intangible): New variable (user
-	feature request)
-	(erc-format-timestamp): Use erc-timestamp-intangible.
-
-2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
-
-	* erc-button.el: Fixed bug related to nickname buttonizing and text
-	fields due to erc-stamp.
-
-2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
-
-	* CREDITS: Added mention of my change of ERC to use hash tables.
-
-2004-02-07  Jeremy Bertram Maitin-Shepard <jbms@gentoo.org>
-
-	* AUTHORS: Added myself to the list.
-
-2004-02-05  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el: From Jeremy Maitin-Shepard <jbms@attbi.com>:
-	(erc-remove-channel-user): Use `delq' not `delete'.
-	(erc-get-buffer): Pass PROC through to `erc-buffer-filter'.
-	(erc-process-sentinel): Use `erc' rather than `erc-reconnect' for
-	auto-reconnection.
-
-2004-02-02  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el: (erc-buffer-list-with-nick): Apply `erc-downcase' NICK.
-
-2004-01-30  Alex Schroeder <alex@gnu.org>
-
-	* erc.el: (erc-get-buffer): Use erc-buffer-filter.
-
-2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc.el: From jbms: (erc-get-channel-nickname-list): New function.
-	(erc-get-server-nickname-list): New function.
-	(erc-get-server-nickname-alist): New function.
-	(erc-get-channel-nickname-alist): New function.
-
-2004-01-30  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-match.el: (erc-add-entry-to-list,
-	erc-remove-entry-from-list): Use `erc-member-ignore-case' to
-	compare entries.
-	(erc-add-pal, erc-add-fool): Fix type bug. Use
-	`erc-get-server-nickname-alist'.
-
-2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc.el: From jbms: Adds xemacs compatibility to hash table
-	channel-members patch.
-
-2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc.el: (erc-update-undo-list): Rewritten. Update
-	buffer-undo-list in place.  Deal with XEmacsesque
-	entries (extents) in the list.
-	(erc-channel-users): Fix unescaped open-paren in left column in
-	docstring.
-
-2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-ring.el: (erc-replace-current-command): Exclude the prompt
-	from the deleted region and don't redisplay the prompt (because
-	`erc-display-prompt' flushes `buffer-undo-list').
-
-2004-01-29  Johan Bockgard <bojohan@users.sourceforge.net>
-
-	* erc-match.el: (erc-add-entry-to-list): Use `symbol-value' instead
-	of `eval'.
-
-2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: (erc-kill-buffer-function): maphash was missing an
-	argument.
-
-2004-01-28  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* Makefile, erc-autoaway.el, erc-button.el, erc-ibuffer.el,
-	erc-lang.el, erc-list.el, erc-match.el, erc-menu.el, erc-page.el,
-	erc-pcomplete.el, erc-speedbar.el, erc.el: HUGE change by jbms.
-	This makes channel-members a hash, erc-channel-users.
-
-	Modified files: Makefile erc-autoaway.el erc-button.el
-	erc-ibuffer.el erc-lang.el erc-list.el erc-match.el erc-menu.el
-	erc-page.el erc-pcomplete.el erc-speedbar.el erc.el
-
-	The changes are too numerous to document properly. Have fun with
-	the breakage.
-
-2004-01-27  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: (erc-send-input-line): Add a space to empty lines so the
-	server likes them.
-
-2004-01-25  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: erc-send-whitespace-lines: New variable.
-	(erc-send-current-line): Use erc-send-whitespace-lines. Also,
-	removed superflous test for empty line in the mapc, since the
-	blank line test should find all. I do like to be able to send an
-	empty line when i want to!
-	(erc-send-current-line): Check for point being in input line
-	before checking for blank lines.
-
-2004-01-21  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el: (erc-display-line-1): Move `erc-update-undo-list' outside
-	`save-restriction'.  Removing need for temporary variable.
-	(erc-send-current-line): Fix bug introduced by last change, remove
-	complement in blank line regexp.
-
-2004-01-20  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el: (erc-update-undo-list): Add logic to catch the case when
-	`buffer-undo-list' is t, indentation cleanup.
-	(erc-send-current-line):  Reverse logic for matching blank lines.
-
-2004-01-20  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-input-line-position): New variable.  If non-nil,
-	specifies the argument to `recenter' in `erc-scroll-to-bottom'.
-	(erc-scroll-to-bottom): Use it.
-
-2004-01-20  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el: From Johan Bockgård <bojohan+news@dd.chalmers.se>:
-	(erc-update-undo-list): New function.  Update `buffer-undo-list'
-	so that calling `undo' in an ERC buffer doesn't mess up the
-	existing text.
-	(erc-display-line-1): Use it.
-
-2004-01-19  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-beg-of-input-line): Use `forward-line' rather than
-	`beginning-of-line'.  Docstring fix.
-	(erc-end-of-input-line): Docstring fix.
-
-2004-01-13  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-display-prompt): Remove the undo list after
-	displaying the prompt, so the user can't undo ERC changes, which
-	breaks some stuff anyways. This way the user can still undo his
-	editing, but not ours.
-
-2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el (erc-scroll-to-bottom): Should recenter on the bottom
-	line, not the second-to-last one.
-
-2004-01-12  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el: (erc-bol): Fix bug introduced in revision 1.601.
-
-2004-01-12  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el: From Brian Palmer <bpalmer@gmail.com>
-	(erc-cmd-JOIN): Use `erc-member-ignore-case', rather than
-	`member-ignore-case'.
-
-2004-01-12  Jorgen Schaefer <forcer@users.sourceforge.net>
-
-	* erc.el: There was an inconsistency where the values of op and
-	voice in channel-names could be 'on or 'off after an update, t and
-	nil before.  The intended version was to have t or nil, so i fixed
-	it to do so.
-	(channel-names): Updated docstring.
-	(erc-update-current-channel-member): Clarified docstring, fixed so
-	it sets t or nil on an update as well, not only on an add.
-	(erc-cmd-OPS): Updated not to check for 'on (the only function that
-	did this!)
-
-2004-01-12  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-part-reason-various-alist,
-	erc-update-mode-line-buffer): Fix docstring
-
-2004-01-11  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-update-mode-line): Fix typo.
-
-2004-01-11  Lawrence Mitchell <wence@gmx.li>
-
-	* erc.el (erc-prompt-interactive-input): Removed.
-	(erc-display-prompt): Removed `erc-prompt-interactive-input'
-	option.  (erc-interactive-input-map): Removed.
-
-	Major docstring fixes.
-
-2004-01-07  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-cmd-OPS): Added this function.
-	(erc-cmd-IDLE): Switched from using erc-display-message-highlight
-	to erc-make-notice.
-
-2004-01-07  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-list.el (erc-cmd-LIST): Switched from using
-	erc-display-message-highlight to erc-make-notice.
-
-2004-01-07  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-once-with-server-event): Added a sentence to the
-	docstring.  Now returns the uninterned symbol that is added to the
-	server hook.
-	(erc-cmd-IDLE): Changed to use erc-once-with-server-event instead
-	of erc-once-with-server-event-global.
-
-2004-01-06  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-list.el (erc-chanlist-hide-modeline): New variable.
-	(erc-chanlist): Now displays message as a notice.  Also hides the
-	modeline if erc-chanlist-hide-modeline is non-nil.
-
-2004-01-05  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-server-PRIVMSG-or-NOTICE): Now nicks appear as
-	<nick> in query buffers, instead of as *nick*.
-
-2004-01-03  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-once-with-server-event-global): Changed to return
-	the uninterned symbol that it creates.
-	(erc-cmd-LIST): Changed to clean up hooks that don't run.
-
-2004-01-03  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-pcomplete.el (pcomplete/erc-mode/IDLE): Added to support new
-	/IDLE command.
-
-2004-01-03  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc.el (erc-once-with-server-event-global): New function.  Like
-	erc-once-with-server-event, except it modifies the global value of
-	the event hook.
-	(erc-cmd-IDLE): New function.  Implements the new /IDLE command.
-	Usage: /IDLE NICK (erc-seconds-to-string): New function.  Converts
-	a number of seconds to an Engligh phrase.
-
-2004-01-02  Francis Litterio <franl@users.sourceforge.net>
-
-	* erc-list.el: Added variable erc-chanlist-mode-hook.
-
-See ChangeLog.2003 for earlier changes.
-
-    Copyright (C) 2004 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.
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
-;; arch-tag: cc606d2d-635b-4b36-829b-a50e3c51e2d1
--- a/lisp/erc/ChangeLog.2005	Mon Feb 06 18:44:57 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1228 +0,0 @@
-2005-11-23  Johan Bockgård  <bojohan@users.sourceforge.net>
-
-	* erc.el (erc-cmd-SAY): Strip leading space in input line.
-
-2005-10-29  Michael Olson  <mwolson@gnu.org>
-
-	* FOR-RELEASE: Add stuff that needs to be done before the 5.1
-	release.  Longer-term items can be added to the 5.2 section.
-
-	* Makefile (SITEFLAG): New variable that indicates what variant of
-	"--site-flag" to use.  XEmacs needs "-site-flag".
-	(INSTALLINFO): New variable indicating how we should call
-	install-info when installing documentation.
-	(erc-auto.el, .elc.el): Use $(SITEFLAG).
-
-	* NEWS: Note that last release was 5.0.4.
-
-	* erc.texi: Initial and incomplete draft of ERC documentation.
-	Commence collaborate-documentation-hack-mode :^) .
-
-2005-10-29  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-ring.el (erc-replace-current-command): Revert last change
-	since it made the prompt disappear when using `erc-next-command'
-	and `erc-previous-command'.
-
-2005-10-28  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-input-marker): New variable that indicates the
-	position where text from the user begins, after the prompt.
-	(erc-mode-map): Bind <HOME> to erc-bol, just like C-a.
-	(erc): Initialize erc-input-marker.
-	(erc-display-prompt): Even in case where no prompt is desired by
-	the user, clear the undo buffer and set the input marker.
-	(erc-bol, erc-user-input): Simplify by using erc-input-marker.
-
-	* erc-pcomplete.el (pcomplete-parse-erc-arguments): Use
-	erc-insert-marker.
-
-	* erc-ring.el (erc-previous-command)
-	(erc-replace-current-command): Use erc-insert-marker.
-
-	* erc-spelling.el (erc-spelling-init): Make sure that even Emacs21
-	obeys erc-spelling-flyspell-verify.
-	(erc-spelling-flyspell-verify): Use erc-input-marker.  This should
-	make it considerably faster when switching to a buffer that has
-	seen a lot of activity since last viewed.
-
-2005-10-25  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-backend.el (erc-server-version, 004): Re-added setting of
-	`erc-server-version'.  It doesn't hurt to set, and it could be
-	used in modules or users' settings.
-
-	* NEWS: Added descriptions of some new features.
-
-2005-10-20  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-match.el (erc-current-nick-highlight-type): Set to `keyword'
-	as default.
-	(erc-beep-match-types): New variable.
-	(erc-text-matched-hook): Doc fix.  Added `erc-beep-on-match' to
-	customization options.
-	(erc-beep-on-match): New function.  If the MATCH-TYPE is found in
-	`erc-beep-match-types', beep.
-
-	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
-	New functions to deal with the difference in the number of
-	arguments accepted by `make-obsolete' and `make-obsolete-variable'
-	in Emacs and XEmacs.
-
-	* erc.el, erc-nets.el: Use `erc-make-obsolete' and
-	`erc-make-obsolete-variable'.
-
-	* erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable):
-	Handle `wrong-number-of-arguments' error instead of checking for
-	xemacs feature as future versions of XEmacs might accept three
-	arguments.
-
-2005-10-18  Edward O'Connor  <ted@oconnor.cx>
-
-	* erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module
-	docstrings.
-
-2005-10-08  Diane Murray  <disumu@x3y2z1.net>
-
-	* 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-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
-	Lisp mode knows how to indent erc-with-buffer blocks.
-	(with-erc-channel-buffer): Ditto.
-	(erc-with-all-buffers-of-server): Ditto.
-	(erc-modules): Use pcomplete by default, not completion, since
-	erc-complete.el is deprecated.  Use `fboundp' instead of
-	`symbol-value' to check for existence of a function before calling
-	it.  This was causing an error when untoggling the `completion'
-	option and trying to save via the customize interface.
-
-	* erc-track.el (erc-modified-channels-update): If a buffer is not
-	currently connected, remove it from the modified channels list.
-	This should fix the problem where residue was left on the mode
-	line after quitting ERC.
-
-	* erc-list.el (erc-prettify-channel-list): Docfix; thanks to John
-	Paul Wallington for reporting this.
-
-2005-05-31  Michael Olson  <mwolson@gnu.org>
-
-	* debian/changelog: First draft of entries for the 5.0.3 release.
-
-	* debian/README.Debian: Note that ERC will now install correctly
-	on versions of Emacs or XEmacs that do not have the `format-spec'
-	library.  Correct some grammar and prune the content a bit.
-
-	* debian/scripts/install (emacs20): Remove line since we no longer
-	need to deal with format-spec.el.
-
-	* NEWS: Add entries for the upcoming 5.0.3 release.
-
-	* erc.el: Don't require format-spec since this is provided in
-	erc-compat.el now.
-	(erc-process-sentinel, erc-setup-periodical-server-ping): Use
-	`erc-cancel-timer' instead of `cancel-timer'.
-	(erc-version-string): Update to 5.0.3.
-
-	* erc-autoaway.el (autoaway, erc-autoaway-reestablish-idletimer):
-	Use `erc-cancel-timer' instead of `cancel-timer'.
-
-	* erc-compat.el (format-spec, format-spec-make): If we cannot load
-	the `format-spec' library, provide versions of these functions.
-	This should keep problems from surfacing with Emacs21 Debian
-	builds.
-	(erc-cancel-timer): New function created to take the place of
-	`cancel-timer' since XEmacs calls it something else.
-
-	* erc-track.el (erc-modified-channels-update): Accept any number
-	of arguments, which are ignored.  This allows it to be run from
-	`erc-disconnected-hook' without extra bother.
-	(track): Add `erc-modified-channels-update' to
-	`erc-disconnected-hook' so that the indicators are removed
-	correctly in some edge cases.
-	(erc-modified-channels-display): Make sure that we never pass nil
-	to the function in `erc-track-shorten-function'.  This happens
-	when we have deleted buffers in `erc-modified-channels-alist'.
-	Also, make sure that the buffer has a non-nil short-name before
-	adding it to the string list.  This should fix some XEmacs
-	warnings when running /quit with unchecked buffers, as well as get
-	rid of a stray buffer problem (or so it is hoped).
-
-2005-05-31  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
-
-	* erc-replace.el, erc-speak.el: Clean up comment formatting.
-
-	* erc-ring.el (ring, erc-input-ring-index, erc-clear-input-ring):
-	Clean up docstring formatting.
-
-2005-05-30  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
-
-	* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Delete superfluous
-	arg to `format'.
-	(erc-load-irc-script): Use `insert-file-contents' instead of
-	`insert-file'. Simplify.
-
-2005-05-29  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-version-string): Move this up so that it is
-	evaluated before the `require' statements.  Not a major change.
-
-2005-04-27  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
-
-	* erc.el (erc-complete-word): Simplify.
-
-2005-04-27  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (debrelease): Use a slightly different approach when
-	removing CVS and Arch cruft.
-
-	* debian/changelog: Update for 5.0.2-1 package.
-
-2005-04-25  Michael Olson  <mwolson@gnu.org>
-
-	* erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move code
-	block higher in file to fix a load failure when using Emacs21.
-	Thanks to Daniel Brockman for the report and fix.
-
-2005-04-24  Adrian Aichner  <adrian@xemacs.org>
-
-	* erc-backend.el (JOIN): save-excursion so that
-	`erc-current-logfile' inserts into the correct channel buffers
-	when using erc-log-insert-log-on-open in combination with autojoin
-	to multiple channels.
-
-2005-04-17  Adrian Aichner  <adrian@xemacs.org>
-
-	* erc-log.el: Remove stray whitespace.
-	* erc.el: Ditto.
-
-2005-04-09  Aidan Kehoe  <kehoea@parhasard.net>
-
-	* erc.el: autoload erc-select-read-args, which, because it parses
-	erc-select's args, can be called before erc.el is loaded. 
-
-2005-04-07  Edward O'Connor  <ted@oconnor.cx>
-	
-	* erc-viper.el: Remove final newlines from previously-existing ERC
-	buffers. (Minor bug fix.)
-
-2005-04-06  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile (debrelease): Ignore errors from deleting Arch and CVS
-	metadata.
-
-2005-04-05  Michael Olson  <mwolson@gnu.org>
-
-	* ChangeLog, CREDITS, AUTHORS: Correct name and email address of
-	Marcelo Toledo.
-
-2005-04-04  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-modules): Add entry for spelling module.
-
-	* erc-spelling.el: Add autoload line.
-
-	* erc-backend.el: Apply latest non-ascii patch from Kai Fan.
-	(erc-decode-parsed-server-response): Search
-	erc-response.command-args for channel name.  Decode the
-	erc-response struct using this channel name as key according to
-	the `erc-encoding-coding-alist'.
-
-	* erc-track.el: Apply patch from Henrik Enberg.
-	(erc-modified-channels-object): Use optimal amount of whitespace
-	around modified channels indicator.
-
-2005-04-02  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
-
-	* erc.el (define-erc-module, erc-with-buffer)
-	(erc-with-all-buffers-of-server, with-erc-channel-buffer): Add
-	edebug-form-spec.
-
-	* erc-compat (erc-define-minor-mode): Ditto.
-
-2005-03-29  Jorgen Schaefer  <forcer@forcix.cx>
-
-	* erc-spelling.el: New file.
-
-2005-03-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
-
-	* erc-backend.el (define-erc-response-handler): Add
-	`definition-name' property to constructed symbols so that
-	find-function and find-variable will find them.
-
-2005-03-21  Michael Olson  <mwolson@gnu.org>
-
-	* erc-dcc.el, erc-goodies.el, erc-list.el, erc-notify.el,
-	erc-ring.el, erc.el: Copyright assignment occurred.
-
-	* debian/scripts/install: Make a shell wrapper around the original
-	Makefile and inline the Makefile.  The problem is that Debian
-	passes all the Emacs variants at once, rotating them at every
-	invocation of the install script, which happens once per variant.
-	This caused each installation to happen N-1 times more often than
-	it should have.  As a result, we need to only deal with the first
-	argument.
-	(ELFILES): Only add format-spec.el if we are compiling for
-	emacs21.  Don't filter out erc-compat.el.
-	(SITEFLAG): New variable that indicates that the "nosite" option
-	should look like.
-	(.DEFAULT): Use $(FLAVOUR) instead of $@ for clarity.
-
-	* debian/rules: Install NEWS file and compress it.
-
-	* debian/maint/postinst: Be more cautious about configuration
-	step.
-
-	* debian/copyright (Copyright): Another assignment came in.
-
-	* debian/control (Standards-Version): Update to a newer version as
-	recommended by lintian.
-
-	* debian/changelog: Changes made for the Debian package.
-
-	* debian/README.Debian: Keep only the General Notes section.
-
-	* NEWS: Move old history items here from debian/README.Debian.
-
-	* Makefile (SNAPSHOTDATE): Deprecate this option since we hope to
-	release more often.
-
-2005-03-20  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el (erc-define-catalog, `ctcp-request-to'): Fix typo (%: ->
-	%t:).
-
-2005-03-01  Michael Olson  <mwolson@gnu.org>
-
-	* erc-log.el (erc-save-buffer-in-logs): Replace tabs with spaces
-	in code indentation.
-
-2005-02-28  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-display-message): Apply corrected patch from Henrik
-	Enberg.
-
-2005-02-27  Michael Olson  <mwolson@gnu.org>
-
-	* erc.el (erc-display-message): Apply patch from Henrik Enberg.
-	Check here to see if a message should be hidden, rather than
-	relying on code in each individual command.
-	(erc-version-string): Add "(CVS)" to the version string for
-	clarity.
-
-	* erc-backend.el (JOIN, KICK, MODE, NICK, PART, QUIT, TOPIC):
-	Don't check `erc-hide-list' here.
-
-	* erc-list.el, erc-match.el, erc.el, debian/copyright: Update
-	copyright information as a few more people have assignments
-	registered.
-
-2005-02-06  Michael Olson  <mwolson@gnu.org>
-
-	* erc-backend.el: Apply patch from Kai Fan for non-ASCII character
-	support.
-	(erc-parse-server-response): Add call to
-	`erc-decode-parsed-server-response'.
-	(erc-decode-parsed-server-response): New function that decodes a
-	pre-parsed server response before it can be handled.
-	(PRIVMSG): Comment out call to `erc-decode-string-from-target'.
-	(TOPIC): Ditto.
-
-2005-02-01  Jorgen Schaefer  <forcer@users.sourceforge.net>
-
-	* erc.el (erc-process-sentinel-1): Don't reconnect on connection
-	refused. This error is reported differently when using
-	open-network-stream-nowait.
-
-2005-01-26  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc-cmd-APPENDTOPIC, erc-set-topic): The control
-	character in `channel-topic' was changed to \C-o - replaced \C-c
-	with \C-o so that these functions work as expected again.
-	(erc-get-channel-mode-from-keypress): Doc fix.
-
-2005-01-25  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el, erc-button.el, erc-compat.el, erc-goodies.el,
-	erc-match.el, erc-nets.el, ChangeLog, NEWS: Merged bug fixes made
-	on release_5_0_branch since 5.0.1 release.
-
-2005-01-24  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
-
-	* erc.el (erc-input-action): Quote `erc-action-history-list' so
-	that input history actually works.
-	(erc-process-ctcp-query): Fix and simplify logic.
-	(erc-get-channel-mode-from-keypress): Use `C-' string syntax.
-	(erc-load-irc-script-lines): Use `erc-command-indicator' instead
-	of `erc-prompt'.
-
-2005-01-23  Edward O'Connor  <ted@oconnor.cx>
-	
-	* erc-viper.el: Ensure that `viper-comint-mode-hook' runs in
-	buffers whose `erc-mode-hook' has already run when this file is
-	loaded.
-	Explicitly `require' erc.el.
-
-2005-01-22  Edward O'Connor  <ted@oconnor.cx>
-	
-	* erc.el (erc-mode): Remove frobbing of `require-final-newline'.
-
-	* erc-log.el (erc-save-buffer-in-logs): Remove frobbing of
-	`require-final-newline'.
-
-	* erc-viper.el: New file. This is where all ERC/Viper
-	compatiibilty code should live. When and if ERC is bundled with
-	Emacs, some of the hacks in this file should be merged into Viper
-	itself.
-
-2005-01-21  Edward O'Connor  <ted@oconnor.cx>
-	
-	* erc.el (erc-mode): Set `require-final-newline' to nil in ERC
-	buffers. This prevents a Viper misfeature whereby extraneous
-	newlines are inserted into the ERC buffer when switching between
-	viper states.
-
-	* erc-log.el (erc-save-buffer-in-logs): Bind `require-final-newline'
-	to t when calling `write-region' to ensure that further log
-	entries start on fresh lines.
-	
-2005-01-21  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-button.el (erc-button-add-face): Reverted my change to the
-	order faces since it had the unwanted effect of putting the button
-	face after all others.
-	(erc-button-face-has-priority): Removed this variable as it is not
-	necessary anymore - it was used to compensate for the above
-	mentioned change.
-
-	* NEWS: Added the latest fixes.
-
-2005-01-20  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-button.el, erc-match.el:
-	(erc-button-syntax-table, erc-match-syntax-table): Added \ as a
-	legal character for nicknames.
-
-	* erc-nets.el (erc-server-select): Fixed so that only networks
-	with servers found in `erc-server-alist' are available as choices.
-
-	* erc.el, erc-compat.el, erc-goodies.el:
-	(erc-replace-match-subexpression-in-string): New function.  Needed
-	because `replace-match' in XEmacs doesn't replace regular
-	expression subexpressions in strings, only in buffers.
-	(erc-seconds-to-string, erc-controls-interpret): Use the new
-	function.
-
-	* erc-button.el (erc-button-add-button): Use the `:button-face'
-	key combined with an `erc-mode' local `widget-button-face' set to
-	nil to get the widget overlay face suppressed in XEmacs.
-
-2005-01-19  Francis Litterio  <franl@world.std.com>
-
-	* erc-button.el (erc-button-add-face): The face added by this
-	function is more important than the existing text's face, so we
-	now prepend erc-button-face to the list of existing faces when
-	adding a button.  To instead append erc-button-face to existing
-	faces, set variable `erc-button-face-has-priority' to nil.
-	(erc-button-face-has-priority): New variable to control how
-	erc-button-add-face adds erc-button-face to existing faces.
-	(erc-button-press-button): Silenced a byte-compiler warning about
-	too few arguments in a call to `error'.
-
-2005-01-19  Diane Murray  <disumu@x3y2z1.net>
-
-	* NEWS: Added list of 5.0.1 fixes.
-
-2005-01-19  Michael Olson  <mwolson@gnu.org>
-
-	* AUTHORS: Move to format that cscvs can understand.  As an added
-	perk, entries line up nicer.
-
-	* erc.el, erc-fill.el, erc-pcomplete.el, debian/copyright: Merge a
-	few more copyright lines thanks to Alex Schroeder's BBDB file.
-
-	* Makefile: Change version to correspond with our new scheme.
-
-2005-01-18  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-list.el (erc-chanlist-channel-line-regexp): Now matches
-	private channels, the channels `#' and `&', and channels with
-	names including non-ascii characters.
-	(erc-chanlist-join-channel): Don't attempt to join private
-	channels since the channel name is unknown.
-
-	* erc-goodies.el (erc-make-read-only): Add `rear-nonsticky'
-	property to avoid `Text is read-only' errors during connection.
-	`front-nonsticky' does not exist, changed to `front-sticky'.
-	(erc-controls-interpret, erc-controls-strip): Just work on the
-	string, don't open a temporary buffer.
-	(erc-controls-propertize): Now accepts optional argument STR.
-
-2005-01-17  Michael Olson  <mwolson@gnu.org>
-
-	* Makefile: Version is 5.01, but only in the Makefile.  It has not
-	been released yet.
-
-	* erc-auto.in, erc-autojoin.el, erc-bbdb.el, erc-button.el,
-	erc-chess.el, erc-complete.el, erc-dcc.el, erc-fill.el,
-	erc-goodies.el, erc-ibuffer.el, erc-identd.el, erc-imenu.el,
-	erc-list.el, erc-match.el, erc-menu.el, erc-nets.el,
-	erc-netsplit.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el,
-	erc-ring.el, erc-speak.el, erc-speedbar.el, erc-stamp.el,
-	erc-track.el, erc-xdcc.el, erc.el, debian/copyright: Update
-	copyright notices.  If anyone has signed papers for Emacs in
-	general, merge them with the FSF's entry.
-
-2005-01-16  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el (erc): `erc-set-active-buffer' was being called before
-	`erc-process' was set, so that channels weren't being marked
-	active correctly upon join; fixed.
-
-2005-01-15  Johan Bockgård  <bojohan+sf@dd.chalmers.se>
-
-	* erc-backend.el (def-edebug-spec): This macro caused problems (in
-	XEmacs). Use its expansion directly.
-
-2005-01-15  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-button.el (erc-button-add-button): Reverted previous change
-	since `:suppress-face' doesn't seem to be checked for a certain
-	face.
-	(erc-button-add-face): FACE is now appended to the `old' face.
-	This should fix the problem of faces being "covered" by
-	`erc-button-face'.
-
-2005-01-14  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el, erc-backend.el (erc-cmd-OPS, erc-cmd-COUNTRY,
-	erc-cmd-NICK, erc-process-ctcp-query, ERROR, PONG, 311, 312, 313,
-	314, 317, 319, 320, 321, 322, 330, 352): Use catalog entries
-	instead of hard-coded text messages.
-	(english): Added new catalog entries `country', `country-unknown',
-	`ctcp-empty', `ctcp-request-to', `ctcp-too-many', `nick-too-long',
-	`ops', `ops-none', `ERROR', `PONG', `s311', `s312', `s313',
-	`s314', `s317', `s317-on-since', `s319', `s320', `s321', `s322',
-	`s330', and `s352'.
-	(erc-send-current-line): Use `erc-set-active-buffer' (change was
-	lost in previous bug fix).
-
-2005-01-14  Francis Litterio  <franl@world.std.com>
-
-	* erc-button.el (erc-button-add-button): Fixed a bug where the
-	overlay created by widget-convert-button has a `face' property
-	that hides the `face' property set on the underlying button text.
-
-	* erc-goodies.el: Docstring fix.
-
-	* erc-button.el: Improved docstring for variable erc-button-face.
-
-2005-01-13  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-menu.el (erc-menu-definition): "Topic set by channel
-	operator": Small word change.  "Identify to NickServ...": Check
-	that we're connected to the server.  Added "Save buffer in log"
-	and "Truncate buffer".
-
-2005-01-13  Lawrence Mitchell  <wence@gmx.li>
-
-	* erc.el (erc-display-line-1): Widen before we try to insert
-	anything, this makes sure input isn't broken when the buffer is
-	narrowed by the user.
-	(erc-beg-of-input-line): Simplify, just return the position of
-	`erc-insert-marker' or error if does not exist.
-	(erc-send-current-line): Widen before trying to send anything.
-
-2005-01-13  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc.el, erc-backend.el, erc-list.el:
-	(erc-update-mode-line-buffer): Strip controls characters from
-	`channel-topic' since we add our own control character to it.
-	(TOPIC, 332): Use \C-o instead of \C-c to force an end of IRC
-	control characters as it also ends bold, underline, and inverse -
-	\C-c only ends colors.
-	(erc-chanlist-322): Strip control characters from channel and
-	topic.  No need to interpret controls when we're applying overlays
-	to the lines.
-
-	* erc.el, erc-backend.el, erc-button.el, erc-netsplit.el,
-	erc-nicklist.el: Fixed so that each server has an active buffer.
-	(erc-active-buffer): Now a buffer-local variable.
-	(erc-active-buffer, erc-set-active-buffer): New functions.
-	(erc-display-line, erc-echo-notice-in-active-non-server-buffer,
-	erc-process-away, MODE): Call `erc-active-buffer' to get the
-	active buffer for the current server.
-	(erc, erc-process-sentinel-1, erc-grab-region, erc-input-action,
-	erc-send-current-line, erc-invite-only-mode,
-	erc-toggle-channel-mode, erc-channel-names, MODE, erc-nick-popup,
-	erc-nicklist-call-erc-command): Use `erc-set-active-buffer' to set
-	the active buffer for the current server.
-	(erc-cmd-WHOLEFT): Use 'active as BUFFER in `erc-display-message'.
-
-	* erc-track.el (erc-track-modified-channels): Server buffers are
-	now treated the same as channels and queries.  This means that
-	`erc-track-priority-faces-only', `erc-track-exclude', and
-	`erc-track-exclude-types' now work with server buffers.
-
-2005-01-12  Diane Murray  <disumu@x3y2z1.net>
-
-	* erc-backend.el (475): Prompt for the channel's key if
-	`erc-prompt-for-channel-key' is non-nil.  Send a new JOIN message
-	with the key if a key is provided.
-
-	* erc.el (erc-command-indicator): Fixed customization choices so
-	that there's no `mismatch' message when nil is the value.
-
-2005-01-11  Michael Olson  <mwolson@gnu.org>
-
-	* erc-bbdb.el (bbdb): Lowercase the name of the module.  This
-	fixes a bug which caused an error to occur when trying to enable
-	the module using the customization interface.
-
-2005-01-08  Edward O'Connor  <ted@oconnor.cx>
-
-	* erc-track.el: Support using faces to indicate channel activity
-	in the modeline under XEmacs.
-	(erc-modified-channels-object): New function.
-	(erc-modified-channels-display): Use it.
-	`erc-modified-channels-string' renamed to
-	`erc-modified-channels-object' (because it's no longer a string on
-	XEmacs). The new function `erc-modified-channels-object' is used
-	to generate updated values for the same-named variable.
-
-2005-01-08  Diane Murray <disumu@x3y2z1.net>
-
-	* ChangeLog.2002: Changed instances of my sourceforge username and
-	email address to real name and email.
-
-	* erc.el (erc-modules): Changed customization tag descriptions, so
-	that they all start with a verb; added new modules to choices.
-
-2005-01-08  Mario Lang  <mlang@delysid.org>
-
-	* debian/rules: Introduce new variable DOCDIR to simplify stuff a
-	bit.
-
-2005-01-08  Michael Olson  <mwolson@gnu.org>
-
-	* AUTHORS, ChangeLog.2004: Change bpalmer's email address as
-	requested.
-
-	* CREDITS: Add everyone who is mentioned in the ChangeLogs.
-
-	* debian/copyright (Copyright): Add last few people.  This can now
-	be considered a complete list, as far as CVS entries are
-	concerned.  If people have assigned copyright to the FSF, merge
-	them with the entry for the FSF.
-
-	* debian/README.Debian: Add entry for XEmacs-related change in
-	`erc-track.el'.
-
-	* erc.el (erc-cmd-MODE): New command that changes or displays the
-	mode for a channel or user.  The functionality was present before
-	this change, but there was no documentation for it.
-
-	* erc-auto.in, erc-*.el: Fully investigate copyright headers and
-	change them appropriately.  If a file has been pulled off of
-	erc.el at one time, keep track of copyright from the time of
-	separation, but not before.  If a file has been derived from a
-	work outside of erc, keep copyright statements in place.
-
-	* Makefile (VERSION): Change to 5.0! :^) Congrats on all the great
-	work.  I'll wait until hober commits his XEmacs compatibility
-	patch to erc-track.el, and then release.
-	(distclean): Alias for `realclean' target.
-
-2005-01-07  Michael Olson  <mwolson@gnu.org>
-
-	* AUTHORS: Add Marcelo Toledo, who has CVS access to this project.
-
-	* ChangeLog.2004: Add my name to my one contribution to erc last
-	year.
-
-	* CREDITS: Add people that were discovered while scouring
-	ChangeLogs.
-
-	* debian/copyright: Add everyone from `AUTHORS' to Upstream
-	Authors.  Anyone who has contributed 15 or more lines of
-	code (according to ChangeLogs) is listed in Copyright section.
-	Accurate years are included.
-
-	* debian/README.Debian: Paste content of NEWS and reformat
-	slightly.
-
-	* debian/rules: Concatenate the ChangeLogs during the Debian
-	install process and then gzip them.
-
-	* Makefile (MISC): Add ChangeLog.yyyy files to list.
-	(ChangeLog): Remove rule since we do not dynamically generate the
-	ChangeLog anymore.
-
-	* MkChangeLog: Removed since we do not use it to generate the
-	ChangeLog anymore.  cvs2cl does a much better job anyway.
-
-	* NEWS: Use 3rd level heading instead of bullets for lists that
-	contain descriptions.
-
-2005-01-07  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-list.el: Require 'sort.
-	(erc-chanlist): Disable undo in the channel list buffer.
-
-	* erc.el, erc-menu.el: The `IRC' menu is now automatically added
-	to the menu-bar.  Add the call to `easy-menu-add' to
-	`erc-mode-hook' when running in XEmacs (without this the menu
-	doesn't appear).
-
-	* NEWS: Added the information from
-	http://emacswiki.org/cgi-bin/wiki/ErcCvsFeatures and the newer
-	changes which weren't yet documented on that page.
-
-2005-01-06  Hoan Ton-That  <hoan@ton-that.org>
-
-	* erc-log.el (erc-current-logfile): Only downcase the logfile
-	name, not the whole filename.  Also expand relative to
-	`erc-log-channels-directory'.
-	(erc-generate-log-file-name-with-date)
-	(erc-generate-log-file-name-short)
-	(erc-generate-log-file-name-long): Don't expand filename, done in
-	`erc-current-logfile'.
-
-2005-01-06  Lawrence Mitchell  <wence@gmx.li>
-
-	* NEWS: New file, details user visible changes from version to
-	version.
-
-	* HACKING (NEWS entries): Mention NEWS file, and what its purpose
-	is.
-
-2005-01-05  Michael Olson  <mwolson@gnu.org>
-
-	* FOR-RELEASE: New file containing the list of release-critical
-	tasks.  Feel free to add to it.
-
-	* debian/rules (binary-erc): Add ChangeLog files.
-
-2005-01-04  Michael Olson  <mwolson@gnu.org>
-
-	* ChangeLog.2001, ChangeLog.2002, ChangeLog.2003, ChangeLog.2004:
-	ChangeLog entries from previous years.
-
-	* ChangeLog: New file containing ChangeLog entries for the current
-	year.  Please update this file manually whenever a change is
-	committed.  This is a new policy.
-
-	* AUTHORS: Add myself to list.  Some entries were space-delimited
-	instead of TAB-delimited, and since the latter seemed to be the
-	default, make the other entries conform.
-
-	* HACKING (ChangeLog Entries): Update section to reflect new
-	policy toward ChangeLog entries, which is that they should be
-	manually updated whenever a change is committed.
-
-2005-01-04  Diane Murray <disumu@x3y2z1.net>
-
-	* erc.el (erc-connection-established, erc-login): Update the
-	mode-line.
-	(erc-update-mode-line-buffer): If `erc-current-nick' returns nil,
-	use an empty string for ?n character in format spec.  Set
-	`mode-line-process' to ":connecting" while the connection is being
-	established.
-
-2005-01-04  Lawrence Mitchell <wence@gmx.li>
-
-	* AUTHORS: Update list of authors.
-
-2005-01-02  Diane Murray <disumu@x3y2z1.net>
-
-	* erc-goodies.el (erc-control-characters): New customization
-	group.
-	(erc-interpret-controls-p): Small fix, addition to
-	documentation. Updated customization to allow 'remove as a value.
-	Use 'erc-control-characters as `:group'.
-	(erc-interpret-mirc-color): Use 'erc-control-characters as
-	`:group'.
-	(erc-beep-p): Updated documentation.  Use 'erc-control-characters
-	as `:group'.
-	(define-erc-module irccontrols): Add `erc-controls-highlight' to
-	`erc-insert-modify-hook' and `erc-send-modify-hook' since it
-	changes the text's appearance.
-	(erc-controls-remove-regexp, erc-controls-interpret-regexp): New
-	variables.
-	(erc-controls-highlight): Fixed so that highlighting works even if
-	there is no following control character.  Fixed mirc color
-	highlighting; now respecting `erc-interpret-mirc-color'.  Fixed a
-	bug where emacs would get stuck in a loop when \C-g was in a
-	message and `erc-beep-p' was set to nil (default setting).
-
-See ChangeLog.2004 for earlier changes.
-
-    Copyright (C) 2005 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.
-
-;; Local Variables:
-;; coding: utf-8
-;; End:
-
-;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba
--- a/lisp/erc/erc-autojoin.el	Mon Feb 06 18:44:57 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-;;; erc-autojoin.el --- autojoin channels on connect and reconnects
-
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-
-;; Author: Alex Schroeder <alex@gnu.org>
-;; Keywords: irc
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoJoin
-
-;; 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 allows us to customize an `erc-autojoin-channels-alist'.  As
-;; we /JOIN and /PART channels, this alist is updated to reflect our
-;; current setup, so that when we reconnect, we rejoin the same
-;; channels.  The alist can be customized, so that the customized
-;; value will be used when we reconnect in our next Emacs session.
-
-;;; Code:
-
-(require 'erc)
-(eval-when-compile (require 'cl))
-
-(defgroup erc-autojoin nil
-  "Enable autojoining."
-  :group 'erc)
-
-;;;###autoload (autoload 'erc-autojoin-mode "erc-autojoin" nil t)
-(define-erc-module autojoin nil
-  "Makes ERC autojoin on connects and reconnects."
-  ((add-hook 'erc-after-connect 'erc-autojoin-channels)
-   (add-hook 'erc-server-JOIN-functions 'erc-autojoin-add)
-   (add-hook 'erc-server-PART-functions 'erc-autojoin-remove))
-  ((remove-hook 'erc-after-connect 'erc-autojoin-channels)
-   (remove-hook 'erc-server-JOIN-functions 'erc-autojoin-add)
-   (remove-hook 'erc-server-PART-functions 'erc-autojoin-remove)))
-
-(defcustom erc-autojoin-channels-alist nil
-  "Alist of channels to autojoin on IRC networks.
-Every element in the alist has the form (SERVER . CHANNELS).
-SERVER is a regexp matching the server, and channels is the
-list of channels to join.
-
-Customize this variable to set the value for your first connect.
-Once you are connected and join and part channels, this alist
-keeps track of what channels you are on, and will join them
-again when you get disconnected.  When you restart Emacs, however,
-those changes are lost, and the customization you saved the last
-time is used again."
-  :group 'erc-autojoin
-  :type '(repeat (cons :tag "Server"
-		       (regexp :tag "Name")
-		       (repeat :tag "Channels"
-			       (string :tag "Name")))))
-
-(defcustom erc-autojoin-domain-only t
-  "Truncate host name to the domain name when joining a server.
-If non-nil, and a channel on the server a.b.c is joined, then
-only b.c is used as the server for `erc-autojoin-channels-alist'.
-This is important for networks that redirect you to other
-servers, presumably in the same domain."
-  :group 'erc-autojoin
-  :type 'boolean)
-
-(defun erc-autojoin-channels (server nick)
-  "Autojoin channels in `erc-autojoin-channels-alist'."
-  (dolist (l erc-autojoin-channels-alist)
-    (when (string-match (car l) server)
-      (dolist (chan (cdr l))
-	(erc-server-send (concat "join " chan))))))
-
-(defun erc-autojoin-add (proc parsed)
-  "Add the channel being joined to `erc-autojoin-channels-alist'."
-  (let* ((chnl (erc-response.contents parsed))
-	 (nick (car (erc-parse-user (erc-response.sender parsed))))
-	 (server (with-current-buffer (process-buffer proc)
-		   (or erc-server-announced-name erc-session-server))))
-    (when (erc-current-nick-p nick)
-      (when (and erc-autojoin-domain-only
-		 (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server))
-	(setq server (match-string 1 server)))
-      (let ((elem (assoc server erc-autojoin-channels-alist)))
-	(if elem
-	    (unless (member chnl (cdr elem))
-	      (setcdr elem (cons chnl (cdr elem))))
-	  (setq erc-autojoin-channels-alist
-		(cons (list server chnl)
-		      erc-autojoin-channels-alist))))))
-  ;; We must return nil to tell ERC to continue running the other
-  ;; functions.
-  nil)
-
-;; (erc-parse-user "kensanata!~user@dclient217-162-233-228.hispeed.ch")
-
-(defun erc-autojoin-remove (proc parsed)
-  "Remove the channel being left from `erc-autojoin-channels-alist'."
-  (let* ((chnl (car (erc-response.command-args parsed)))
-	 (nick (car (erc-parse-user (erc-response.sender parsed))))
-	 (server (with-current-buffer (process-buffer proc)
-		   (or erc-server-announced-name erc-session-server))))
-    (when (erc-current-nick-p nick)
-      (when (and erc-autojoin-domain-only
-		 (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server))
-	(setq server (match-string 1 server)))
-      (let ((elem (assoc server erc-autojoin-channels-alist)))
-	(when elem
-	  (setcdr elem (delete chnl (cdr elem)))
-	  (unless (cdr elem)
-	    (setq erc-autojoin-channels-alist
-		  (delete elem erc-autojoin-channels-alist)))))))
-  ;; We must return nil to tell ERC to continue running the other
-  ;; functions.
-  nil)
-
-(provide 'erc-autojoin)
-
-;;; erc-autojoin.el ends here
-;;
-;; Local Variables:
-;; indent-tabs-mode: t
-;; tab-width: 8
-;; End:
-
-;; arch-tag: d62d8b15-8e31-49d6-8a73-12f11e717414
--- a/lisp/erc/erc-complete.el	Mon Feb 06 18:44:57 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-;;; erc-complete.el --- Provides Nick name completion for ERC
-
-;; Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-
-;; Author: Alex Schroeder <alex@gnu.org>
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
-
-;; 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 is obsolete.  Use completion from erc-pcomplete instead.
-;; This file is based on hippie-expand, while the new file is based on
-;; pcomplete.  There is no autoload cookie in this file.  If you want
-;; to use the code in this file, add the following to your ~/.emacs:
-
-;; (autoload 'erc-complete "erc-complete" "Complete nick at point." t)
-
-;;; Code:
-
-(require 'erc)
-(require 'erc-match); for erc-pals
-(require 'hippie-exp); for the hippie expand stuff
-
-;;;###autoload
-(defun erc-complete ()
-  "Complete nick at point.
-See `erc-try-complete-nick' for more technical info.
-This function is obsolete, use `erc-pcomplete' instead."
-  (interactive)
-  (let ((hippie-expand-try-functions-list '(erc-try-complete-nick)))
-    (hippie-expand nil)))
-
-(defgroup erc-old-complete nil
-  "Nick completion.  Obsolete, use erc-pcomplete instead."
-  :group 'erc)
-
-(defcustom erc-nick-completion 'all
-  "Determine how the list of nicks is determined during nick completion.
-See `erc-complete-nick' for information on how to activate this.
-
-pals:   Use `erc-pals'.
-all:    All channel members.
-
-You may also provide your own function that returns a list of completions.
-One example is `erc-nick-completion-exclude-myself',
-or you may use an arbitrary lisp expression."
-  :type '(choice (const :tag "List of pals" pals)
-		 (const :tag "All channel members" all)
-		 (const :tag "All channel members except yourself"
-			erc-nick-completion-exclude-myself)
-		 (repeat :tag "List" (string :tag "Nick"))
-		 function
-		 sexp)
-  :group 'erc-old-complete)
-
-(defcustom erc-nick-completion-ignore-case t
-  "*Non-nil means don't consider case significant in nick completion.
-Case will be automatically corrected when non-nil.
-For instance if you type \"dely TAB\" the word completes and changes to
-\"delYsid\"."
-  :group 'erc-old-complete
-  :type 'boolean)
-
-(defun erc-nick-completion-exclude-myself ()
-  "Get a list of all the channel members except you.
-
-This function returns a list of all the members in the channel, except
-your own nick.  This way if you're named foo and someone is called foobar,
-typing \"f o TAB\" will directly give you foobar.  Use this with
-`erc-nick-completion'."
-  (remove
-   (erc-current-nick)
-   (erc-get-channel-nickname-list)))
-
-(defcustom erc-nick-completion-postfix ": "
-  "*When `erc-complete' is used in the first word after the prompt,
-add this string when a unique expansion was found."
-  :group 'erc-old-complete
-  :type 'string)
-
-(defun erc-command-list ()
-  "Returns a list of strings of the defined user commands."
-  (let ((case-fold-search nil))
-    (mapcar (lambda (x)
-	      (concat "/" (downcase (substring (symbol-name x) 8))))
-	    (apropos-internal "erc-cmd-[A-Z]+"))))
-
-(defun erc-try-complete-nick (old)
-  "Complete nick at point.
-This is a function to put on `hippie-expand-try-functions-list'.
-Then use \\[hippie-expand] to expand nicks.
-The type of completion depends on `erc-nick-completion'."
-  (cond ((eq erc-nick-completion 'pals)
-	 (try-complete-erc-nick old erc-pals))
-	((eq erc-nick-completion 'all)
-	 (try-complete-erc-nick old (append
-				     (erc-get-channel-nickname-list)
-				     (erc-command-list))))
-	((functionp erc-nick-completion)
-	 (try-complete-erc-nick old (funcall erc-nick-completion)))
-	(t
-	 (try-complete-erc-nick old erc-nick-completion))))
-
-(defvar try-complete-erc-nick-window-configuration nil
-  "The window configuration for `try-complete-erc-nick'.
-When called the first time, a window config is stored here,
-and when completion is done, the window config is restored
-from here.  See `try-complete-erc-nick-restore' and
-`try-complete-erc-nick'.")
-
-(defun try-complete-erc-nick-restore ()
-  "Restore window configuration."
-  (if (not try-complete-erc-nick-window-configuration)
-      (when (get-buffer "*Completions*")
-	(delete-windows-on "*Completions*"))
-    (set-window-configuration
-     try-complete-erc-nick-window-configuration)
-    (setq try-complete-erc-nick-window-configuration nil)))
-
-(defun try-complete-erc-nick (old completions)
-  "Try to complete current word depending on `erc-try-complete-nick'.
-The argument OLD has to be nil the first call of this function, and t
-for subsequent calls (for further possible completions of the same
-string).  It returns t if a new completion is found, nil otherwise.  The
-second argument COMPLETIONS is a list of completions to use.  Actually,
-it is only used when OLD is nil.  It will be copied to `he-expand-list'
-on the first call.  After that, it is no longer used.
-Window configurations are stored in
-`try-complete-erc-nick-window-configuration'."
-  (let (expansion
-	final
-	(alist (if (consp (car completions))
-		   completions
-		 (mapcar (lambda (s)
-			   (if (and (erc-complete-at-prompt)
-				    (and (not (= (length s) 0))
-					 (not (eq (elt s 0) ?/))))
-			       (list (concat s erc-nick-completion-postfix))
-			     (list (concat s " "))))
-			 completions))) ; make alist if required
-	(completion-ignore-case erc-nick-completion-ignore-case))
-    (he-init-string (he-dabbrev-beg) (point))
-    ;; If there is a string to complete, complete it using alist.
-    ;; expansion is the possible expansion, or t.  If expansion is t
-    ;; or if expansion is the "real" thing, we are finished (final is
-    ;; t).  Take care -- expansion can also be nil!
-    (unless (string= he-search-string "")
-      (setq expansion (try-completion he-search-string alist)
-	    final (or (eq t expansion)
-		      (and expansion
-			   (eq t (try-completion expansion alist))))))
-    (cond ((not expansion)
-	   ;; There is no expansion at all.
-	   (try-complete-erc-nick-restore)
-	   (he-reset-string)
-	   nil)
-	  ((eq t expansion)
-	   ;; The user already has the correct expansion.
-	   (try-complete-erc-nick-restore)
-	   (he-reset-string)
-	   t)
-	  ((and old (string= expansion he-search-string))
-	   ;; This is the second time around and nothing changed,
-	   ;; ie. the user tried to expand something incomplete
-	   ;; without making a choice -- hitting TAB twice, for
-	   ;; example.
-	   (try-complete-erc-nick-restore)
-	   (he-reset-string)
-	   nil)
-	  (final
-	   ;; The user has found the correct expansion.
-	   (try-complete-erc-nick-restore)
-	   (he-substitute-string expansion)
-	   t)
-	  (t
-	   ;; We found something but we are not finished.  Show a
-	   ;; completions buffer.  Substitute what we found and return
-	   ;; t.
-	   (setq try-complete-erc-nick-window-configuration
-		 (current-window-configuration))
-	   (with-output-to-temp-buffer "*Completions*"
-	     (display-completion-list (all-completions he-search-string alist)))
-	   (he-substitute-string expansion)
-	   t))))
-
-(defun erc-at-beginning-of-line-p (point &optional bol-func)
-  (save-excursion
-    (funcall (or bol-func
-		 'erc-bol))
-    (equal point (point))))
-
-(defun erc-complete-at-prompt ()
-  "Returns t if point is directly after `erc-prompt' when doing completion."
-  (erc-at-beginning-of-line-p (he-dabbrev-beg)))
-
-(provide 'erc-complete)
-
-;;; erc-complete.el ends here
-;;
-;; Local Variables:
-;; indent-tabs-mode: t
-;; tab-width: 8
-;; End:
-
-;; arch-tag: 3be13ee8-8fdb-41ab-83c2-6582c757b91e
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/erc/erc-hecomplete.el	Sun Feb 12 00:15:44 2006 +0000
@@ -0,0 +1,225 @@
+;;; erc-hecomplete.el --- Provides Nick name completion for ERC
+
+;; Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+
+;; Author: Alex Schroeder <alex@gnu.org>
+;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
+
+;; 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 is considered obsolete.  It is recommended to use
+;; completion from erc-pcomplete instead.
+
+;; This file is based on hippie-expand, while the new file is based on
+;; pcomplete.
+
+;;; Code:
+
+(require 'erc)
+(require 'erc-match); for erc-pals
+(require 'hippie-exp); for the hippie expand stuff
+
+;;;###autoload (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t)
+(define-erc-module hecomplete nil
+  "Complete nick at point."
+  ((add-hook 'erc-complete-functions 'erc-hecomplete))
+  ((remove-hook 'erc-complete-functions 'erc-hecomplete)))
+
+(defun erc-hecomplete ()
+  "Complete nick at point.
+See `erc-try-complete-nick' for more technical info.
+This function is obsolete, use `erc-pcomplete' instead."
+  (interactive)
+  (let ((hippie-expand-try-functions-list '(erc-try-complete-nick)))
+    (hippie-expand nil)))
+
+(defgroup erc-hecomplete nil
+  "Nick completion.  It is recommended to use erc-pcomplete instead."
+  :group 'erc)
+
+(defcustom erc-nick-completion 'all
+  "Determine how the list of nicks is determined during nick completion.
+See `erc-complete-nick' for information on how to activate this.
+
+pals:   Use `erc-pals'.
+all:    All channel members.
+
+You may also provide your own function that returns a list of completions.
+One example is `erc-nick-completion-exclude-myself',
+or you may use an arbitrary lisp expression."
+  :type '(choice (const :tag "List of pals" pals)
+		 (const :tag "All channel members" all)
+		 (const :tag "All channel members except yourself"
+			erc-nick-completion-exclude-myself)
+		 (repeat :tag "List" (string :tag "Nick"))
+		 function
+		 sexp)
+  :group 'erc-hecomplete)
+
+(defcustom erc-nick-completion-ignore-case t
+  "*Non-nil means don't consider case significant in nick completion.
+Case will be automatically corrected when non-nil.
+For instance if you type \"dely TAB\" the word completes and changes to
+\"delYsid\"."
+  :group 'erc-hecomplete
+  :type 'boolean)
+
+(defun erc-nick-completion-exclude-myself ()
+  "Get a list of all the channel members except you.
+
+This function returns a list of all the members in the channel, except
+your own nick.  This way if you're named foo and someone is called foobar,
+typing \"f o TAB\" will directly give you foobar.  Use this with
+`erc-nick-completion'."
+  (remove
+   (erc-current-nick)
+   (erc-get-channel-nickname-list)))
+
+(defcustom erc-nick-completion-postfix ": "
+  "*When `erc-complete' is used in the first word after the prompt,
+add this string when a unique expansion was found."
+  :group 'erc-hecomplete
+  :type 'string)
+
+(defun erc-command-list ()
+  "Returns a list of strings of the defined user commands."
+  (let ((case-fold-search nil))
+    (mapcar (lambda (x)
+	      (concat "/" (downcase (substring (symbol-name x) 8))))
+	    (apropos-internal "erc-cmd-[A-Z]+"))))
+
+(defun erc-try-complete-nick (old)
+  "Complete nick at point.
+This is a function to put on `hippie-expand-try-functions-list'.
+Then use \\[hippie-expand] to expand nicks.
+The type of completion depends on `erc-nick-completion'."
+  (cond ((eq erc-nick-completion 'pals)
+	 (try-complete-erc-nick old erc-pals))
+	((eq erc-nick-completion 'all)
+	 (try-complete-erc-nick old (append
+				     (erc-get-channel-nickname-list)
+				     (erc-command-list))))
+	((functionp erc-nick-completion)
+	 (try-complete-erc-nick old (funcall erc-nick-completion)))
+	(t
+	 (try-complete-erc-nick old erc-nick-completion))))
+
+(defvar try-complete-erc-nick-window-configuration nil
+  "The window configuration for `try-complete-erc-nick'.
+When called the first time, a window config is stored here,
+and when completion is done, the window config is restored
+from here.  See `try-complete-erc-nick-restore' and
+`try-complete-erc-nick'.")
+
+(defun try-complete-erc-nick-restore ()
+  "Restore window configuration."
+  (if (not try-complete-erc-nick-window-configuration)
+      (when (get-buffer "*Completions*")
+	(delete-windows-on "*Completions*"))
+    (set-window-configuration
+     try-complete-erc-nick-window-configuration)
+    (setq try-complete-erc-nick-window-configuration nil)))
+
+(defun try-complete-erc-nick (old completions)
+  "Try to complete current word depending on `erc-try-complete-nick'.
+The argument OLD has to be nil the first call of this function, and t
+for subsequent calls (for further possible completions of the same
+string).  It returns t if a new completion is found, nil otherwise.  The
+second argument COMPLETIONS is a list of completions to use.  Actually,
+it is only used when OLD is nil.  It will be copied to `he-expand-list'
+on the first call.  After that, it is no longer used.
+Window configurations are stored in
+`try-complete-erc-nick-window-configuration'."
+  (let (expansion
+	final
+	(alist (if (consp (car completions))
+		   completions
+		 (mapcar (lambda (s)
+			   (if (and (erc-complete-at-prompt)
+				    (and (not (= (length s) 0))
+					 (not (eq (elt s 0) ?/))))
+			       (list (concat s erc-nick-completion-postfix))
+			     (list (concat s " "))))
+			 completions))) ; make alist if required
+	(completion-ignore-case erc-nick-completion-ignore-case))
+    (he-init-string (he-dabbrev-beg) (point))
+    ;; If there is a string to complete, complete it using alist.
+    ;; expansion is the possible expansion, or t.  If expansion is t
+    ;; or if expansion is the "real" thing, we are finished (final is
+    ;; t).  Take care -- expansion can also be nil!
+    (unless (string= he-search-string "")
+      (setq expansion (try-completion he-search-string alist)
+	    final (or (eq t expansion)
+		      (and expansion
+			   (eq t (try-completion expansion alist))))))
+    (cond ((not expansion)
+	   ;; There is no expansion at all.
+	   (try-complete-erc-nick-restore)
+	   (he-reset-string)
+	   nil)
+	  ((eq t expansion)
+	   ;; The user already has the correct expansion.
+	   (try-complete-erc-nick-restore)
+	   (he-reset-string)
+	   t)
+	  ((and old (string= expansion he-search-string))
+	   ;; This is the second time around and nothing changed,
+	   ;; ie. the user tried to expand something incomplete
+	   ;; without making a choice -- hitting TAB twice, for
+	   ;; example.
+	   (try-complete-erc-nick-restore)
+	   (he-reset-string)
+	   nil)
+	  (final
+	   ;; The user has found the correct expansion.
+	   (try-complete-erc-nick-restore)
+	   (he-substitute-string expansion)
+	   t)
+	  (t
+	   ;; We found something but we are not finished.  Show a
+	   ;; completions buffer.  Substitute what we found and return
+	   ;; t.
+	   (setq try-complete-erc-nick-window-configuration
+		 (current-window-configuration))
+	   (with-output-to-temp-buffer "*Completions*"
+	     (display-completion-list (all-completions he-search-string alist)))
+	   (he-substitute-string expansion)
+	   t))))
+
+(defun erc-at-beginning-of-line-p (point &optional bol-func)
+  (save-excursion
+    (funcall (or bol-func
+		 'erc-bol))
+    (equal point (point))))
+
+(defun erc-complete-at-prompt ()
+  "Returns t if point is directly after `erc-prompt' when doing completion."
+  (erc-at-beginning-of-line-p (he-dabbrev-beg)))
+
+(provide 'erc-hecomplete)
+
+;;; erc-hecomplete.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:
+
+;; arch-tag: 3be13ee8-8fdb-41ab-83c2-6582c757b91e
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/erc/erc-join.el	Sun Feb 12 00:15:44 2006 +0000
@@ -0,0 +1,139 @@
+;;; erc-join.el --- autojoin channels on connect and reconnects
+
+;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+
+;; Author: Alex Schroeder <alex@gnu.org>
+;; Keywords: irc
+;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoJoin
+
+;; 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 allows us to customize an `erc-autojoin-channels-alist'.  As
+;; we /JOIN and /PART channels, this alist is updated to reflect our
+;; current setup, so that when we reconnect, we rejoin the same
+;; channels.  The alist can be customized, so that the customized
+;; value will be used when we reconnect in our next Emacs session.
+
+;;; Code:
+
+(require 'erc)
+(eval-when-compile (require 'cl))
+
+(defgroup erc-autojoin nil
+  "Enable autojoining."
+  :group 'erc)
+
+;;;###autoload (autoload 'erc-autojoin-mode "erc-join" nil t)
+(define-erc-module autojoin nil
+  "Makes ERC autojoin on connects and reconnects."
+  ((add-hook 'erc-after-connect 'erc-autojoin-channels)
+   (add-hook 'erc-server-JOIN-functions 'erc-autojoin-add)
+   (add-hook 'erc-server-PART-functions 'erc-autojoin-remove))
+  ((remove-hook 'erc-after-connect 'erc-autojoin-channels)
+   (remove-hook 'erc-server-JOIN-functions 'erc-autojoin-add)
+   (remove-hook 'erc-server-PART-functions 'erc-autojoin-remove)))
+
+(defcustom erc-autojoin-channels-alist nil
+  "Alist of channels to autojoin on IRC networks.
+Every element in the alist has the form (SERVER . CHANNELS).
+SERVER is a regexp matching the server, and channels is the
+list of channels to join.
+
+Customize this variable to set the value for your first connect.
+Once you are connected and join and part channels, this alist
+keeps track of what channels you are on, and will join them
+again when you get disconnected.  When you restart Emacs, however,
+those changes are lost, and the customization you saved the last
+time is used again."
+  :group 'erc-autojoin
+  :type '(repeat (cons :tag "Server"
+		       (regexp :tag "Name")
+		       (repeat :tag "Channels"
+			       (string :tag "Name")))))
+
+(defcustom erc-autojoin-domain-only t
+  "Truncate host name to the domain name when joining a server.
+If non-nil, and a channel on the server a.b.c is joined, then
+only b.c is used as the server for `erc-autojoin-channels-alist'.
+This is important for networks that redirect you to other
+servers, presumably in the same domain."
+  :group 'erc-autojoin
+  :type 'boolean)
+
+(defun erc-autojoin-channels (server nick)
+  "Autojoin channels in `erc-autojoin-channels-alist'."
+  (dolist (l erc-autojoin-channels-alist)
+    (when (string-match (car l) server)
+      (dolist (chan (cdr l))
+	(erc-server-send (concat "join " chan))))))
+
+(defun erc-autojoin-add (proc parsed)
+  "Add the channel being joined to `erc-autojoin-channels-alist'."
+  (let* ((chnl (erc-response.contents parsed))
+	 (nick (car (erc-parse-user (erc-response.sender parsed))))
+	 (server (with-current-buffer (process-buffer proc)
+		   (or erc-server-announced-name erc-session-server))))
+    (when (erc-current-nick-p nick)
+      (when (and erc-autojoin-domain-only
+		 (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server))
+	(setq server (match-string 1 server)))
+      (let ((elem (assoc server erc-autojoin-channels-alist)))
+	(if elem
+	    (unless (member chnl (cdr elem))
+	      (setcdr elem (cons chnl (cdr elem))))
+	  (setq erc-autojoin-channels-alist
+		(cons (list server chnl)
+		      erc-autojoin-channels-alist))))))
+  ;; We must return nil to tell ERC to continue running the other
+  ;; functions.
+  nil)
+
+;; (erc-parse-user "kensanata!~user@dclient217-162-233-228.hispeed.ch")
+
+(defun erc-autojoin-remove (proc parsed)
+  "Remove the channel being left from `erc-autojoin-channels-alist'."
+  (let* ((chnl (car (erc-response.command-args parsed)))
+	 (nick (car (erc-parse-user (erc-response.sender parsed))))
+	 (server (with-current-buffer (process-buffer proc)
+		   (or erc-server-announced-name erc-session-server))))
+    (when (erc-current-nick-p nick)
+      (when (and erc-autojoin-domain-only
+		 (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server))
+	(setq server (match-string 1 server)))
+      (let ((elem (assoc server erc-autojoin-channels-alist)))
+	(when elem
+	  (setcdr elem (delete chnl (cdr elem)))
+	  (unless (cdr elem)
+	    (setq erc-autojoin-channels-alist
+		  (delete elem erc-autojoin-channels-alist)))))))
+  ;; We must return nil to tell ERC to continue running the other
+  ;; functions.
+  nil)
+
+(provide 'erc-join)
+
+;;; erc-join.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:
+
+;; arch-tag: d62d8b15-8e31-49d6-8a73-12f11e717414
--- a/lisp/erc/erc-list.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/erc/erc-list.el	Sun Feb 12 00:15:44 2006 +0000
@@ -32,7 +32,7 @@
 ;;; Code:
 
 (require 'erc)
-(require 'erc-nets)
+(require 'erc-networks)
 (require 'sort)
 (unless (fboundp 'make-overlay)
   (require 'overlay))
--- a/lisp/erc/erc-nets.el	Mon Feb 06 18:44:57 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,861 +0,0 @@
-;;; erc-nets.el --- IRC networks
-
-;; Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
-
-;; 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 deals with IRC networks.
-;;
-;; Usage:
-;;
-;; Put into your .emacs:
-;;
-;; (require 'erc-nets)
-;;
-;; M-x erc-server-select provides an alternative way to connect to servers by
-;; choosing networks.
-;; You can use (eq (erc-network) 'Network) if you'd like to set variables or do
-;; certain actions according to which network you're connected to.
-;; If a network you use is not listed in `erc-networks-alist', you can put
-;; (add-to-list 'erc-networks-alist '(Network "irc.server-name.net")) in your
-;; config file.
-
-;;; Code:
-
-(require 'erc)
-(eval-when-compile (require 'cl))
-
-;; Variables
-
-(defgroup erc-networks nil
-  "IRC Networks"
-  :group 'erc)
-
-(defcustom erc-server-alist
-'(("4-irc: Random server" 4-irc "4-irc.com" 6667)
-  ("A5KNet: Random server" A5KNet "irc.a5knet.com" ((6660 6669)))
-  ("AbleNet: Random server" AbleNet "irc.ablenet.org" 6667)
-  ("Accessirc: Random server" Accessirc "irc.accessirc.net" 6667)
-  ("Acestar: Random server" Acestar "irc.acestar.org" 6667)
-  ("Action-IRC: Random server" Action-IRC "irc.action-irc.net" ((6660 6669)))
-  ("AfterNET: Random server" AfterNET "irc.afternet.org" 6667)
-  ("Alternativenet: Random server" Alternativenet "irc.altnet.org" 6667)
-  ("AmigaNet: Random server" AmigaNet "irc.amiganet.org" 6667)
-  ("AngelEyez: Random server" AngelEyez "irc.angeleyez.net" ((6666 7000)))
-  ("AnotherNet: Random server" Anothernet "irc.another.net" (6667 7000 ))
-  ("ArabChat: Random server" ArabChat "irc.arabchat.org" ((6660 6667)))
-  ("AsiaTalk: Random server" AsiaTalk "irc.asiatalk.org" ((6667 6669) 7000 ))
-  ("AstroLink: Random server" AstroLink "irc.astrolink.org" ((6660 6667)))
-  ("Asylumnet: Random server" Asylumnet "irc.asylum-net.org" ((6661 6669) 7000 7777 ))
-  ("Austnet: Random AU server" Austnet "au.austnet.org" 6667)
-  ("Austnet: Random NZ server" Austnet "nz.austnet.org" 6667)
-  ("Austnet: Random SG server" Austnet "sg.austnet.org" 6667)
-  ("Austnet: Random US server" Austnet "us.austnet.org" 6667)
-  ("AwesomeChat: Random server" AwesomeChat "irc.awesomechat.net" ((6661 6669)))
-  ("Awesomechristians: Random server" Awesomechristians "irc.awesomechristians.com" 7000)
-  ("Axenet: Random server" Axenet "irc.axenet.org" ((6660 6667)))
-  ("BeyondIRC: Random server" Beyondirc "irc.beyondirc.net" ((6660 6669)))
-  ("BGIRC: Random server" BGIRC "irc.bulgaria.org" ((6666 6669) 7000 ))
-  ("Blabbernet: Random server" Blabbernet "irc.blabber.net" (6667 7000 ))
-  ("Blitzed: Random server" Blitzed "irc.blitzed.org" (6667 7000 ))
-  ("Brasirc: Random server" Brasirc "irc.brasirc.net" ((6666 6667)))
-  ("Brasirc: BR, PA, Belem" Brasirc "irc.libnet.com.br" ((6666 6668) 7777 8002 ))
-  ("BRASnet: Random European server" BRASnet "eu.brasnet.org" ((6665 6669)))
-  ("BRASnet: Random US server" BRASnet "us.brasnet.org" ((6665 6669)))
-  ("BubbleNet: Random server" BubbleNet "irc.bubblenet.org" ((6667 6669)))
-  ("CCnet: Random server" CCnet "irc.cchat.net" (6667 7000 ))
-  ("CCnet: US, TX, Dallas" CCnet "irc2.cchat.net" (6667 7000 ))
-  ("Chat-Net: Random server" Chat-Net "irc.chat-net.org" 6667)
-  ("Chat-Solutions: Random server" Chat-Solutions "irc.chat-solutions.org" 6667)
-  ("Chatcafe: Random server" Chatcafe "irc.chatcafe.net" 6667)
-  ("Chatchannel: Random server" Chatchannel "irc.chatchannel.org" ((6666 6669) 7000 ))
-  ("ChatCircuit: Random server" ChatCircuit "irc.chatcircuit.com" 6668)
-  ("Chatlink: Random server" Chatlink "irc.chatlink.org" 6667)
-  ("Chatnet: Random AU server" Chatnet "au.chatnet.org" 6667)
-  ("Chatnet: Random EU server" Chatnet "eu.chatnet.org" 6667)
-  ("Chatnet: Random US server" Chatnet "us.chatnet.org" 6667)
-  ("ChatNut: Random server" ChatNut "irc.chatnut.net" (6667 7000 ))
-  ("Chatpinoy: Random server" Chatpinoy "irc.chatpinoy.com" 6667)
-  ("ChatPR: Random server" ChatPR "irc.chatpr.org" 6667)
-  ("Chatroom: Random server" Chatroom "irc.chatroom.org" 6667)
-  ("Chatster: Random server" Chatster "irc.chatster.org" 6667)
-  ("ChatX: Random server" ChatX "irc.chatx.net" 6667)
-  ("China263: Random server" China263 "irc.263.net" 6667)
-  ("Cineplex1: Random server" Cineplex1 "irc.cineplex1.com" ((6666 6668)))
-  ("CNN: CNN News discussions" CNN "chat.cnn.com" ((6667 6669) 7000 ))
-  ("CobraNet: Random server" CobraNet "irc.cobra.net" 6667)
-  ("Coolchat: Random server" Coolchat "irc.coolchat.net" 6667)
-  ("Criten: Random server" Criten "irc.criten.net" 6667)
-  ("Cyberchat: Random server" Cyberchat "irc.cyberchat.org" (6667 6668 ))
-  ("CyGanet: Random server" CyGanet "irc.cyga.net" 6667)
-  ("DALnet: AS, MY, Coins" DALnet "coins.dal.net" ((6663 6668) 7000 ))
-  ("DALnet: CA, ON, Sodre" DALnet "sodre.on.ca.dal.net" ((6661 6669) 7000 ))
-  ("DALnet: EU, DE, Nexgo" DALnet "nexgo.de.eu.dal.net" ((6664 6669) 7000 ))
-  ("DALnet: EU, NO, Powertech" DALnet "powertech.no.eu.dal.net" ((6666 6667) 7000 ))
-  ("DALnet: EU, SE, Borg" DALnet "borg.se.eu.dal.net" (6667 7000 ))
-  ("DALnet: EU, SE, Ced" DALnet "ced.se.eu.dal.net" (6667 7000 ))
-  ("DALnet: US, GA, Astro" DALnet "astro.ga.us.dal.net" ((6661 6669) 7000 ))
-  ("DALnet: US, GA, Dragons" DALnet "dragons.ga.us.dal.net" ((6661 6669) 7000 ))
-  ("DALnet: US, GA, Elysium" DALnet "elysium.ga.us.dal.net" ((6661 6669) 7000 ))
-  ("DALnet: US, MA, Twisted" DALnet "twisted.ma.us.dal.net" ((6660 6669) 7001 7002 ))
-  ("DALnet: US, MO, Global" DALnet "global.mo.us.dal.net" ((6661 6669) 7000 ))
-  ("DALnet: US, NJ, Liberty" DALnet "liberty.nj.us.dal.net" ((6662 6669) 7000 ))
-  ("DALnet: US, VA, Wombat" DALnet "wombat.va.us.dal.net" ((6661 6669) 7000 ))
-  ("DALnet: Random EU server" DALnet "irc.eu.dal.net" 6667)
-  ("DALnet: Random US server" DALnet "irc.dal.net" ((6660 6667)))
-  ("Dark-Tou-Net: Random server" Dark-Tou-Net "irc.d-t-net.de" 6667)
-  ("Darkfire: Random server" Darkfire "irc.darkfire.net" (6667 7000 8000 ))
-  ("DarkMyst: Random server" DarkMyst "irc.darkmyst.org" 6667)
-  ("Darkserv: Random server" Darkserv "irc.darkserv.net" 6667)
-  ("Darksystem: Random server" Darksystem "irc.darksystem.com" 6667)
-  ("Darktree: Random server" Darktree "irc.darktree.net" 6667)
-  ("DayNet: Random server" DayNet "irc.daynet.org" 6667)
-  ("Deepspace: Disability network" Deepspace "irc.deepspace.org" 6667)
-  ("Different: Random server" Different "irc.different.net" 6667)
-  ("Digarix: Random server" Digarix "irc.digarix.net" 6667)
-  ("Digatech: Random server" Digatech "irc.digatech.net" 6667)
-  ("Digital-Base: Random server" Digital-Base "irc.digital-base.net" ((6660 7000)))
-  ("Digitalirc: Random server" Digitalirc "irc.digitalirc.net" 6667)
-  ("Discussioni: Random server" Discussioni "irc.discussioni.org" ((6666 6669)))
-  ("DorukNet: TR, Istanbul" DorukNet "irc.doruk.net.tr" ((6660 6669) 7000 8888 ))
-  ("Dreamcast: Random server" Dreamcast "irc0.dreamcast.com" 6667)
-  ("DWChat: Random server" DWChat "irc.dwchat.net" 6667)
-  ("Dynastynet: Random server" Dynastynet "irc.dynastynet.net" 6667)
-  ("EFnet: CA, AB, Edmonton (arcti)" EFnet "irc.arcti.ca" 6667)
-  ("EFnet: CA, AB, Edmonton (mpls)" EFnet "irc.mpls.ca" ((6660 6669)))
-  ("EFnet: CA, ON, Toronto" EFnet "irc2.magic.ca" 6667)
-  ("EFnet: CA, QB, Montreal" EFnet "irc.qeast.net" 6667)
-  ("EFnet: EU, DK, Aarhus" EFnet "irc.inet.tele.dk" 6667)
-  ("EFnet: EU, FI, Helsinki" EFnet "efnet.cs.hut.fi" 6667)
-  ("EFnet: EU, FR, Paris" EFnet "irc.isdnet.fr" ((6667 6669)))
-  ("EFnet: EU, NL, Amsterdam" EFnet "efnet.vuurwerk.nl" 6667)
-  ("EFnet: EU, NO, Homelien" EFnet "irc.homelien.no" (5190 (6666 6667) (7000 7001) ))
-  ("EFnet: EU, NO, Oslo" EFnet "irc.daxnet.no" ((6666 7000)))
-  ("EFnet: EU, PL, Warszawa" EFnet "irc.efnet.pl" 6667)
-  ("EFnet: EU, RU, Moscow" EFnet "irc.rt.ru" ((6661 6669)))
-  ("EFnet: EU, SE, Dalarna" EFnet "irc.du.se" ((6666 6669)))
-  ("EFnet: EU, SE, Gothenberg" EFnet "irc.hemmet.chalmers.se" ((6666 7000)))
-  ("EFnet: EU, SE, Sweden" EFnet "irc.light.se" 6667)
-  ("EFnet: EU, UK, London (carrier)" EFnet "irc.carrier1.net.uk" ((6666 6669)))
-  ("EFnet: EU, UK, London (demon)" EFnet "efnet.demon.co.uk" ((6665 6669)))
-  ("EFnet: ME, IL, Inter" EFnet "irc.inter.net.il" ((6665 6669)))
-  ("EFnet: US, AZ, Phoenix" EFnet "irc.easynews.com" (6660 (6665 6667) 7000 ))
-  ("EFnet: US, CA, San Jose" EFnet "irc.concentric.net" ((6665 6668)))
-  ("EFnet: US, CA, San Luis Obispo" EFnet "irc.prison.net" ((6666 6667)))
-  ("EFnet: US, GA, Atlanta" EFnet "irc.mindspring.com" ((6660 6669)))
-  ("EFnet: US, MI, Ann Arbor" EFnet "irc.umich.edu" 6667)
-  ("EFnet: US, MN, Twin Cities" EFnet "irc.umn.edu" ((6665 6669)))
-  ("EFnet: US, NY, Mineola" EFnet "irc.lightning.net" ((6665 7000)))
-  ("EFnet: US, NY, New York (east)" EFnet "irc.east.gblx.net" 6667)
-  ("EFnet: US, NY, New York (flamed)" EFnet "irc.flamed.net" ((6665 6669)))
-  ("EFnet: US, TX, Houston" EFnet "ircd.lagged.org" ((6660 6669)))
-  ("EFnet: US, VA, Ashburn" EFnet "irc.secsup.uu.net" ((6665 6669) 8080 ))
-  ("EFnet: Random AU server" EFnet "au.rr.efnet.net" 6667)
-  ("EFnet: Random CA server" EFnet "ca.rr.efnet.net" 6667)
-  ("EFnet: Random EU server" EFnet "eu.rr.efnet.net" 6667)
-  ("EFnet: Random US server" EFnet "us.rr.efnet.net" 6667)
-  ("EgyptianIRC: Random server" EgyptianIRC "irc.egyptianirc.net" ((6667 6669)))
-  ("Eircnet: Random server" Eircnet "irc.eircnet.org" ((6660 6669) 7000 ))
-  ("Eleethal: Random server" Eleethal "irc.eleethal.com" ((6660 6669) 7000 ))
-  ("EntertheGame: Random server" EntertheGame "irc.enterthegame.com" ((6667 6669)))
-  ("EpiKnet: Random server" EpiKnet "irc.epiknet.org" ((6660 6669) 7000 7001 ))
-  ("EsperNet: Random server" EsperNet "irc.esper.net" (5555 (6667 6669) ))
-  ("Esprit: Random server" Esprit "irc.esprit.net" 6667)
-  ("euIRC: Random server" euIRC "irc.euirc.net" ((6665 6669)))
-  ("Evilzinc: Random server" Evilzinc "irc.evilzinc.net" ((6660 6669) 7000 8000 ))
-  ("ExodusIRC: Random server" ExodusIRC "irc.exodusirc.net" ((6660 6669)))
-  ("FDFnet: Random server" FDFnet "irc.fdfnet.net" ((6666 6668) 9999 ))
-  ("FEFnet: Random server" FEFnet "irc.fef.net" 6667)
-  ("Financialchat: Random server" Financialchat "irc.financialchat.com" ((6667 6669) 7000 ))
-  ("Forestnet: Random server" Forestnet "irc.forestnet.org" (6667 7000 ))
-  ("ForeverChat: Random server" ForeverChat "irc.foreverchat.net" ((6660 6669) 7000 ))
-  ("Fraggers: Random server" Fraggers "irc.fraggers.co.uk" ((6661 6669) (7000 7001) ))
-  ("FreedomChat: Random server" FreedomChat "chat.freedomchat.net" 6667)
-  ("FreedomIRC: Random server" FreedomIRC "irc.freedomirc.net" 6667)
-  ("Freenode: Random server" freenode "irc.freenode.net" 6667)
-  ("Freenode: Random EU server" freenode "irc.eu.freenode.net" 6667)
-  ("Freenode: Random US server" freenode "irc.us.freenode.net" 6667)
-  ("FunNet: Random server" FunNet "irc.funnet.org" 6667)
-  ("Galaxynet: Random server" GalaxyNet "irc.galaxynet.org" ((6662 6668) 7000 ))
-  ("Galaxynet: AU, NZ, Auckland" GalaxyNet "auckland.nz.galaxynet.org" ((6661 6669)))
-  ("Galaxynet: EU, BE, Online" GalaxyNet "online.be.galaxynet.org" ((6661 6669)))
-  ("Galaxynet: US, FL, Florida" GalaxyNet "gymnet.us.galaxynet.org" ((6661 6669)))
-  ("Gamesnet: Random east US server" Gamesnet "east.gamesnet.net" 6667)
-  ("Gamesnet: Random west US server" Gamesnet "west.gamesnet.net" 6667)
-  ("GammaForce: Random server" GammaForce "irc.gammaforce.org" ((6660 6669) 7000 ))
-  ("GIKInet: Random server" GIKInet "irc.giki.edu.pk" 6667)
-  ("GizNet: Random server" GizNet "irc.giznet.org" ((6666 6669) 7000 ))
-  ("Globalchat: Random server" Globalchat "irc.globalchat.org" 6667)
-  ("GlobIRC: Random server" GlobIRC "irc.globirc.net" ((6666 6668) 9999 ))
-  ("Goldchat: Random server" Goldchat "irc.goldchat.nl" ((6660 6669) 7000 ))
-  ("Goodchatting: Random server" Goodchatting "irc.goodchatting.com" ((6661 6669) 7000 ))
-  ("GravityLords: Random server" GravityLords "irc.gravitylords.net" 6667)
-  ("Grnet: Random EU server" GRnet "gr.irc.gr" (6667 7000 ))
-  ("Grnet: Random server" GRnet "srv.irc.gr" (6667 7000 ))
-  ("Grnet: Random US server" GRnet "us.irc.gr" (6667 7000 ))
-  ("GulfChat: Random server" GulfChat "irc.gulfchat.net" ((6660 6669)))
-  ("HabberNet: Random server" HabberNet "irc.habber.net" 6667)
-  ("HanIRC: Random server" HanIRC "irc.hanirc.org" 6667)
-  ("Hellenicnet: Random server" Hellenicnet "irc.mirc.gr" (6667 7000 ))
-  ("IceNet: Random server" IceNet "irc.icenet.org.za" 6667)
-  ("ICQnet: Random server" ICQnet "irc.icq.com" 6667)
-  ("Infatech: Random server" Infatech "irc.infatech.net" ((6660 6669)))
-  ("Infinity: Random server" Infinity "irc.infinity-irc.org" 6667)
-  ("Infomatrix: Random server" Infomatrix "irc.infomatrix.net" 6667)
-  ("Inside3D: Random server" Inside3D "irc.inside3d.net" ((6661 6669)))
-  ("InterlinkChat: Random server" InterlinkChat "irc.interlinkchat.net" ((6660 6669) 7000 ))
-  ("IRC-Chile: Random server" IRC-Chile "irc.cl" 6667)
-  ("IRC-Hispano: Random server" IRC-Hispano "irc.irc-hispano.org" 6667)
-  ("IRCchat: Random server" IRCchat "irc.ircchat.tk" 6667)
-  ("IRCGate: Random server" IRCGate "irc.ircgate.net" ((6667 6669)))
-  ("IRCGeeks: Random server" IRCGeeks "irc.ircgeeks.org" ((6660 6669)))
-  ("IRChat: Random server" IRChat "irc.irchat.net" ((6660 6669)))
-  ("IrcLordz: Random server" IrcLordz "irc.irclordz.com" 6667)
-  ("IrcMalta: Random server" IrcMalta "irc.ircmalta.org" ((6660 6667)))
-  ("IRCnet: EU, FR, Random" IRCnet "irc.fr.ircnet.net" 6667)
-  ("IRCnet: EU, IT, Random" IRCnet "irc.ircd.it" ((6665 6669)))
-  ("IRCnet: AS, IL, Haifa" IRCnet "ircnet.netvision.net.il" ((6661 6668)))
-  ("IRCnet: AS, JP, Tokyo" IRCnet "irc.tokyo.wide.ad.jp" 6667)
-  ("IRCnet: AS, TW, Seed" IRCnet "irc.seed.net.tw" 6667)
-  ("IRCnet: EU, AT, Linz" IRCnet "linz.irc.at" ((6666 6668)))
-  ("IRCnet: EU, AT, Wien" IRCnet "vienna.irc.at" ((6666 6669)))
-  ("IRCnet: EU, BE, Brussels" IRCnet "irc.belnet.be" 6667)
-  ("IRCnet: EU, BE, Zaventem" IRCnet "ircnet.wanadoo.be" ((6661 6669)))
-  ("IRCnet: EU, CZ, Prague" IRCnet "irc.felk.cvut.cz" 6667)
-  ("IRCnet: EU, DE, Berlin" IRCnet "irc.fu-berlin.de" ((6665 6669)))
-  ("IRCnet: EU, DE, Dusseldorf" IRCnet "irc.freenet.de" ((6665 6669)))
-  ("IRCnet: EU, DE, Stuttgart" IRCnet "irc.belwue.de" ((6665 6669)))
-  ("IRCnet: EU, DK, Copenhagen" IRCnet "irc.ircnet.dk" 6667)
-  ("IRCnet: EU, EE, Tallinn" IRCnet "irc.estpak.ee" ((6666 6668)))
-  ("IRCnet: EU, FI, Helsinki" IRCnet "irc.cs.hut.fi" 6667)
-  ("IRCnet: EU, GR, Thessaloniki" IRCnet "irc.ee.auth.gr" ((6666 6669)))
-  ("IRCnet: EU, HU, Budapest" IRCnet "irc.elte.hu" 6667)
-  ("IRCnet: EU, IS, Reykjavik (ircnet)" IRCnet "irc.ircnet.is" ((6661 6669)))
-  ("IRCnet: EU, IS, Reykjavik (simnet)" IRCnet "irc.simnet.is" ((6661 6669)))
-  ("IRCnet: EU, IT, Rome" IRCnet "irc.tin.it" ((6665 6669)))
-  ("IRCnet: EU, NL, Amsterdam (nlnet)" IRCnet "irc.nl.uu.net" ((6660 6669)))
-  ("IRCnet: EU, NL, Amsterdam (xs4all)" IRCnet "irc.xs4all.nl" ((6660 6669)))
-  ("IRCnet: EU, NL, Enschede" IRCnet "irc.snt.utwente.nl" ((6660 6669)))
-  ("IRCnet: EU, NL, Nijmegen" IRCnet "irc.sci.kun.nl" ((6660 6669)))
-  ("IRCnet: EU, NO, Oslo" IRCnet "irc.ifi.uio.no" 6667)
-  ("IRCnet: EU, NO, Trondheim" IRCnet "irc.pvv.ntnu.no" 6667)
-  ("IRCnet: EU, PL, Lublin" IRCnet "lublin.irc.pl" ((6666 6668)))
-  ("IRCnet: EU, PL, Warsaw" IRCnet "warszawa.irc.pl" ((6666 6668)))
-  ("IRCnet: EU, RU, Moscow" IRCnet "irc.msu.ru" 6667)
-  ("IRCnet: EU, SE, Lulea" IRCnet "irc.ludd.luth.se" ((6661 6669)))
-  ("IRCnet: EU, UK, London (Demon)" IRCnet "ircnet.demon.co.uk" ((6665 6669)))
-  ("IRCnet: EU, UK, London (Easynet)" IRCnet "ircnet.easynet.co.uk" ((6666 6669)))
-  ("IRCnet: US, NY, New York" IRCnet "irc.stealth.net" ((6660 6669)))
-  ("IRCnet: Random AU server" IRCnet "au.ircnet.org" 6667)
-  ("IRCnet: Random EU server" IRCnet "eu.ircnet.org" ((6665 6668)))
-  ("IRCnet: Random US server" IRCnet "us.ircnet.org" ((6665 6668)))
-  ("IRCSoulZ: Random server" IRCSoulZ "irc.ircsoulz.net" 6667)
-  ("IRCSul: BR, PR, Maringa" IRCSul "irc.wnet.com.br" 6667)
-  ("IrcTalk: Random server" IrcTalk "irc.irctalk.net" ((6660 6669)))
-  ("Irctoo: Random server" Irctoo "irc.irctoo.net" 6667)
-  ("IRCtown: Random server" IRCtown "irc.irctown.net" ((6666 6669) 7000 ))
-  ("IRCworld: Random server" IRCworld "irc.ircworld.org" 6667)
-  ("ircXtreme: Random server" ircXtreme "irc.ircXtreme.net" ((6660 6669)))
-  ("Israelnet: Random server" Israelnet "irc.israel.net" 6667)
-  ("K0wNet: Random server" K0wNet "irc.k0w.net" ((6660 6669)))
-  ("KDFSnet: Random server" KDFSnet "irc.kdfs.net" ((6667 6669)))
-  ("Kemik: Random server" Kemik "irc.kemik.net" 6667)
-  ("Kewl.Org: Random server" Kewl.Org "irc.kewl.org" (6667 7000 ))
-  ("Kickchat: Random server" Kickchat "irc.kickchat.com" ((6660 6669) 7000 ))
-  ("Kidsworld: Random server" KidsWorld "irc.kidsworld.org" ((6666 6669)))
-  ("Knightnet: AF, ZA, Durban" Knightnet "orc.dbn.za.knightnet.net" (6667 5555 ))
-  ("Knightnet: US, CA, Goldengate" Knightnet "goldengate.ca.us.knightnet.net" (6667 5555 ))
-  ("Konfido.Net: Random server" Konfido.Net "irc.konfido.net" 6667)
-  ("KreyNet: Random server" Kreynet "irc.krey.net" 6667)
-  ("Krono: Random server" Krono "irc.krono.net" ((6660 6669) 7000 ))
-  ("Krushnet: Random server" Krushnet "irc.krushnet.org" 6667)
-  ("LagNet: Random server" LagNet "irc.lagnet.org.za" 6667)
-  ("LagNet: AF, ZA, Cape Town" LagNet "reaper.lagnet.org.za" 6667)
-  ("LagNet: AF, ZA, Johannesburg" LagNet "mystery.lagnet.org.za" 6667)
-  ("Librenet: Random server" Librenet "irc.librenet.net" 6667)
-  ("LinkNet: Random server" LinkNet "irc.link-net.org" ((6667 6669)))
-  ("Liquidized: Random server" Liquidized "irc.liquidized.net" (6667 7000 ))
-  ("M-IRC: Random server" M-IRC "irc.m-sys.org" ((6667 6669)))
-  ("MagicStar: Random server" MagicStar "irc.magicstar.net" 6667)
-  ("Mavra: Random server" Mavra "irc.mavra.net" 6667)
-  ("MediaDriven: Random server" MediaDriven "irc.mediadriven.com" ((6667 6669)))
-  ("mIRC-X: Random server" mIRC-X "irc.mircx.com" (6667 7000 ))
-  ("Morat: Random server" Morat "irc.morat.net" 6667)
-  ("MusicCity: Random server" MusicCity "chat.musiccity.com" 6667)
-  ("Mysteria: Random server" Mysteria "irc.mysteria.net" (6667 7000 ))
-  ("Mysterychat: Random server" Mysterychat "irc.mysterychat.net" ((6667 6669)))
-  ("Mystical: Random server" Mystical "irc.mystical.net" (6667 7000 ))
-  ("Narancs: Random server" Narancs "irc.narancs.com" ((6667 6669) 7000 ))
-  ("Net-France: Random server" Net-France "irc.net-france.com" 6667)
-  ("Nevernet: Random server" Nevernet "irc.nevernet.net" 6667)
-  ("Newnet: Random server" Newnet "irc.newnet.net" ((6665 6667)))
-  ("Nexusirc: Random server" Nexusirc "irc.nexusirc.org" 6667)
-  ("Nightstar: Random server" NightStar "irc.nightstar.net" ((6665 6669)))
-  ("NitrousNet: Random server" NitrousNet "irc.nitrousnet.net" 6667)
-  ("Novernet: Random server" Novernet "irc.novernet.com" ((6665 6669) 7000 ))
-  ("Nullrouted: Random server" Nullrouted "irc.nullrouted.org" ((6666 6669) 7000 ))
-  ("NullusNet: Random server" NullusNet "irc.nullus.net" 6667)
-  ("OpChat: Random server" OpChat "irc.opchat.org" ((6667 6669)))
-  ("Othernet: Random server" Othernet "irc.othernet.org" 6667)
-  ("Othernet: US, FL, Miami" Othernet "miami.fl.us.othernet.org" 6667)
-  ("Othernet: US, MO, StLouis" Othernet "stlouis.mo.us.othernet.org" 6667)
-  ("Otherside: Random server" OtherSide "irc.othersideirc.net" 6667)
-  ("Outsiderz: Random server" Outsiderz "irc.outsiderz.com" 6667)
-  ("OzOrg: AU, Perth" OzOrg "iinet.perth.oz.org" 6667)
-  ("Peacefulhaven: Random server" Peacefulhaven "irc.peacefulhaven.net" ((6660 6669) 7000 ))
-  ("PhazedIRC: Random server" PhazedIRC "irc.phazedirc.net" 6667)
-  ("Philchat: Random server" Philchat "irc.philchat.net" 6667)
-  ("phrozN: Random server" phrozN "irc.phrozn.net" 6667)
-  ("PiNet: Random server" PiNet "irc.praetorians.org" ((6665 6669)))
-  ("Pinoycentral: Random server" Pinoycentral "chat.abs-cbn.com" 6667)
-  ("Planetarion: Random server" Planetarion "irc.planetarion.com" 6667)
-  ("POLNet: Random server" POLNet "irc.ircnet.pl" 6667)
-  ("Psionics: CA, PQ, Montreal" Psionics "chat.psionics.net" ((6660 6669)))
-  ("PTirc: Random server" PTirc "irc.ptirc.com.pt" 6667)
-  ("PTlink: Random server" PTlink "irc.ptlink.net" 6667)
-  ("PTnet: Random server" PTnet "irc.ptnet.org" 6667)
-  ("QChat: Random server" QChat "irc.qchat.net" 6667)
-  ("QuakeNet: Random German server" QuakeNet "de.quakenet.org" ((6667 6669)))
-  ("QuakeNet: Random server" QuakeNet "irc.quakenet.eu.org" ((6667 6669)))
-  ("QuakeNet: Random Swedish server" QuakeNet "se.quakenet.org" ((6667 6669)))
-  ("QuakeNet: Random UK server" QuakeNet "uk.quakenet.org" ((6667 6669)))
-  ("QuakeNet: Random US server" QuakeNet "us.quakenet.org" ((6667 6669)))
-  ("Realirc: Random server" Realirc "irc.realirc.org" 6667)
-  ("RealmNET: Random server" RealmNET "irc.realmnet.com" 6667)
-  ("Rebelchat: Random server" Rebelchat "irc.rebelchat.org" 6667)
-  ("Red-Latina: Random server" Red-Latina "irc.red-latina.org" 6667)
-  ("RedLatona: Random server" RedLatona "irc.redlatona.net" (6667 6668 ))
-  ("Relicnet: Random server" Relicnet "irc.relic.net" 6667)
-  ("Rezosup: Random server" Rezosup "irc.rezosup.org" 6667)
-  ("Risanet: Random server" Risanet "irc.risanet.com" ((6667 6669)))
-  ("Rubiks: Random server" Rubiks "irc.rubiks.net" 6667)
-  ("Rusnet: EU, RU, Tomsk" Rusnet "irc.tsk.ru" ((6667 6669) (7770 7775) ))
-  ("Rusnet: EU, RU, Vladivostok" Rusnet "irc.vladivostok.ru" ((6667 6669) (7770 7775) ))
-  ("Rusnet: EU, UA, Kiev" Rusnet "irc.kar.net" ((6667 6669) (7770 7775) ))
-  ("Sandnet: Random server" Sandnet "irc.sandnet.net" ((6660 6669) 7000 ))
-  ("Scunc: Random server" Scunc "irc.scunc.net" 6667)
-  ("SerbianCafe: Random server" SerbianCafe "irc.serbiancafe.ws" ((6665 6669)))
-  ("SexNet: Random server" SexNet "irc.sexnet.org" 6667)
-  ("ShadowFire: Random server" ShadowFire "irc.shadowfire.org" 6667)
-  ("ShadowWorld: Random server" ShadowWorld "irc.shadowworld.net" 6667)
-  ("SkyNet: Random server" SkyNet "irc.bronowski.pl" ((6666 6668)))
-  ("Slashnet: Random server" Slashnet "irc.slashnet.org" 6667)
-  ("SolarStone: Random server" SolarStone "irc.solarstone.net" ((6660 6669)))
-  ("Sorcerynet: Random server" Sorcery "irc.sorcery.net" (6667 7000 9000 ))
-  ("Sorcerynet: EU, SE, Karlskrona" Sorcery "nexus.sorcery.net" (6667 7000 9000 ))
-  ("Sorcerynet: US, CA, Palo Alto" Sorcery "kechara.sorcery.net" (6667 7000 9000 ))
-  ("SourceIRC: Random server" SourceIRC "irc.sourceirc.net" ((6667 6669) 7000 ))
-  ("SpaceTronix: Random server" SpaceTronix "irc.spacetronix.net" ((6660 6669) 7000 ))
-  ("Spirit-Harmony: Random server" Spirit-Harmony "irc.spirit-harmony.com" ((6661 6669)))
-  ("StarChat: Random server" StarChat "irc.starchat.net" ((6667 6669) 7000 ))
-  ("StarEquinox: Random server" StarEquinox "irc.starequinox.net" ((6660 6669)))
-  ("StarLink: Random server" Starlink "irc.starlink.net" ((6660 6669)))
-  ("StarLink-irc: Random server" starlink-irc "irc.starlink-irc.org" 6667)
-  ("StarWars-IRC: Random server" StarWars-IRC "irc.starwars-irc.net" ((6663 6667)))
-  ("Stormdancing: Random server" Stormdancing "irc.stormdancing.net" ((6664 6669) 7000 9000 ))
-  ("Superchat: Random server" Superchat "irc.superchat.org" ((6660 6668)))
-  ("Sysopnet: Random server" Sysopnet "irc.sysopnet.org" ((6666 6668)))
-  ("Telstra: Random server" Telstra "irc.telstra.com" ((6667 6669)))
-  ("TR-net: EU, TR, Ankara" TR-net "irc.dominet.com.tr" 6667)
-  ("TR-net: EU, Tr, Istanbul" TR-net "irc.teklan.com.tr" 6667)
-  ("Tri-net: Random server" Tri-net "irc.tri-net.org" 6667)
-  ("TriLink: Random server" TriLink "irc.ft4u.net" 6667)
-  ("TurkishChat: Random server" TurkishChat "irc.turkishchat.org" ((6660 6669) 7000 ))
-  ("UberNinja: Random server" UberNinja "irc.uberninja.net" ((6667 6669)))
-  ("UICN: Random server" UICN "irc.uicn.net" 6667)
-  ("UltraIRC: Random server" UltraIRC "irc.ultrairc.net" 6667)
-  ("UnderChat: Random server" UnderChat "irc.underchat.it" ((6660 6669) 7000 ))
-  ("Undernet: CA, ON, Toronto" Undernet "toronto.on.ca.undernet.org" ((6661 6669)))
-  ("Undernet: CA, QC, Montreal" Undernet "montreal.qu.ca.undernet.org" ((6660 6669)))
-  ("Undernet: EU, AT, Graz" Undernet "graz.at.eu.undernet.org" ((6661 6669)))
-  ("Undernet: EU, BE, Antwerp" Undernet "flanders.be.eu.undernet.org" ((6660 6669)))
-  ("Undernet: EU, BE, Brussels" Undernet "brussels.be.eu.undernet.org" 6667)
-  ("Undernet: EU, CH, Geneva" Undernet "geneva.ch.eu.undernet.org" ((6660 6669) 7777 8000 ))
-  ("Undernet: EU, FR, Caen" Undernet "caen.fr.eu.undernet.org" ((6666 6669)))
-  ("Undernet: EU, NL, Diemen" Undernet "diemen.nl.eu.undernet.org" ((6660 6669)))
-  ("Undernet: EU, NL, Haarlem" Undernet "haarlem.nl.eu.undernet.org" ((6660 6669)))
-  ("Undernet: EU, NO, Oslo" Undernet "oslo.no.eu.undernet.org" ((6660 6669)))
-  ("Undernet: EU, SE, Stockholm" Undernet "stockholm.se.eu.undernet.org" ((6666 6669)))
-  ("Undernet: EU, UK, Surrey" Undernet "surrey.uk.eu.undernet.org" ((6660 6669)))
-  ("Undernet: US, AZ, Mesa" Undernet "mesa.az.us.undernet.org" ((6665 6667)))
-  ("Undernet: US, CA, San Diego" Undernet "sandiego.ca.us.undernet.org" ((6660 6670)))
-  ("Undernet: US, DC, Washington" Undernet "washington.dc.us.undernet.org" ((6660 6669)))
-  ("Undernet: US, KS, Manhattan" Undernet "manhattan.ks.us.undernet.org" ((6660 6669)))
-  ("Undernet: US, NV, Las Vegas" Undernet "lasvegas.nv.us.undernet.org" ((6660 6669)))
-  ("Undernet: US, TX, Austin" Undernet "austin.tx.us.undernet.org" ((6660 6669)))
-  ("Undernet: US, UT, Saltlake" Undernet "saltlake.ut.us.undernet.org" ((6660 6669)))
-  ("Undernet: US, VA, Arlington" Undernet "arlington.va.us.undernet.org" ((6660 6669)))
-  ("Undernet: US, VA, McLean" Undernet "mclean.va.us.undernet.org" ((6666 6669)))
-  ("Undernet: Random EU server" Undernet "eu.undernet.org" 6667)
-  ("Undernet: Random US server" Undernet "us.undernet.org" 6667)
-  ("UnderZ: Random server" UnderZ "irc.underz.org" ((6667 6668)))
-  ("UniChat: Random server" UniChat "irc.uni-chat.net" 6667)
-  ("UnionLatina: Random server" UnionLatina "irc.unionlatina.org" 6667)
-  ("Univers: Random server" Univers "irc.univers.org" ((6665 6669)))
-  ("UnixR: Random server" UnixR "irc.unixr.net" ((6667 6669)))
-  ("Vidgamechat: Random server" Vidgamechat "irc.vidgamechat.com" 6667)
-  ("VirtuaNet: Random server" VirtuaNet "irc.virtuanet.org" ((6660 6669) 7000 ))
-  ("Vitamina: Random server" Vitamina "irc.vitamina.ca" 6667)
-  ("Voila: Random server" Voila "irc.voila.fr" 6667)
-  ("Wahou: Random server" Wahou "irc.wahou.org" ((6665 6669)))
-  ("Warpednet: Random server" Warpednet "irc.warped.net" 6667)
-  ("Weaklinks: Random server" Weaklinks "irc.weaklinks.net" ((6667 6669)))
-  ("Webnet: Random server" Webnet "irc.webchat.org" ((6667 6669) 7000 ))
-  ("Webnet: US, CA, Santa Clara" Webnet "webmaster.ca.us.webchat.org" ((6661 6669)))
-  ("WinChat: Random server" WinChat "irc.winchat.net" ((6661 6669)))
-  ("WinIRC: Random server" WinIRC "irc.winirc.org" ((6667 6669) 4400 ))
-  ("WorldIRC: Random server" WorldIRC "irc.worldirc.org" ((6660 6667)))
-  ("WyldRyde: Random server" WyldRyde "irc.wyldryde.net" ((6666 6669)))
-  ("XentoniX: Random server" XentoniX "irc.xentonix.net" ((6661 6669)))
-  ("Xevion: Random server" Xevion "irc.xevion.net" (6667 7000 ))
-  ("XNet: Random server" XNet "irc.xnet.org" 6667)
-  ("XWorld: Random server" XWorld "irc.xworld.org" 6667)
-  ("ZAnet Net: Random server" ZAnetNet "irc.zanet.net" 6667)
-  ("ZAnet Org: UK, London" ZAnetOrg "mystic.zanet.org.za" 6667)
-  ("ZiRC: Random server" ZiRC "irc.zirc.org" ((6660 6669)))
-  ("ZUHnet: Random server" ZUHnet "irc.zuh.net" 6667)
-  ("Zurna: Random server" Zurna "irc.zurna.net" 6667))
-  "Alist of irc servers. (NAME NET HOST PORTS) where
-NAME is a name for that server,
-NET is a symbol indicating to which network from `erc-networks-alist' this
-  server corresponds,
-HOST is the servers hostname and
-PORTS is either a number, a list of numbers, or a list of port ranges."
-  :group 'erc-networks
-  :type 'sexp)
-
-(defcustom erc-networks-alist
-  '((4-irc "4-irc.com")
-    (A5KNet "a5knet.com")
-    (AbleNet "ablenet.org")
-    (Accessirc "accessirc.net")
-    (Acestar "acestar.org")
-    (Action-IRC "action-irc.net")
-    (AfterNET "afternet.org")
-    (Alternativenet "altnet.org")
-    (AmigaNet "amiganet.org")
-    (AngelEyez "angeleyez.net")
-    (Anothernet "another.net")
-    (ArabChat "arabchat.org")
-    (AsiaTalk "asiatalk.org")
-    (AstroLink "astrolink.org")
-    (Asylumnet "asylumnet.org")
-    (Austnet "austnet.org")
-    (AwesomeChat "awesomechat.net")
-    (Awesomechristians "awesomechristians.com")
-    (Axenet "axenet.org")
-    (Beyondirc "beyondirc.net")
-    (BGIRC "bulgaria.org")
-    (Blabbernet "blabber.net")
-    (Blitzed "blitzed.org")
-    (BrasIRC "brasirc.net")
-    (BRASnet "brasnet.org")
-    (BubbleNet "bubblenet.org")
-    (CCnet "christian-chat.net")
-    (Chat-Net "chat-net.org")
-    (Chat-Solutions "chat-solutions.org")
-    (Chatcafe "chatcafe.net")
-    (Chatchannel "chatchannel.org")
-    (ChatCircuit "chatcircuit.com")
-    (Chatlink "chatlink.org")
-    (Chatnet "chatnet.org")
-    (ChatNut "chatnut.net")
-    (Chatpinoy "chatpinoy.com")
-    (ChatPR "chatpr.org")
-    (Chatroom "chatroom.org")
-    (Chatster "chatster.org")
-    (ChatX "chatx.net")
-    (China263 "263.net")
-    (Cineplex1 "cineplex1.com")
-    (CNN "cnn.com")
-    (CobraNet "cobra.net")
-    (Coolchat "coolchat.net")
-    (Criten "criten.net")
-    (Cyberchat "cyberchat.org")
-    (CyGanet "cyga.net")
-    (DALnet "dal.net")
-    (Dark-Tou-Net "d-t-net.de")
-    (Darkfire "darkfire.net")
-    (DarkMyst "darkmyst.org")
-    (Darkserv "darkserv.net")
-    (Darksystem "darksystem.com")
-    (Darktree "darktree.net")
-    (DayNet "daynet.org")
-    (Deepspace "deepspace.org")
-    (Different "different.net")
-    (Digarix "digarix.net")
-    (Digatech "digatech.net")
-    (Digital-Base "digital-base.net")
-    (Digitalirc "digitalirc.net")
-    (Discussioni "discussioni.org")
-    (DorukNet "doruk.net.tr")
-    (DWChat "dwchat.net")
-    (Dynastynet "dynastynet.net")
-    (EFnet nil)
-    (EgyptianIRC "egyptianirc.net")
-    (Eircnet "eircnet.org")
-    (Eleethal "eleethal.com")
-    (EntertheGame "enterthegame.com")
-    (EpiKnet "epiknet.org")
-    (EsperNet "esper.net")
-    (Esprit "esprit.net")
-    (euIRC "euirc.net")
-    (Evilzinc "evilzinc.net")
-    (ExodusIRC "exodusirc.net")
-    (FDFnet "fdfnet.net")
-    (FEFnet "fef.net")
-    (Financialchat "financialchat.com")
-    (Forestnet "forestnet.org")
-    (ForeverChat "foreverchat.net")
-    (Fraggers "fraggers.co.uk")
-    (FreedomChat "freedomchat.net")
-    (FreedomIRC "freedomirc.net")
-    (freenode "freenode.net")
-    (FunNet "funnet.org")
-    (GalaxyNet "galaxynet.org")
-    (Gamesnet "gamesnet.net")
-    (GammaForce "gammaforce.org")
-    (GIKInet "giki.edu.pk")
-    (GizNet "giznet.org")
-    (Globalchat "globalchat.org")
-    (GlobIRC "globirc.net")
-    (Goldchat "goldchat.nl")
-    (Goodchatting "goodchatting.com")
-    (GravityLords "gravitylords.net")
-    (GRnet "irc.gr")
-    (GulfChat "gulfchat.net")
-    (HabberNet "habber.net")
-    (HanIRC "hanirc.org")
-    (Hellenicnet "mirc.gr")
-    (IceNet "icenet.org.za")
-    (ICQnet "icq.com")
-    (iip "anon.iip")
-    (Infatech "infatech.net")
-    (Infinity "infinity-irc.org")
-    (Infomatrix "infomatrix.net")
-    (Inside3D "inside3d.net")
-    (InterlinkChat "interlinkchat.net")
-    (IRC-Chile "irc.cl")
-    (IRC-Hispano "irc-hispano.org")
-    (IRCchat "ircchat.tk")
-    (IRCGate "ircgate.net")
-    (IRCGeeks "ircgeeks.org")
-    (IRChat "irchat.net")
-    (IrcLordz "irclordz.com")
-    (IrcMalta "ircmalta.org")
-    (IRCnet nil)
-    (IRCSoulZ "ircsoulz.net")
-    (IRCSul "wnet.com.br")
-    (IrcTalk "irctalk.net")
-    (Irctoo "irctoo.net")
-    (IRCtown "irc.irctown.net")
-    (IRCworld "ircworld.org")
-    (ircXtreme "ircXtreme.net")
-    (Israelnet "israel.net")
-    (K0wNet "k0w.net")
-    (KDFSnet "kdfs.net")
-    (Kemik "kemik.net")
-    (Kewl\.Org "kewl.org")
-    (Kickchat "kickchat.com")
-    (KidsWorld "kidsworld.org")
-    (Knightnet "knightnet.net")
-    (Konfido\.Net "konfido.net")
-    (Kreynet "krey.net")
-    (Krono "krono.net")
-    (Krushnet "krushnet.org")
-    (LagNet "lagnet.org.za")
-    (Librenet "librenet.net")
-    (LinkNet "link-net.org")
-    (Liquidized "liquidized.net")
-    (M-IRC "m-sys.org")
-    (MagicStar "magicstar.net")
-    (Mavra "mavra.net")
-    (MediaDriven "mediadriven.com")
-    (mIRC-X "mircx.com")
-    (Morat "morat.net")
-    (MusicCity "musiccity.com")
-    (Mysteria "mysteria.net")
-    (Mysterychat "mysterychat.net")
-    (Mystical "mystical.net")
-    (Narancs "narancs.com")
-    (Net-France "net-france.com")
-    (Nevernet "nevernet.net")
-    (Newnet "newnet.net")
-    (Nexusirc "nexusirc.org")
-    (NightStar "nightstar.net")
-    (NitrousNet "nitrousnet.net")
-    (Novernet "novernet.com")
-    (Nullrouted "nullrouted.org")
-    (NullusNet "nullus.net")
-    (OpChat "opchat.org")
-    (Openprojects "openprojects.net")
-    (Othernet "othernet.org")
-    (OtherSide "othersideirc.net")
-    (Outsiderz "outsiderz.com")
-    (OzOrg "oz.org")
-    (Peacefulhaven "peacefulhaven.net")
-    (PhazedIRC "phazedirc.net")
-    (Philchat "philchat.net")
-    (phrozN "phrozn.net")
-    (PiNet "praetorians.org")
-    (Pinoycentral "abs-cbn.com")
-    (Planetarion "planetarion.com")
-    (POLNet "ircnet.pl")
-    (Psionics "psionics.net")
-    (PTirc "ptirc.com.pt")
-    (PTlink "ptlink.net")
-    (PTnet "ptnet.org")
-    (QChat "qchat.net")
-    (QuakeNet "quakenet.org")
-    (Realirc "realirc.org")
-    (RealmNET "realmnet.com")
-    (Rebelchat "rebelchat.org")
-    (Red-Latina "red-latina.org")
-    (RedLatona "redlatona.net")
-    (Relicnet "relic.net")
-    (Rezosup "rezosup.org")
-    (Risanet "risanet.com")
-    (Rubiks "rubiks.net")
-    (Rusnet "nil")
-    (Sandnet "sandnet.net")
-    (Scunc "scunc.net")
-    (SerbianCafe "serbiancafe.ws")
-    (SexNet "sexnet.org")
-    (ShadowFire "shadowfire.org")
-    (ShadowWorld "shadowworld.net")
-    (SkyNet "bronowski.pl")
-    (SlashNET "slashnet.org")
-    (SolarStone "solarstone.net")
-    (Sorcery "sorcery.net")
-    (SourceIRC "sourceirc.net")
-    (SpaceTronix "spacetronix.net")
-    (Spirit-Harmony "spirit-harmony.com")
-    (StarChat "starchat.net")
-    (StarEquinox "starequinox.net")
-    (Starlink "starlink.net")
-    (starlink-irc "starlink-irc.org")
-    (StarWars-IRC "starwars-irc.net")
-    (Stormdancing "stormdancing.net")
-    (Superchat "superchat.org")
-    (Sysopnet "sysopnet.org")
-    (Telstra "telstra.com")
-    (TR-net "dominet.com.tr")
-    (Tri-net "tri-net.org")
-    (TriLink "ft4u.net")
-    (TurkishChat "turkishchat.org")
-    (UberNinja "uberninja.net")
-    (UICN "uicn.net")
-    (UltraIRC "ultrairc.net")
-    (UnderChat "underchat.it")
-    (Undernet "undernet.org")
-    (UnderZ "underz.org")
-    (UniChat "irc.uni-chat.net")
-    (UnionLatina "unionlatina.org")
-    (Univers "univers.org")
-    (UnixR "unixr.net")
-    (Vidgamechat "vidgamechat.com")
-    (VirtuaNet "virtuanet.org")
-    (Vitamina "vitamina.ca")
-    (Voila "voila.fr")
-    (Wahou "wf-net.org")
-    (Warpednet "warped.net")
-    (Weaklinks "weaklinks.net")
-    (Webnet "webchat.org")
-    (WinChat "winchat.net")
-    (WinIRC "winirc.org")
-    (WorldIRC "worldirc.org")
-    (WyldRyde "wyldryde.net")
-    (XentoniX "xentonix.net")
-    (Xevion "xevion.net")
-    (XNet "xnet.org")
-    (XWorld "xworld.org")
-    (ZAnetNet "zanet.net")
-    (ZAnetOrg "zanet.org.za")
-    (ZiRC "zirc.org")
-    (ZUHnet "zuh.net")
-    (Zurna "zurna.net"))
-  "Alist of IRC networks. (NET MATCHER) where
-NET is a symbol naming that IRC network and
-MATCHER is used to find a corresponding network to a server while connected to
-  it. If it is regexp, it's used to match against `erc-server-announced-name'.
-  It can also be a function (predicate). Then it is executed with the
-  server buffer as current-buffer."
-  :group 'erc-networks
-  :type '(repeat
-	  (list :tag "Network"
-		(symbol :tag "Network name")
-		(choice :tag "Network's common server ending"
-		 (regexp)
-		 (const :tag "Network has no common server ending" nil)))))
-
-(defvar erc-network nil
-  "The name of the network you are connected to (a symbol).")
-(make-variable-buffer-local 'erc-network)
-
-;; Functions:
-
-;;;###autoload
-(defun erc-determine-network ()
-  "Return the name of the network or \"Unknown\" as a symbol.  Use the
-server parameter NETWORK if provided, otherwise parse the server name and
-search for a match in `erc-networks-alist'."
-  ;; The server made it easy for us and told us the name of the NETWORK
-  (if (assoc "NETWORK" erc-server-parameters)
-      (intern (cdr (assoc "NETWORK" erc-server-parameters)))
-    (or
-     ;; Loop through `erc-networks-alist' looking for a match.
-     (let ((server (or erc-server-announced-name erc-session-server)))
-       (loop for (name matcher) in erc-networks-alist
-	     when (and matcher
-		       (string-match (concat matcher "\\'") server))
-	     do (return name)))
-     'Unknown)))
-
-(defun erc-network ()
-  "Return the value of `erc-network' for the current server."
-  (with-current-buffer (erc-server-buffer) erc-network))
-
-(defun erc-current-network ()
-  "Deprecated.  Use `erc-network' instead.  Return the name of this server's
-network as a symbol."
-  (with-current-buffer (erc-server-buffer)
-    (intern (downcase (symbol-name erc-network)))))
-
-(erc-make-obsolete 'erc-current-network 'erc-network
-		   "Obsolete since erc-nets 1.5")
-
-(defun erc-network-name ()
-  "Returns the name of the current network as a string."
-  (with-current-buffer (erc-server-buffer) (symbol-name erc-network)))
-
-(defun erc-set-network-name (proc parsed)
-  "Set `erc-network' to the value returned by `erc-determine-network'."
-  (unless erc-server-connected
-    (setq erc-network (erc-determine-network)))
-  nil)
-
-(defun erc-unset-network-name (nick ip reason)
-  "Set `erc-network' to nil."
-  (setq erc-network nil)
-  nil)
-
-(add-hook 'erc-server-375-functions 'erc-set-network-name)
-(add-hook 'erc-server-422-functions 'erc-set-network-name)
-(add-hook 'erc-disconnected-hook 'erc-unset-network-name)
-
-(defun erc-ports-list (ports)
-  "Return a list of PORTS.
-
-PORTS should be a list of either:
-  A number, in which case it is returned a list.
-  Or a pair of the form (LOW HIGH), in which case, a list of all the
-  numbers between LOW and HIGH (inclusive) is returned.
-
-As an example:
-  (erc-ports-list '(1)) => (1)
-  (erc-ports-list '((1 5))) => (1 2 3 4 5)
-  (erc-ports-list '(1 (3 5))) => (1 3 4 5)"
-  (let (result)
-    (dolist (p ports)
-      (cond ((numberp p)
-	     (push p result))
-	    ((listp p)
-	     (setq result (nconc (loop for i from (cadr p) downto (car p)
-				       collect i)
-				 result)))))
-    (nreverse result)))
-
-;;;###autoload
-(defun erc-server-select ()
-  "Interactively select a server to connect to using `erc-server-alist'."
-  (interactive)
-  (let* ((completion-ignore-case t)
-	 (net (intern
-	       (completing-read "Network: "
-				(erc-delete-dups
-				 (mapcar (lambda (x)
-					   (list (symbol-name (nth 1 x))))
-					 erc-server-alist)))))
-	 (srv (assoc
-	       (completing-read "Server: "
-				(delq nil
-				      (mapcar (lambda (x)
-						(when (equal (nth 1 x) net)
-						  x))
-					      erc-server-alist)))
-	       erc-server-alist))
-	 (host (nth 2 srv))
-	 (ports (if (listp (nth 3 srv))
-		    (erc-ports-list (nth 3 srv))
-		  (list (nth 3 srv))))
-	 (port (nth (random (length ports)) ports)))
-    (erc host port erc-nick erc-user-full-name t)))
-
-;;; The following experimental
-;; It does not work yet, help me with it if you
-;; think it is worth the effort.
-
-(defvar erc-settings
-  '((pals freenode ("kensanata" "shapr" "anti\\(fuchs\\|gone\\)"))
-    (format-nick-function (freenode "#emacs") erc-format-@nick))
-  "Experimental: Alist of configuration options.
-The format is (VARNAME SCOPE VALUE) where
-VARNAME is a symbol identifying the configuration option,
-SCOPE is either a symbol which identifies an entry from
-  `erc-networks-alist' or a list (NET TARGET) where NET is a network symbol and
-  TARGET is a string identifying the channel/query target.
-VALUE is the options value.")
-
-(defun erc-get (var &optional net target)
-  (let ((items erc-settings)
-	elt val)
-    (while items
-      (setq elt (car items)
-	    items (cdr items))
-      (when (eq (car elt) var)
-	(cond ((and net target (listp (nth 1 elt))
-		    (eq net (car (nth 1 elt)))
-		    (string-equal target (nth 1 (nth 1 elt))))
-	       (setq val (nth 2 elt)
-		     items nil))
-	      ((and net (eq net (nth 1 elt)))
-	       (setq val (nth 2 elt)
-		     items nil))
-	      ((and (not net) (not target) (not (nth 1 elt)))
-	       (setq val (nth 2 elt)
-		     items nil)))))
-    val))
-
-(erc-get 'pals 'freenode)
-
-
-(provide 'erc-nets)
-
-;;; erc-nets.el ends here
-;;
-;; Local Variables:
-;; indent-tabs-mode: t
-;; tab-width: 8
-;; End:
-
-;; arch-tag: 68cccabd-f66b-456c-9abe-5f993a2dc91c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/erc/erc-networks.el	Sun Feb 12 00:15:44 2006 +0000
@@ -0,0 +1,860 @@
+;;; erc-networks.el --- IRC networks
+
+;; Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+
+;; 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 deals with IRC networks.
+;;
+;; Usage:
+;;
+;; Put into your .emacs:
+;;
+;; (require 'erc-networks)
+;;
+;; M-x erc-server-select provides an alternative way to connect to servers by
+;; choosing networks.
+;; You can use (eq (erc-network) 'Network) if you'd like to set variables or do
+;; certain actions according to which network you're connected to.
+;; If a network you use is not listed in `erc-networks-alist', you can put
+;; (add-to-list 'erc-networks-alist '(Network "irc.server-name.net")) in your
+;; config file.
+
+;;; Code:
+
+(require 'erc)
+(eval-when-compile (require 'cl))
+
+;; Variables
+
+(defgroup erc-networks nil
+  "IRC Networks"
+  :group 'erc)
+
+(defcustom erc-server-alist
+'(("4-irc: Random server" 4-irc "4-irc.com" 6667)
+  ("A5KNet: Random server" A5KNet "irc.a5knet.com" ((6660 6669)))
+  ("AbleNet: Random server" AbleNet "irc.ablenet.org" 6667)
+  ("Accessirc: Random server" Accessirc "irc.accessirc.net" 6667)
+  ("Acestar: Random server" Acestar "irc.acestar.org" 6667)
+  ("Action-IRC: Random server" Action-IRC "irc.action-irc.net" ((6660 6669)))
+  ("AfterNET: Random server" AfterNET "irc.afternet.org" 6667)
+  ("Alternativenet: Random server" Alternativenet "irc.altnet.org" 6667)
+  ("AmigaNet: Random server" AmigaNet "irc.amiganet.org" 6667)
+  ("AngelEyez: Random server" AngelEyez "irc.angeleyez.net" ((6666 7000)))
+  ("AnotherNet: Random server" Anothernet "irc.another.net" (6667 7000 ))
+  ("ArabChat: Random server" ArabChat "irc.arabchat.org" ((6660 6667)))
+  ("AsiaTalk: Random server" AsiaTalk "irc.asiatalk.org" ((6667 6669) 7000 ))
+  ("AstroLink: Random server" AstroLink "irc.astrolink.org" ((6660 6667)))
+  ("Asylumnet: Random server" Asylumnet "irc.asylum-net.org" ((6661 6669) 7000 7777 ))
+  ("Austnet: Random AU server" Austnet "au.austnet.org" 6667)
+  ("Austnet: Random NZ server" Austnet "nz.austnet.org" 6667)
+  ("Austnet: Random SG server" Austnet "sg.austnet.org" 6667)
+  ("Austnet: Random US server" Austnet "us.austnet.org" 6667)
+  ("AwesomeChat: Random server" AwesomeChat "irc.awesomechat.net" ((6661 6669)))
+  ("Awesomechristians: Random server" Awesomechristians "irc.awesomechristians.com" 7000)
+  ("Axenet: Random server" Axenet "irc.axenet.org" ((6660 6667)))
+  ("BeyondIRC: Random server" Beyondirc "irc.beyondirc.net" ((6660 6669)))
+  ("BGIRC: Random server" BGIRC "irc.bulgaria.org" ((6666 6669) 7000 ))
+  ("Blabbernet: Random server" Blabbernet "irc.blabber.net" (6667 7000 ))
+  ("Blitzed: Random server" Blitzed "irc.blitzed.org" (6667 7000 ))
+  ("Brasirc: Random server" Brasirc "irc.brasirc.net" ((6666 6667)))
+  ("Brasirc: BR, PA, Belem" Brasirc "irc.libnet.com.br" ((6666 6668) 7777 8002 ))
+  ("BRASnet: Random European server" BRASnet "eu.brasnet.org" ((6665 6669)))
+  ("BRASnet: Random US server" BRASnet "us.brasnet.org" ((6665 6669)))
+  ("BubbleNet: Random server" BubbleNet "irc.bubblenet.org" ((6667 6669)))
+  ("CCnet: Random server" CCnet "irc.cchat.net" (6667 7000 ))
+  ("CCnet: US, TX, Dallas" CCnet "irc2.cchat.net" (6667 7000 ))
+  ("Chat-Net: Random server" Chat-Net "irc.chat-net.org" 6667)
+  ("Chat-Solutions: Random server" Chat-Solutions "irc.chat-solutions.org" 6667)
+  ("Chatcafe: Random server" Chatcafe "irc.chatcafe.net" 6667)
+  ("Chatchannel: Random server" Chatchannel "irc.chatchannel.org" ((6666 6669) 7000 ))
+  ("ChatCircuit: Random server" ChatCircuit "irc.chatcircuit.com" 6668)
+  ("Chatlink: Random server" Chatlink "irc.chatlink.org" 6667)
+  ("Chatnet: Random AU server" Chatnet "au.chatnet.org" 6667)
+  ("Chatnet: Random EU server" Chatnet "eu.chatnet.org" 6667)
+  ("Chatnet: Random US server" Chatnet "us.chatnet.org" 6667)
+  ("ChatNut: Random server" ChatNut "irc.chatnut.net" (6667 7000 ))
+  ("Chatpinoy: Random server" Chatpinoy "irc.chatpinoy.com" 6667)
+  ("ChatPR: Random server" ChatPR "irc.chatpr.org" 6667)
+  ("Chatroom: Random server" Chatroom "irc.chatroom.org" 6667)
+  ("Chatster: Random server" Chatster "irc.chatster.org" 6667)
+  ("ChatX: Random server" ChatX "irc.chatx.net" 6667)
+  ("China263: Random server" China263 "irc.263.net" 6667)
+  ("Cineplex1: Random server" Cineplex1 "irc.cineplex1.com" ((6666 6668)))
+  ("CNN: CNN News discussions" CNN "chat.cnn.com" ((6667 6669) 7000 ))
+  ("CobraNet: Random server" CobraNet "irc.cobra.net" 6667)
+  ("Coolchat: Random server" Coolchat "irc.coolchat.net" 6667)
+  ("Criten: Random server" Criten "irc.criten.net" 6667)
+  ("Cyberchat: Random server" Cyberchat "irc.cyberchat.org" (6667 6668 ))
+  ("CyGanet: Random server" CyGanet "irc.cyga.net" 6667)
+  ("DALnet: AS, MY, Coins" DALnet "coins.dal.net" ((6663 6668) 7000 ))
+  ("DALnet: CA, ON, Sodre" DALnet "sodre.on.ca.dal.net" ((6661 6669) 7000 ))
+  ("DALnet: EU, DE, Nexgo" DALnet "nexgo.de.eu.dal.net" ((6664 6669) 7000 ))
+  ("DALnet: EU, NO, Powertech" DALnet "powertech.no.eu.dal.net" ((6666 6667) 7000 ))
+  ("DALnet: EU, SE, Borg" DALnet "borg.se.eu.dal.net" (6667 7000 ))
+  ("DALnet: EU, SE, Ced" DALnet "ced.se.eu.dal.net" (6667 7000 ))
+  ("DALnet: US, GA, Astro" DALnet "astro.ga.us.dal.net" ((6661 6669) 7000 ))
+  ("DALnet: US, GA, Dragons" DALnet "dragons.ga.us.dal.net" ((6661 6669) 7000 ))
+  ("DALnet: US, GA, Elysium" DALnet "elysium.ga.us.dal.net" ((6661 6669) 7000 ))
+  ("DALnet: US, MA, Twisted" DALnet "twisted.ma.us.dal.net" ((6660 6669) 7001 7002 ))
+  ("DALnet: US, MO, Global" DALnet "global.mo.us.dal.net" ((6661 6669) 7000 ))
+  ("DALnet: US, NJ, Liberty" DALnet "liberty.nj.us.dal.net" ((6662 6669) 7000 ))
+  ("DALnet: US, VA, Wombat" DALnet "wombat.va.us.dal.net" ((6661 6669) 7000 ))
+  ("DALnet: Random EU server" DALnet "irc.eu.dal.net" 6667)
+  ("DALnet: Random US server" DALnet "irc.dal.net" ((6660 6667)))
+  ("Dark-Tou-Net: Random server" Dark-Tou-Net "irc.d-t-net.de" 6667)
+  ("Darkfire: Random server" Darkfire "irc.darkfire.net" (6667 7000 8000 ))
+  ("DarkMyst: Random server" DarkMyst "irc.darkmyst.org" 6667)
+  ("Darkserv: Random server" Darkserv "irc.darkserv.net" 6667)
+  ("Darksystem: Random server" Darksystem "irc.darksystem.com" 6667)
+  ("Darktree: Random server" Darktree "irc.darktree.net" 6667)
+  ("DayNet: Random server" DayNet "irc.daynet.org" 6667)
+  ("Deepspace: Disability network" Deepspace "irc.deepspace.org" 6667)
+  ("Different: Random server" Different "irc.different.net" 6667)
+  ("Digarix: Random server" Digarix "irc.digarix.net" 6667)
+  ("Digatech: Random server" Digatech "irc.digatech.net" 6667)
+  ("Digital-Base: Random server" Digital-Base "irc.digital-base.net" ((6660 7000)))
+  ("Digitalirc: Random server" Digitalirc "irc.digitalirc.net" 6667)
+  ("Discussioni: Random server" Discussioni "irc.discussioni.org" ((6666 6669)))
+  ("DorukNet: TR, Istanbul" DorukNet "irc.doruk.net.tr" ((6660 6669) 7000 8888 ))
+  ("Dreamcast: Random server" Dreamcast "irc0.dreamcast.com" 6667)
+  ("DWChat: Random server" DWChat "irc.dwchat.net" 6667)
+  ("Dynastynet: Random server" Dynastynet "irc.dynastynet.net" 6667)
+  ("EFnet: CA, AB, Edmonton (arcti)" EFnet "irc.arcti.ca" 6667)
+  ("EFnet: CA, AB, Edmonton (mpls)" EFnet "irc.mpls.ca" ((6660 6669)))
+  ("EFnet: CA, ON, Toronto" EFnet "irc2.magic.ca" 6667)
+  ("EFnet: CA, QB, Montreal" EFnet "irc.qeast.net" 6667)
+  ("EFnet: EU, DK, Aarhus" EFnet "irc.inet.tele.dk" 6667)
+  ("EFnet: EU, FI, Helsinki" EFnet "efnet.cs.hut.fi" 6667)
+  ("EFnet: EU, FR, Paris" EFnet "irc.isdnet.fr" ((6667 6669)))
+  ("EFnet: EU, NL, Amsterdam" EFnet "efnet.vuurwerk.nl" 6667)
+  ("EFnet: EU, NO, Homelien" EFnet "irc.homelien.no" (5190 (6666 6667) (7000 7001) ))
+  ("EFnet: EU, NO, Oslo" EFnet "irc.daxnet.no" ((6666 7000)))
+  ("EFnet: EU, PL, Warszawa" EFnet "irc.efnet.pl" 6667)
+  ("EFnet: EU, RU, Moscow" EFnet "irc.rt.ru" ((6661 6669)))
+  ("EFnet: EU, SE, Dalarna" EFnet "irc.du.se" ((6666 6669)))
+  ("EFnet: EU, SE, Gothenberg" EFnet "irc.hemmet.chalmers.se" ((6666 7000)))
+  ("EFnet: EU, SE, Sweden" EFnet "irc.light.se" 6667)
+  ("EFnet: EU, UK, London (carrier)" EFnet "irc.carrier1.net.uk" ((6666 6669)))
+  ("EFnet: EU, UK, London (demon)" EFnet "efnet.demon.co.uk" ((6665 6669)))
+  ("EFnet: ME, IL, Inter" EFnet "irc.inter.net.il" ((6665 6669)))
+  ("EFnet: US, AZ, Phoenix" EFnet "irc.easynews.com" (6660 (6665 6667) 7000 ))
+  ("EFnet: US, CA, San Jose" EFnet "irc.concentric.net" ((6665 6668)))
+  ("EFnet: US, CA, San Luis Obispo" EFnet "irc.prison.net" ((6666 6667)))
+  ("EFnet: US, GA, Atlanta" EFnet "irc.mindspring.com" ((6660 6669)))
+  ("EFnet: US, MI, Ann Arbor" EFnet "irc.umich.edu" 6667)
+  ("EFnet: US, MN, Twin Cities" EFnet "irc.umn.edu" ((6665 6669)))
+  ("EFnet: US, NY, Mineola" EFnet "irc.lightning.net" ((6665 7000)))
+  ("EFnet: US, NY, New York (east)" EFnet "irc.east.gblx.net" 6667)
+  ("EFnet: US, NY, New York (flamed)" EFnet "irc.flamed.net" ((6665 6669)))
+  ("EFnet: US, TX, Houston" EFnet "ircd.lagged.org" ((6660 6669)))
+  ("EFnet: US, VA, Ashburn" EFnet "irc.secsup.uu.net" ((6665 6669) 8080 ))
+  ("EFnet: Random AU server" EFnet "au.rr.efnet.net" 6667)
+  ("EFnet: Random CA server" EFnet "ca.rr.efnet.net" 6667)
+  ("EFnet: Random EU server" EFnet "eu.rr.efnet.net" 6667)
+  ("EFnet: Random US server" EFnet "us.rr.efnet.net" 6667)
+  ("EgyptianIRC: Random server" EgyptianIRC "irc.egyptianirc.net" ((6667 6669)))
+  ("Eircnet: Random server" Eircnet "irc.eircnet.org" ((6660 6669) 7000 ))
+  ("Eleethal: Random server" Eleethal "irc.eleethal.com" ((6660 6669) 7000 ))
+  ("EntertheGame: Random server" EntertheGame "irc.enterthegame.com" ((6667 6669)))
+  ("EpiKnet: Random server" EpiKnet "irc.epiknet.org" ((6660 6669) 7000 7001 ))
+  ("EsperNet: Random server" EsperNet "irc.esper.net" (5555 (6667 6669) ))
+  ("Esprit: Random server" Esprit "irc.esprit.net" 6667)
+  ("euIRC: Random server" euIRC "irc.euirc.net" ((6665 6669)))
+  ("Evilzinc: Random server" Evilzinc "irc.evilzinc.net" ((6660 6669) 7000 8000 ))
+  ("ExodusIRC: Random server" ExodusIRC "irc.exodusirc.net" ((6660 6669)))
+  ("FDFnet: Random server" FDFnet "irc.fdfnet.net" ((6666 6668) 9999 ))
+  ("FEFnet: Random server" FEFnet "irc.fef.net" 6667)
+  ("Financialchat: Random server" Financialchat "irc.financialchat.com" ((6667 6669) 7000 ))
+  ("Forestnet: Random server" Forestnet "irc.forestnet.org" (6667 7000 ))
+  ("ForeverChat: Random server" ForeverChat "irc.foreverchat.net" ((6660 6669) 7000 ))
+  ("Fraggers: Random server" Fraggers "irc.fraggers.co.uk" ((6661 6669) (7000 7001) ))
+  ("FreedomChat: Random server" FreedomChat "chat.freedomchat.net" 6667)
+  ("FreedomIRC: Random server" FreedomIRC "irc.freedomirc.net" 6667)
+  ("Freenode: Random server" freenode "irc.freenode.net" 6667)
+  ("Freenode: Random EU server" freenode "irc.eu.freenode.net" 6667)
+  ("Freenode: Random US server" freenode "irc.us.freenode.net" 6667)
+  ("FunNet: Random server" FunNet "irc.funnet.org" 6667)
+  ("Galaxynet: Random server" GalaxyNet "irc.galaxynet.org" ((6662 6668) 7000 ))
+  ("Galaxynet: AU, NZ, Auckland" GalaxyNet "auckland.nz.galaxynet.org" ((6661 6669)))
+  ("Galaxynet: EU, BE, Online" GalaxyNet "online.be.galaxynet.org" ((6661 6669)))
+  ("Galaxynet: US, FL, Florida" GalaxyNet "gymnet.us.galaxynet.org" ((6661 6669)))
+  ("Gamesnet: Random east US server" Gamesnet "east.gamesnet.net" 6667)
+  ("Gamesnet: Random west US server" Gamesnet "west.gamesnet.net" 6667)
+  ("GammaForce: Random server" GammaForce "irc.gammaforce.org" ((6660 6669) 7000 ))
+  ("GIKInet: Random server" GIKInet "irc.giki.edu.pk" 6667)
+  ("GizNet: Random server" GizNet "irc.giznet.org" ((6666 6669) 7000 ))
+  ("Globalchat: Random server" Globalchat "irc.globalchat.org" 6667)
+  ("GlobIRC: Random server" GlobIRC "irc.globirc.net" ((6666 6668) 9999 ))
+  ("Goldchat: Random server" Goldchat "irc.goldchat.nl" ((6660 6669) 7000 ))
+  ("Goodchatting: Random server" Goodchatting "irc.goodchatting.com" ((6661 6669) 7000 ))
+  ("GravityLords: Random server" GravityLords "irc.gravitylords.net" 6667)
+  ("Grnet: Random EU server" GRnet "gr.irc.gr" (6667 7000 ))
+  ("Grnet: Random server" GRnet "srv.irc.gr" (6667 7000 ))
+  ("Grnet: Random US server" GRnet "us.irc.gr" (6667 7000 ))
+  ("GulfChat: Random server" GulfChat "irc.gulfchat.net" ((6660 6669)))
+  ("HabberNet: Random server" HabberNet "irc.habber.net" 6667)
+  ("HanIRC: Random server" HanIRC "irc.hanirc.org" 6667)
+  ("Hellenicnet: Random server" Hellenicnet "irc.mirc.gr" (6667 7000 ))
+  ("IceNet: Random server" IceNet "irc.icenet.org.za" 6667)
+  ("ICQnet: Random server" ICQnet "irc.icq.com" 6667)
+  ("Infatech: Random server" Infatech "irc.infatech.net" ((6660 6669)))
+  ("Infinity: Random server" Infinity "irc.infinity-irc.org" 6667)
+  ("Infomatrix: Random server" Infomatrix "irc.infomatrix.net" 6667)
+  ("Inside3D: Random server" Inside3D "irc.inside3d.net" ((6661 6669)))
+  ("InterlinkChat: Random server" InterlinkChat "irc.interlinkchat.net" ((6660 6669) 7000 ))
+  ("IRC-Chile: Random server" IRC-Chile "irc.cl" 6667)
+  ("IRC-Hispano: Random server" IRC-Hispano "irc.irc-hispano.org" 6667)
+  ("IRCchat: Random server" IRCchat "irc.ircchat.tk" 6667)
+  ("IRCGate: Random server" IRCGate "irc.ircgate.net" ((6667 6669)))
+  ("IRCGeeks: Random server" IRCGeeks "irc.ircgeeks.org" ((6660 6669)))
+  ("IRChat: Random server" IRChat "irc.irchat.net" ((6660 6669)))
+  ("IrcLordz: Random server" IrcLordz "irc.irclordz.com" 6667)
+  ("IrcMalta: Random server" IrcMalta "irc.ircmalta.org" ((6660 6667)))
+  ("IRCnet: EU, FR, Random" IRCnet "irc.fr.ircnet.net" 6667)
+  ("IRCnet: EU, IT, Random" IRCnet "irc.ircd.it" ((6665 6669)))
+  ("IRCnet: AS, IL, Haifa" IRCnet "ircnet.netvision.net.il" ((6661 6668)))
+  ("IRCnet: AS, JP, Tokyo" IRCnet "irc.tokyo.wide.ad.jp" 6667)
+  ("IRCnet: AS, TW, Seed" IRCnet "irc.seed.net.tw" 6667)
+  ("IRCnet: EU, AT, Linz" IRCnet "linz.irc.at" ((6666 6668)))
+  ("IRCnet: EU, AT, Wien" IRCnet "vienna.irc.at" ((6666 6669)))
+  ("IRCnet: EU, BE, Brussels" IRCnet "irc.belnet.be" 6667)
+  ("IRCnet: EU, BE, Zaventem" IRCnet "ircnet.wanadoo.be" ((6661 6669)))
+  ("IRCnet: EU, CZ, Prague" IRCnet "irc.felk.cvut.cz" 6667)
+  ("IRCnet: EU, DE, Berlin" IRCnet "irc.fu-berlin.de" ((6665 6669)))
+  ("IRCnet: EU, DE, Dusseldorf" IRCnet "irc.freenet.de" ((6665 6669)))
+  ("IRCnet: EU, DE, Stuttgart" IRCnet "irc.belwue.de" ((6665 6669)))
+  ("IRCnet: EU, DK, Copenhagen" IRCnet "irc.ircnet.dk" 6667)
+  ("IRCnet: EU, EE, Tallinn" IRCnet "irc.estpak.ee" ((6666 6668)))
+  ("IRCnet: EU, FI, Helsinki" IRCnet "irc.cs.hut.fi" 6667)
+  ("IRCnet: EU, GR, Thessaloniki" IRCnet "irc.ee.auth.gr" ((6666 6669)))
+  ("IRCnet: EU, HU, Budapest" IRCnet "irc.elte.hu" 6667)
+  ("IRCnet: EU, IS, Reykjavik (ircnet)" IRCnet "irc.ircnet.is" ((6661 6669)))
+  ("IRCnet: EU, IS, Reykjavik (simnet)" IRCnet "irc.simnet.is" ((6661 6669)))
+  ("IRCnet: EU, IT, Rome" IRCnet "irc.tin.it" ((6665 6669)))
+  ("IRCnet: EU, NL, Amsterdam (nlnet)" IRCnet "irc.nl.uu.net" ((6660 6669)))
+  ("IRCnet: EU, NL, Amsterdam (xs4all)" IRCnet "irc.xs4all.nl" ((6660 6669)))
+  ("IRCnet: EU, NL, Enschede" IRCnet "irc.snt.utwente.nl" ((6660 6669)))
+  ("IRCnet: EU, NL, Nijmegen" IRCnet "irc.sci.kun.nl" ((6660 6669)))
+  ("IRCnet: EU, NO, Oslo" IRCnet "irc.ifi.uio.no" 6667)
+  ("IRCnet: EU, NO, Trondheim" IRCnet "irc.pvv.ntnu.no" 6667)
+  ("IRCnet: EU, PL, Lublin" IRCnet "lublin.irc.pl" ((6666 6668)))
+  ("IRCnet: EU, PL, Warsaw" IRCnet "warszawa.irc.pl" ((6666 6668)))
+  ("IRCnet: EU, RU, Moscow" IRCnet "irc.msu.ru" 6667)
+  ("IRCnet: EU, SE, Lulea" IRCnet "irc.ludd.luth.se" ((6661 6669)))
+  ("IRCnet: EU, UK, London (Demon)" IRCnet "ircnet.demon.co.uk" ((6665 6669)))
+  ("IRCnet: EU, UK, London (Easynet)" IRCnet "ircnet.easynet.co.uk" ((6666 6669)))
+  ("IRCnet: US, NY, New York" IRCnet "irc.stealth.net" ((6660 6669)))
+  ("IRCnet: Random AU server" IRCnet "au.ircnet.org" 6667)
+  ("IRCnet: Random EU server" IRCnet "eu.ircnet.org" ((6665 6668)))
+  ("IRCnet: Random US server" IRCnet "us.ircnet.org" ((6665 6668)))
+  ("IRCSoulZ: Random server" IRCSoulZ "irc.ircsoulz.net" 6667)
+  ("IRCSul: BR, PR, Maringa" IRCSul "irc.wnet.com.br" 6667)
+  ("IrcTalk: Random server" IrcTalk "irc.irctalk.net" ((6660 6669)))
+  ("Irctoo: Random server" Irctoo "irc.irctoo.net" 6667)
+  ("IRCtown: Random server" IRCtown "irc.irctown.net" ((6666 6669) 7000 ))
+  ("IRCworld: Random server" IRCworld "irc.ircworld.org" 6667)
+  ("ircXtreme: Random server" ircXtreme "irc.ircXtreme.net" ((6660 6669)))
+  ("Israelnet: Random server" Israelnet "irc.israel.net" 6667)
+  ("K0wNet: Random server" K0wNet "irc.k0w.net" ((6660 6669)))
+  ("KDFSnet: Random server" KDFSnet "irc.kdfs.net" ((6667 6669)))
+  ("Kemik: Random server" Kemik "irc.kemik.net" 6667)
+  ("Kewl.Org: Random server" Kewl.Org "irc.kewl.org" (6667 7000 ))
+  ("Kickchat: Random server" Kickchat "irc.kickchat.com" ((6660 6669) 7000 ))
+  ("Kidsworld: Random server" KidsWorld "irc.kidsworld.org" ((6666 6669)))
+  ("Knightnet: AF, ZA, Durban" Knightnet "orc.dbn.za.knightnet.net" (6667 5555 ))
+  ("Knightnet: US, CA, Goldengate" Knightnet "goldengate.ca.us.knightnet.net" (6667 5555 ))
+  ("Konfido.Net: Random server" Konfido.Net "irc.konfido.net" 6667)
+  ("KreyNet: Random server" Kreynet "irc.krey.net" 6667)
+  ("Krono: Random server" Krono "irc.krono.net" ((6660 6669) 7000 ))
+  ("Krushnet: Random server" Krushnet "irc.krushnet.org" 6667)
+  ("LagNet: Random server" LagNet "irc.lagnet.org.za" 6667)
+  ("LagNet: AF, ZA, Cape Town" LagNet "reaper.lagnet.org.za" 6667)
+  ("LagNet: AF, ZA, Johannesburg" LagNet "mystery.lagnet.org.za" 6667)
+  ("Librenet: Random server" Librenet "irc.librenet.net" 6667)
+  ("LinkNet: Random server" LinkNet "irc.link-net.org" ((6667 6669)))
+  ("Liquidized: Random server" Liquidized "irc.liquidized.net" (6667 7000 ))
+  ("M-IRC: Random server" M-IRC "irc.m-sys.org" ((6667 6669)))
+  ("MagicStar: Random server" MagicStar "irc.magicstar.net" 6667)
+  ("Mavra: Random server" Mavra "irc.mavra.net" 6667)
+  ("MediaDriven: Random server" MediaDriven "irc.mediadriven.com" ((6667 6669)))
+  ("mIRC-X: Random server" mIRC-X "irc.mircx.com" (6667 7000 ))
+  ("Morat: Random server" Morat "irc.morat.net" 6667)
+  ("MusicCity: Random server" MusicCity "chat.musiccity.com" 6667)
+  ("Mysteria: Random server" Mysteria "irc.mysteria.net" (6667 7000 ))
+  ("Mysterychat: Random server" Mysterychat "irc.mysterychat.net" ((6667 6669)))
+  ("Mystical: Random server" Mystical "irc.mystical.net" (6667 7000 ))
+  ("Narancs: Random server" Narancs "irc.narancs.com" ((6667 6669) 7000 ))
+  ("Net-France: Random server" Net-France "irc.net-france.com" 6667)
+  ("Nevernet: Random server" Nevernet "irc.nevernet.net" 6667)
+  ("Newnet: Random server" Newnet "irc.newnet.net" ((6665 6667)))
+  ("Nexusirc: Random server" Nexusirc "irc.nexusirc.org" 6667)
+  ("Nightstar: Random server" NightStar "irc.nightstar.net" ((6665 6669)))
+  ("NitrousNet: Random server" NitrousNet "irc.nitrousnet.net" 6667)
+  ("Novernet: Random server" Novernet "irc.novernet.com" ((6665 6669) 7000 ))
+  ("Nullrouted: Random server" Nullrouted "irc.nullrouted.org" ((6666 6669) 7000 ))
+  ("NullusNet: Random server" NullusNet "irc.nullus.net" 6667)
+  ("OpChat: Random server" OpChat "irc.opchat.org" ((6667 6669)))
+  ("Othernet: Random server" Othernet "irc.othernet.org" 6667)
+  ("Othernet: US, FL, Miami" Othernet "miami.fl.us.othernet.org" 6667)
+  ("Othernet: US, MO, StLouis" Othernet "stlouis.mo.us.othernet.org" 6667)
+  ("Otherside: Random server" OtherSide "irc.othersideirc.net" 6667)
+  ("Outsiderz: Random server" Outsiderz "irc.outsiderz.com" 6667)
+  ("OzOrg: AU, Perth" OzOrg "iinet.perth.oz.org" 6667)
+  ("Peacefulhaven: Random server" Peacefulhaven "irc.peacefulhaven.net" ((6660 6669) 7000 ))
+  ("PhazedIRC: Random server" PhazedIRC "irc.phazedirc.net" 6667)
+  ("Philchat: Random server" Philchat "irc.philchat.net" 6667)
+  ("phrozN: Random server" phrozN "irc.phrozn.net" 6667)
+  ("PiNet: Random server" PiNet "irc.praetorians.org" ((6665 6669)))
+  ("Pinoycentral: Random server" Pinoycentral "chat.abs-cbn.com" 6667)
+  ("Planetarion: Random server" Planetarion "irc.planetarion.com" 6667)
+  ("POLNet: Random server" POLNet "irc.ircnet.pl" 6667)
+  ("Psionics: CA, PQ, Montreal" Psionics "chat.psionics.net" ((6660 6669)))
+  ("PTirc: Random server" PTirc "irc.ptirc.com.pt" 6667)
+  ("PTlink: Random server" PTlink "irc.ptlink.net" 6667)
+  ("PTnet: Random server" PTnet "irc.ptnet.org" 6667)
+  ("QChat: Random server" QChat "irc.qchat.net" 6667)
+  ("QuakeNet: Random German server" QuakeNet "de.quakenet.org" ((6667 6669)))
+  ("QuakeNet: Random server" QuakeNet "irc.quakenet.eu.org" ((6667 6669)))
+  ("QuakeNet: Random Swedish server" QuakeNet "se.quakenet.org" ((6667 6669)))
+  ("QuakeNet: Random UK server" QuakeNet "uk.quakenet.org" ((6667 6669)))
+  ("QuakeNet: Random US server" QuakeNet "us.quakenet.org" ((6667 6669)))
+  ("Realirc: Random server" Realirc "irc.realirc.org" 6667)
+  ("RealmNET: Random server" RealmNET "irc.realmnet.com" 6667)
+  ("Rebelchat: Random server" Rebelchat "irc.rebelchat.org" 6667)
+  ("Red-Latina: Random server" Red-Latina "irc.red-latina.org" 6667)
+  ("RedLatona: Random server" RedLatona "irc.redlatona.net" (6667 6668 ))
+  ("Relicnet: Random server" Relicnet "irc.relic.net" 6667)
+  ("Rezosup: Random server" Rezosup "irc.rezosup.org" 6667)
+  ("Risanet: Random server" Risanet "irc.risanet.com" ((6667 6669)))
+  ("Rubiks: Random server" Rubiks "irc.rubiks.net" 6667)
+  ("Rusnet: EU, RU, Tomsk" Rusnet "irc.tsk.ru" ((6667 6669) (7770 7775) ))
+  ("Rusnet: EU, RU, Vladivostok" Rusnet "irc.vladivostok.ru" ((6667 6669) (7770 7775) ))
+  ("Rusnet: EU, UA, Kiev" Rusnet "irc.kar.net" ((6667 6669) (7770 7775) ))
+  ("Sandnet: Random server" Sandnet "irc.sandnet.net" ((6660 6669) 7000 ))
+  ("Scunc: Random server" Scunc "irc.scunc.net" 6667)
+  ("SerbianCafe: Random server" SerbianCafe "irc.serbiancafe.ws" ((6665 6669)))
+  ("SexNet: Random server" SexNet "irc.sexnet.org" 6667)
+  ("ShadowFire: Random server" ShadowFire "irc.shadowfire.org" 6667)
+  ("ShadowWorld: Random server" ShadowWorld "irc.shadowworld.net" 6667)
+  ("SkyNet: Random server" SkyNet "irc.bronowski.pl" ((6666 6668)))
+  ("Slashnet: Random server" Slashnet "irc.slashnet.org" 6667)
+  ("SolarStone: Random server" SolarStone "irc.solarstone.net" ((6660 6669)))
+  ("Sorcerynet: Random server" Sorcery "irc.sorcery.net" (6667 7000 9000 ))
+  ("Sorcerynet: EU, SE, Karlskrona" Sorcery "nexus.sorcery.net" (6667 7000 9000 ))
+  ("Sorcerynet: US, CA, Palo Alto" Sorcery "kechara.sorcery.net" (6667 7000 9000 ))
+  ("SourceIRC: Random server" SourceIRC "irc.sourceirc.net" ((6667 6669) 7000 ))
+  ("SpaceTronix: Random server" SpaceTronix "irc.spacetronix.net" ((6660 6669) 7000 ))
+  ("Spirit-Harmony: Random server" Spirit-Harmony "irc.spirit-harmony.com" ((6661 6669)))
+  ("StarChat: Random server" StarChat "irc.starchat.net" ((6667 6669) 7000 ))
+  ("StarEquinox: Random server" StarEquinox "irc.starequinox.net" ((6660 6669)))
+  ("StarLink: Random server" Starlink "irc.starlink.net" ((6660 6669)))
+  ("StarLink-irc: Random server" starlink-irc "irc.starlink-irc.org" 6667)
+  ("StarWars-IRC: Random server" StarWars-IRC "irc.starwars-irc.net" ((6663 6667)))
+  ("Stormdancing: Random server" Stormdancing "irc.stormdancing.net" ((6664 6669) 7000 9000 ))
+  ("Superchat: Random server" Superchat "irc.superchat.org" ((6660 6668)))
+  ("Sysopnet: Random server" Sysopnet "irc.sysopnet.org" ((6666 6668)))
+  ("Telstra: Random server" Telstra "irc.telstra.com" ((6667 6669)))
+  ("TR-net: EU, TR, Ankara" TR-net "irc.dominet.com.tr" 6667)
+  ("TR-net: EU, Tr, Istanbul" TR-net "irc.teklan.com.tr" 6667)
+  ("Tri-net: Random server" Tri-net "irc.tri-net.org" 6667)
+  ("TriLink: Random server" TriLink "irc.ft4u.net" 6667)
+  ("TurkishChat: Random server" TurkishChat "irc.turkishchat.org" ((6660 6669) 7000 ))
+  ("UberNinja: Random server" UberNinja "irc.uberninja.net" ((6667 6669)))
+  ("UICN: Random server" UICN "irc.uicn.net" 6667)
+  ("UltraIRC: Random server" UltraIRC "irc.ultrairc.net" 6667)
+  ("UnderChat: Random server" UnderChat "irc.underchat.it" ((6660 6669) 7000 ))
+  ("Undernet: CA, ON, Toronto" Undernet "toronto.on.ca.undernet.org" ((6661 6669)))
+  ("Undernet: CA, QC, Montreal" Undernet "montreal.qu.ca.undernet.org" ((6660 6669)))
+  ("Undernet: EU, AT, Graz" Undernet "graz.at.eu.undernet.org" ((6661 6669)))
+  ("Undernet: EU, BE, Antwerp" Undernet "flanders.be.eu.undernet.org" ((6660 6669)))
+  ("Undernet: EU, BE, Brussels" Undernet "brussels.be.eu.undernet.org" 6667)
+  ("Undernet: EU, CH, Geneva" Undernet "geneva.ch.eu.undernet.org" ((6660 6669) 7777 8000 ))
+  ("Undernet: EU, FR, Caen" Undernet "caen.fr.eu.undernet.org" ((6666 6669)))
+  ("Undernet: EU, NL, Diemen" Undernet "diemen.nl.eu.undernet.org" ((6660 6669)))
+  ("Undernet: EU, NL, Haarlem" Undernet "haarlem.nl.eu.undernet.org" ((6660 6669)))
+  ("Undernet: EU, NO, Oslo" Undernet "oslo.no.eu.undernet.org" ((6660 6669)))
+  ("Undernet: EU, SE, Stockholm" Undernet "stockholm.se.eu.undernet.org" ((6666 6669)))
+  ("Undernet: EU, UK, Surrey" Undernet "surrey.uk.eu.undernet.org" ((6660 6669)))
+  ("Undernet: US, AZ, Mesa" Undernet "mesa.az.us.undernet.org" ((6665 6667)))
+  ("Undernet: US, CA, San Diego" Undernet "sandiego.ca.us.undernet.org" ((6660 6670)))
+  ("Undernet: US, DC, Washington" Undernet "washington.dc.us.undernet.org" ((6660 6669)))
+  ("Undernet: US, KS, Manhattan" Undernet "manhattan.ks.us.undernet.org" ((6660 6669)))
+  ("Undernet: US, NV, Las Vegas" Undernet "lasvegas.nv.us.undernet.org" ((6660 6669)))
+  ("Undernet: US, TX, Austin" Undernet "austin.tx.us.undernet.org" ((6660 6669)))
+  ("Undernet: US, UT, Saltlake" Undernet "saltlake.ut.us.undernet.org" ((6660 6669)))
+  ("Undernet: US, VA, Arlington" Undernet "arlington.va.us.undernet.org" ((6660 6669)))
+  ("Undernet: US, VA, McLean" Undernet "mclean.va.us.undernet.org" ((6666 6669)))
+  ("Undernet: Random EU server" Undernet "eu.undernet.org" 6667)
+  ("Undernet: Random US server" Undernet "us.undernet.org" 6667)
+  ("UnderZ: Random server" UnderZ "irc.underz.org" ((6667 6668)))
+  ("UniChat: Random server" UniChat "irc.uni-chat.net" 6667)
+  ("UnionLatina: Random server" UnionLatina "irc.unionlatina.org" 6667)
+  ("Univers: Random server" Univers "irc.univers.org" ((6665 6669)))
+  ("UnixR: Random server" UnixR "irc.unixr.net" ((6667 6669)))
+  ("Vidgamechat: Random server" Vidgamechat "irc.vidgamechat.com" 6667)
+  ("VirtuaNet: Random server" VirtuaNet "irc.virtuanet.org" ((6660 6669) 7000 ))
+  ("Vitamina: Random server" Vitamina "irc.vitamina.ca" 6667)
+  ("Voila: Random server" Voila "irc.voila.fr" 6667)
+  ("Wahou: Random server" Wahou "irc.wahou.org" ((6665 6669)))
+  ("Warpednet: Random server" Warpednet "irc.warped.net" 6667)
+  ("Weaklinks: Random server" Weaklinks "irc.weaklinks.net" ((6667 6669)))
+  ("Webnet: Random server" Webnet "irc.webchat.org" ((6667 6669) 7000 ))
+  ("Webnet: US, CA, Santa Clara" Webnet "webmaster.ca.us.webchat.org" ((6661 6669)))
+  ("WinChat: Random server" WinChat "irc.winchat.net" ((6661 6669)))
+  ("WinIRC: Random server" WinIRC "irc.winirc.org" ((6667 6669) 4400 ))
+  ("WorldIRC: Random server" WorldIRC "irc.worldirc.org" ((6660 6667)))
+  ("WyldRyde: Random server" WyldRyde "irc.wyldryde.net" ((6666 6669)))
+  ("XentoniX: Random server" XentoniX "irc.xentonix.net" ((6661 6669)))
+  ("Xevion: Random server" Xevion "irc.xevion.net" (6667 7000 ))
+  ("XNet: Random server" XNet "irc.xnet.org" 6667)
+  ("XWorld: Random server" XWorld "irc.xworld.org" 6667)
+  ("ZAnet Net: Random server" ZAnetNet "irc.zanet.net" 6667)
+  ("ZAnet Org: UK, London" ZAnetOrg "mystic.zanet.org.za" 6667)
+  ("ZiRC: Random server" ZiRC "irc.zirc.org" ((6660 6669)))
+  ("ZUHnet: Random server" ZUHnet "irc.zuh.net" 6667)
+  ("Zurna: Random server" Zurna "irc.zurna.net" 6667))
+  "Alist of irc servers. (NAME NET HOST PORTS) where
+NAME is a name for that server,
+NET is a symbol indicating to which network from `erc-networks-alist' this
+  server corresponds,
+HOST is the servers hostname and
+PORTS is either a number, a list of numbers, or a list of port ranges."
+  :group 'erc-networks
+  :type 'sexp)
+
+(defcustom erc-networks-alist
+  '((4-irc "4-irc.com")
+    (A5KNet "a5knet.com")
+    (AbleNet "ablenet.org")
+    (Accessirc "accessirc.net")
+    (Acestar "acestar.org")
+    (Action-IRC "action-irc.net")
+    (AfterNET "afternet.org")
+    (Alternativenet "altnet.org")
+    (AmigaNet "amiganet.org")
+    (AngelEyez "angeleyez.net")
+    (Anothernet "another.net")
+    (ArabChat "arabchat.org")
+    (AsiaTalk "asiatalk.org")
+    (AstroLink "astrolink.org")
+    (Asylumnet "asylumnet.org")
+    (Austnet "austnet.org")
+    (AwesomeChat "awesomechat.net")
+    (Awesomechristians "awesomechristians.com")
+    (Axenet "axenet.org")
+    (Beyondirc "beyondirc.net")
+    (BGIRC "bulgaria.org")
+    (Blabbernet "blabber.net")
+    (Blitzed "blitzed.org")
+    (BrasIRC "brasirc.net")
+    (BRASnet "brasnet.org")
+    (BubbleNet "bubblenet.org")
+    (CCnet "christian-chat.net")
+    (Chat-Net "chat-net.org")
+    (Chat-Solutions "chat-solutions.org")
+    (Chatcafe "chatcafe.net")
+    (Chatchannel "chatchannel.org")
+    (ChatCircuit "chatcircuit.com")
+    (Chatlink "chatlink.org")
+    (Chatnet "chatnet.org")
+    (ChatNut "chatnut.net")
+    (Chatpinoy "chatpinoy.com")
+    (ChatPR "chatpr.org")
+    (Chatroom "chatroom.org")
+    (Chatster "chatster.org")
+    (ChatX "chatx.net")
+    (China263 "263.net")
+    (Cineplex1 "cineplex1.com")
+    (CNN "cnn.com")
+    (CobraNet "cobra.net")
+    (Coolchat "coolchat.net")
+    (Criten "criten.net")
+    (Cyberchat "cyberchat.org")
+    (CyGanet "cyga.net")
+    (DALnet "dal.net")
+    (Dark-Tou-Net "d-t-net.de")
+    (Darkfire "darkfire.net")
+    (DarkMyst "darkmyst.org")
+    (Darkserv "darkserv.net")
+    (Darksystem "darksystem.com")
+    (Darktree "darktree.net")
+    (DayNet "daynet.org")
+    (Deepspace "deepspace.org")
+    (Different "different.net")
+    (Digarix "digarix.net")
+    (Digatech "digatech.net")
+    (Digital-Base "digital-base.net")
+    (Digitalirc "digitalirc.net")
+    (Discussioni "discussioni.org")
+    (DorukNet "doruk.net.tr")
+    (DWChat "dwchat.net")
+    (Dynastynet "dynastynet.net")
+    (EFnet nil)
+    (EgyptianIRC "egyptianirc.net")
+    (Eircnet "eircnet.org")
+    (Eleethal "eleethal.com")
+    (EntertheGame "enterthegame.com")
+    (EpiKnet "epiknet.org")
+    (EsperNet "esper.net")
+    (Esprit "esprit.net")
+    (euIRC "euirc.net")
+    (Evilzinc "evilzinc.net")
+    (ExodusIRC "exodusirc.net")
+    (FDFnet "fdfnet.net")
+    (FEFnet "fef.net")
+    (Financialchat "financialchat.com")
+    (Forestnet "forestnet.org")
+    (ForeverChat "foreverchat.net")
+    (Fraggers "fraggers.co.uk")
+    (FreedomChat "freedomchat.net")
+    (FreedomIRC "freedomirc.net")
+    (freenode "freenode.net")
+    (FunNet "funnet.org")
+    (GalaxyNet "galaxynet.org")
+    (Gamesnet "gamesnet.net")
+    (GammaForce "gammaforce.org")
+    (GIKInet "giki.edu.pk")
+    (GizNet "giznet.org")
+    (Globalchat "globalchat.org")
+    (GlobIRC "globirc.net")
+    (Goldchat "goldchat.nl")
+    (Goodchatting "goodchatting.com")
+    (GravityLords "gravitylords.net")
+    (GRnet "irc.gr")
+    (GulfChat "gulfchat.net")
+    (HabberNet "habber.net")
+    (HanIRC "hanirc.org")
+    (Hellenicnet "mirc.gr")
+    (IceNet "icenet.org.za")
+    (ICQnet "icq.com")
+    (iip "anon.iip")
+    (Infatech "infatech.net")
+    (Infinity "infinity-irc.org")
+    (Infomatrix "infomatrix.net")
+    (Inside3D "inside3d.net")
+    (InterlinkChat "interlinkchat.net")
+    (IRC-Chile "irc.cl")
+    (IRC-Hispano "irc-hispano.org")
+    (IRCchat "ircchat.tk")
+    (IRCGate "ircgate.net")
+    (IRCGeeks "ircgeeks.org")
+    (IRChat "irchat.net")
+    (IrcLordz "irclordz.com")
+    (IrcMalta "ircmalta.org")
+    (IRCnet nil)
+    (IRCSoulZ "ircsoulz.net")
+    (IRCSul "wnet.com.br")
+    (IrcTalk "irctalk.net")
+    (Irctoo "irctoo.net")
+    (IRCtown "irc.irctown.net")
+    (IRCworld "ircworld.org")
+    (ircXtreme "ircXtreme.net")
+    (Israelnet "israel.net")
+    (K0wNet "k0w.net")
+    (KDFSnet "kdfs.net")
+    (Kemik "kemik.net")
+    (Kewl\.Org "kewl.org")
+    (Kickchat "kickchat.com")
+    (KidsWorld "kidsworld.org")
+    (Knightnet "knightnet.net")
+    (Konfido\.Net "konfido.net")
+    (Kreynet "krey.net")
+    (Krono "krono.net")
+    (Krushnet "krushnet.org")
+    (LagNet "lagnet.org.za")
+    (Librenet "librenet.net")
+    (LinkNet "link-net.org")
+    (Liquidized "liquidized.net")
+    (M-IRC "m-sys.org")
+    (MagicStar "magicstar.net")
+    (Mavra "mavra.net")
+    (MediaDriven "mediadriven.com")
+    (mIRC-X "mircx.com")
+    (Morat "morat.net")
+    (MusicCity "musiccity.com")
+    (Mysteria "mysteria.net")
+    (Mysterychat "mysterychat.net")
+    (Mystical "mystical.net")
+    (Narancs "narancs.com")
+    (Net-France "net-france.com")
+    (Nevernet "nevernet.net")
+    (Newnet "newnet.net")
+    (Nexusirc "nexusirc.org")
+    (NightStar "nightstar.net")
+    (NitrousNet "nitrousnet.net")
+    (Novernet "novernet.com")
+    (Nullrouted "nullrouted.org")
+    (NullusNet "nullus.net")
+    (OpChat "opchat.org")
+    (Openprojects "openprojects.net")
+    (Othernet "othernet.org")
+    (OtherSide "othersideirc.net")
+    (Outsiderz "outsiderz.com")
+    (OzOrg "oz.org")
+    (Peacefulhaven "peacefulhaven.net")
+    (PhazedIRC "phazedirc.net")
+    (Philchat "philchat.net")
+    (phrozN "phrozn.net")
+    (PiNet "praetorians.org")
+    (Pinoycentral "abs-cbn.com")
+    (Planetarion "planetarion.com")
+    (POLNet "ircnet.pl")
+    (Psionics "psionics.net")
+    (PTirc "ptirc.com.pt")
+    (PTlink "ptlink.net")
+    (PTnet "ptnet.org")
+    (QChat "qchat.net")
+    (QuakeNet "quakenet.org")
+    (Realirc "realirc.org")
+    (RealmNET "realmnet.com")
+    (Rebelchat "rebelchat.org")
+    (Red-Latina "red-latina.org")
+    (RedLatona "redlatona.net")
+    (Relicnet "relic.net")
+    (Rezosup "rezosup.org")
+    (Risanet "risanet.com")
+    (Rubiks "rubiks.net")
+    (Rusnet "nil")
+    (Sandnet "sandnet.net")
+    (Scunc "scunc.net")
+    (SerbianCafe "serbiancafe.ws")
+    (SexNet "sexnet.org")
+    (ShadowFire "shadowfire.org")
+    (ShadowWorld "shadowworld.net")
+    (SkyNet "bronowski.pl")
+    (SlashNET "slashnet.org")
+    (SolarStone "solarstone.net")
+    (Sorcery "sorcery.net")
+    (SourceIRC "sourceirc.net")
+    (SpaceTronix "spacetronix.net")
+    (Spirit-Harmony "spirit-harmony.com")
+    (StarChat "starchat.net")
+    (StarEquinox "starequinox.net")
+    (Starlink "starlink.net")
+    (starlink-irc "starlink-irc.org")
+    (StarWars-IRC "starwars-irc.net")
+    (Stormdancing "stormdancing.net")
+    (Superchat "superchat.org")
+    (Sysopnet "sysopnet.org")
+    (Telstra "telstra.com")
+    (TR-net "dominet.com.tr")
+    (Tri-net "tri-net.org")
+    (TriLink "ft4u.net")
+    (TurkishChat "turkishchat.org")
+    (UberNinja "uberninja.net")
+    (UICN "uicn.net")
+    (UltraIRC "ultrairc.net")
+    (UnderChat "underchat.it")
+    (Undernet "undernet.org")
+    (UnderZ "underz.org")
+    (UniChat "irc.uni-chat.net")
+    (UnionLatina "unionlatina.org")
+    (Univers "univers.org")
+    (UnixR "unixr.net")
+    (Vidgamechat "vidgamechat.com")
+    (VirtuaNet "virtuanet.org")
+    (Vitamina "vitamina.ca")
+    (Voila "voila.fr")
+    (Wahou "wf-net.org")
+    (Warpednet "warped.net")
+    (Weaklinks "weaklinks.net")
+    (Webnet "webchat.org")
+    (WinChat "winchat.net")
+    (WinIRC "winirc.org")
+    (WorldIRC "worldirc.org")
+    (WyldRyde "wyldryde.net")
+    (XentoniX "xentonix.net")
+    (Xevion "xevion.net")
+    (XNet "xnet.org")
+    (XWorld "xworld.org")
+    (ZAnetNet "zanet.net")
+    (ZAnetOrg "zanet.org.za")
+    (ZiRC "zirc.org")
+    (ZUHnet "zuh.net")
+    (Zurna "zurna.net"))
+  "Alist of IRC networks. (NET MATCHER) where
+NET is a symbol naming that IRC network and
+MATCHER is used to find a corresponding network to a server while connected to
+  it. If it is regexp, it's used to match against `erc-server-announced-name'.
+  It can also be a function (predicate). Then it is executed with the
+  server buffer as current-buffer."
+  :group 'erc-networks
+  :type '(repeat
+	  (list :tag "Network"
+		(symbol :tag "Network name")
+		(choice :tag "Network's common server ending"
+		 (regexp)
+		 (const :tag "Network has no common server ending" nil)))))
+
+(defvar erc-network nil
+  "The name of the network you are connected to (a symbol).")
+(make-variable-buffer-local 'erc-network)
+
+;; Functions:
+
+;;;###autoload
+(defun erc-determine-network ()
+  "Return the name of the network or \"Unknown\" as a symbol.  Use the
+server parameter NETWORK if provided, otherwise parse the server name and
+search for a match in `erc-networks-alist'."
+  ;; The server made it easy for us and told us the name of the NETWORK
+  (if (assoc "NETWORK" erc-server-parameters)
+      (intern (cdr (assoc "NETWORK" erc-server-parameters)))
+    (or
+     ;; Loop through `erc-networks-alist' looking for a match.
+     (let ((server (or erc-server-announced-name erc-session-server)))
+       (loop for (name matcher) in erc-networks-alist
+	     when (and matcher
+		       (string-match (concat matcher "\\'") server))
+	     do (return name)))
+     'Unknown)))
+
+(defun erc-network ()
+  "Return the value of `erc-network' for the current server."
+  (with-current-buffer (erc-server-buffer) erc-network))
+
+(defun erc-current-network ()
+  "Deprecated.  Use `erc-network' instead.  Return the name of this server's
+network as a symbol."
+  (with-current-buffer (erc-server-buffer)
+    (intern (downcase (symbol-name erc-network)))))
+
+(erc-make-obsolete 'erc-current-network 'erc-network
+		   "Obsolete since erc-networks 1.5")
+
+(defun erc-network-name ()
+  "Returns the name of the current network as a string."
+  (with-current-buffer (erc-server-buffer) (symbol-name erc-network)))
+
+(defun erc-set-network-name (proc parsed)
+  "Set `erc-network' to the value returned by `erc-determine-network'."
+  (unless erc-server-connected
+    (setq erc-network (erc-determine-network)))
+  nil)
+
+(defun erc-unset-network-name (nick ip reason)
+  "Set `erc-network' to nil."
+  (setq erc-network nil)
+  nil)
+
+(add-hook 'erc-server-375-functions 'erc-set-network-name)
+(add-hook 'erc-server-422-functions 'erc-set-network-name)
+(add-hook 'erc-disconnected-hook 'erc-unset-network-name)
+
+(defun erc-ports-list (ports)
+  "Return a list of PORTS.
+
+PORTS should be a list of either:
+  A number, in which case it is returned a list.
+  Or a pair of the form (LOW HIGH), in which case, a list of all the
+  numbers between LOW and HIGH (inclusive) is returned.
+
+As an example:
+  (erc-ports-list '(1)) => (1)
+  (erc-ports-list '((1 5))) => (1 2 3 4 5)
+  (erc-ports-list '(1 (3 5))) => (1 3 4 5)"
+  (let (result)
+    (dolist (p ports)
+      (cond ((numberp p)
+	     (push p result))
+	    ((listp p)
+	     (setq result (nconc (loop for i from (cadr p) downto (car p)
+				       collect i)
+				 result)))))
+    (nreverse result)))
+
+;;;###autoload
+(defun erc-server-select ()
+  "Interactively select a server to connect to using `erc-server-alist'."
+  (interactive)
+  (let* ((completion-ignore-case t)
+	 (net (intern
+	       (completing-read "Network: "
+				(erc-delete-dups
+				 (mapcar (lambda (x)
+					   (list (symbol-name (nth 1 x))))
+					 erc-server-alist)))))
+	 (srv (assoc
+	       (completing-read "Server: "
+				(delq nil
+				      (mapcar (lambda (x)
+						(when (equal (nth 1 x) net)
+						  x))
+					      erc-server-alist)))
+	       erc-server-alist))
+	 (host (nth 2 srv))
+	 (ports (if (listp (nth 3 srv))
+		    (erc-ports-list (nth 3 srv))
+		  (list (nth 3 srv))))
+	 (port (nth (random (length ports)) ports)))
+    (erc host port erc-nick erc-user-full-name t)))
+
+;;; The following experimental
+;; It does not work yet, help me with it if you
+;; think it is worth the effort.
+
+(defvar erc-settings
+  '((pals freenode ("kensanata" "shapr" "anti\\(fuchs\\|gone\\)"))
+    (format-nick-function (freenode "#emacs") erc-format-@nick))
+  "Experimental: Alist of configuration options.
+The format is (VARNAME SCOPE VALUE) where
+VARNAME is a symbol identifying the configuration option,
+SCOPE is either a symbol which identifies an entry from
+  `erc-networks-alist' or a list (NET TARGET) where NET is a network symbol and
+  TARGET is a string identifying the channel/query target.
+VALUE is the options value.")
+
+(defun erc-get (var &optional net target)
+  (let ((items erc-settings)
+	elt val)
+    (while items
+      (setq elt (car items)
+	    items (cdr items))
+      (when (eq (car elt) var)
+	(cond ((and net target (listp (nth 1 elt))
+		    (eq net (car (nth 1 elt)))
+		    (string-equal target (nth 1 (nth 1 elt))))
+	       (setq val (nth 2 elt)
+		     items nil))
+	      ((and net (eq net (nth 1 elt)))
+	       (setq val (nth 2 elt)
+		     items nil))
+	      ((and (not net) (not target) (not (nth 1 elt)))
+	       (setq val (nth 2 elt)
+		     items nil)))))
+    val))
+
+(erc-get 'pals 'freenode)
+
+(provide 'erc-networks)
+
+;;; erc-networks.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:
+
+;; arch-tag: 68cccabd-f66b-456c-9abe-5f993a2dc91c
--- a/lisp/erc/erc-nickserv.el	Mon Feb 06 18:44:57 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,337 +0,0 @@
-;;; erc-nickserv.el --- Identify to NickServ
-
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-
-;; 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:
-
-;; There are two ways to go about identifying yourself automatically to
-;; NickServ with this module.  The more secure way is to listen for identify
-;; requests from the user NickServ.  Another way is to identify yourself to
-;; NickServ directly after a successful connection and every time you change
-;; your nickname.  This method is rather insecure, though, because no checks
-;; are made to test if NickServ is the real NickServ for a given network or
-;; server.
-
-;; As a default, ERC has the data for the official nickname services on the
-;; networks Austnet, BrasNET, Dalnet, freenode, GalaxyNet, and Slashnet.
-;; You can add more by using M-x customize-variable RET erc-nickserv-alist.
-
-;; Usage:
-;;
-;; Put into your .emacs:
-;;
-;; (require 'erc-nickserv)
-;; (erc-services-mode 1)
-;;
-;; Add your nickname and NickServ password to `erc-nickserv-passwords'.
-;; Using the freenode network as an example:
-;;
-;; (setq erc-nickserv-passwords '((freenode (("nickname" "password")))))
-;;
-;; The default automatic identification mode is autodetection of NickServ
-;; identify requests.  Set the variable `erc-nickserv-identify-mode' if
-;; you'd like to change this behavior.  You can also change the way
-;; automatic identification is handled by using:
-;;
-;; M-x erc-nickserv-identify-mode
-;;
-;; If you'd rather not identify yourself automatically but would like access
-;; to the functions contained in this file, just load this file without
-;; enabling `erc-services-mode'.
-;;
-
-;;; Code:
-
-(require 'erc)
-(require 'erc-nets)
-(eval-when-compile (require 'cl))
-
-;; Customization:
-
-(defgroup erc-services nil
-  "Configuration for IRC services.
-
-On some networks, there exists a special type of automated irc bot,
-called Services.  Those usually allow you to register your nickname,
-post/read memos to other registered users who are currently offline,
-and do various other things.
-
-This group allows you to set variables to somewhat automate
-communication with those Services."
-  :group 'erc)
-
-;;;###autoload (autoload 'erc-services-mode "erc-nickserv" nil t)
-(define-erc-module services nickserv
-  "This mode automates communication with services."
-  ((erc-nickserv-identify-mode erc-nickserv-identify-mode))
-  ((remove-hook 'erc-server-NOTICE-functions
-		'erc-nickserv-identify-autodetect)
-   (remove-hook 'erc-after-connect
-		'erc-nickserv-identify-on-connect)
-   (remove-hook 'erc-nick-changed-functions
-		'erc-nickserv-identify-on-nick-change)))
-
-;;;###autoload
-(defun erc-nickserv-identify-mode (mode)
-  "Set up hooks according to which MODE the user has chosen."
-  (interactive
-   (list (intern (completing-read
-		  "Choose Nickserv identify mode (RET to disable): "
-		  '(("autodetect") ("nick-change")) nil t))))
-  (cond ((eq mode 'autodetect)
-	 (setq erc-nickserv-identify-mode 'autodetect)
-	 (add-hook 'erc-server-NOTICE-functions
-		   'erc-nickserv-identify-autodetect)
-	 (remove-hook 'erc-nick-changed-functions
-		      'erc-nickserv-identify-on-nick-change)
-	 (remove-hook 'erc-after-connect
-		      'erc-nickserv-identify-on-connect))
-	((eq mode 'nick-change)
-	 (setq erc-nickserv-identify-mode 'nick-change)
-	 (add-hook 'erc-after-connect
-		   'erc-nickserv-identify-on-connect)
-	 (add-hook 'erc-nick-changed-functions
-		   'erc-nickserv-identify-on-nick-change)
-	 (remove-hook 'erc-server-NOTICE-functions
-		      'erc-nickserv-identify-autodetect))
-	(t
-	 (setq erc-nickserv-identify-mode nil)
-	 (remove-hook 'erc-server-NOTICE-functions
-		      'erc-nickserv-identify-autodetect)
-	 (remove-hook 'erc-after-connect
-		      'erc-nickserv-identify-on-connect)
-	 (remove-hook 'erc-nick-changed-functions
-		      'erc-nickserv-identify-on-nick-change))))
-
-(defcustom erc-nickserv-identify-mode 'autodetect
-  "The mode which is used when identifying to Nickserv.
-
-Possible settings are:.
-
-'autodetect  - Identify when the real Nickserv sends an identify request.
-'nick-change - Identify when you change your nickname.
-nil          - Disables automatic Nickserv identification.
-
-You can also use M-x erc-nickserv-identify-mode to change modes."
-  :group 'erc-services
-  :type '(choice (const autodetect)
-		 (const nick-change)
-		 (const nil))
-  :set (lambda (sym val)
-	 (set-default sym val)
-	 (erc-nickserv-identify-mode val)))
-
-(defcustom erc-prompt-for-nickserv-password t
-  "Ask for the password when identifying to NickServ."
-  :group 'erc-services
-  :type 'boolean)
-
-(defcustom erc-nickserv-passwords nil
-  "Passwords used when identifying to NickServ automatically.
-
-Example of use:
-  (setq erc-nickserv-passwords
-        '((freenode ((\"nick-one\" . \"password\")
-                     (\"nick-two\" . \"password\")))
-          (DALnet ((\"nick\" . \"password\")))))"
-  :group 'erc-services
-  :type '(repeat
-	  (list :tag "Network"
-		(choice :tag "Network name"
-			(const freenode)
-			(const DALnet)
-			(const GalaxyNet)
-			(const SlashNET)
-			(const BRASnet)
-			(const iip)
-			(const Austnet)
-			(symbol :tag "Network name"))
-		(repeat :tag "Nickname and password"
-			(cons :tag "Identity"
-			      (string :tag "Nick")
-			      (string :tag "Password"))))))
-
-;; Variables:
-
-(defcustom erc-nickserv-alist
-  '((DALnet
-     "NickServ!service@dal.net"
-     "/msg\\s-NickServ@services.dal.net\\s-IDENTIFY\\s-<password>"
-     "NickServ@services.dal.net"
-     "IDENTIFY"
-     nil)
-    (freenode
-     "NickServ!NickServ@services."
-     "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>"
-     "NickServ"
-     "IDENTIFY"
-     nil)
-    (GalaxyNet
-     "NS!nickserv@galaxynet.org"
-     "Please\\s-change\\s-nicks\\s-or\\s-authenticate."
-     "NS@services.galaxynet.org"
-     "AUTH"
-     t)
-    (SlashNET
-     "NickServ!services@services.slashnet.org"
-     "/msg\\s-NickServ\\s-IDENTIFY\\s-password"
-     "NickServ@services.slashnet.org"
-     "IDENTIFY"
-     nil)
-    (iip
-     "Trent@anon.iip"
-     "type\\s-/squery\\s-Trent\\s-identify\\s-<password>"
-     "Trent@anon.iip"
-     "IDENTIFY"
-     nil
-     "SQUERY")
-    (BRASnet
-     "NickServ!services@brasnet.org"
-     "/NickServ\\s-IDENTIFY\\s-senha"
-     "NickServ"
-     "IDENTIFY"
-     nil
-     "")
-     (Austnet
-      "NickOP!service@austnet.org"
-      "/msg\\s-NickOP@austnet.org\\s-identify\\s-<password>"
-      "nickop@austnet.org"
-      "identify"
-      nil)
-     (Azzurra
-      "NickServ!service@azzurra.org"
-      "/ns\\s-IDENTIFY\\s-password"
-      "NickServ"
-      "IDENTIFY"
-      nil)
-     (OFTC
-      "NickServ!services@services.oftc.net"
-      "/msg\\s-NickServ\\s-IDENTIFY\\s-\^_password"
-      "NickServ"
-      "IDENTIFY"
-      nil))
-   "Alist of NickServer details, sorted by network.
-Every element in the list has the form
-  \(SYMBOL NICKSERV REGEXP NICK KEYWORD USE-CURRENT ANSWER)
-
-SYMBOL is a network identifier, a symbol, as used in `erc-networks-alist'.
-NICKSERV is the description of the nickserv in the form nick!user@host.
-REGEXP is a regular expression matching the message from nickserv.
-NICK is nickserv's nickname.  Use nick@server where necessary/possible.
-KEYWORD is the keyword to use in the reply message to identify yourself.
-USE-CURRENT indicates whether the current nickname must be used when
-  identifying.
-ANSWER is the command to use for the answer.  The default is 'privmsg.
-  This last element is optional."
-   :group 'erc-services
-   :type '(repeat
-	   (list :tag "Nickserv data"
-		 (symbol :tag "Network name")
-		 (string :tag "Nickserv's nick!user@host")
-		 (regexp :tag "Identify request sent by Nickserv")
-		 (string :tag "Identify to")
-		 (string :tag "Identify keyword")
-		 (boolean :tag "Use current nick in identify message?")
-		 (choice :tag "Command to use (optional)"
-		  (string :tag "Command")
-		  (const :tag "No special command necessary" nil)))))
-
-;; Functions:
-
-(defun erc-nickserv-identify-autodetect (proc parsed)
-  "Check for a NickServ identify request everytime a notice is received.
-Make sure it is the real NickServ for this network and that it has
-specifically asked the user to IDENTIFY.
-If `erc-prompt-for-nickserv-password' is non-nil, prompt the user for the
-password for this nickname, otherwise try to send it automatically."
-  (unless (and (null erc-nickserv-passwords)
-	       (null erc-prompt-for-nickserv-password))
-    (let* ((network (erc-network))
-	   (nickserv (nth 1 (assoc network erc-nickserv-alist)))
-	   (identify-regex (nth 2 (assoc network erc-nickserv-alist)))
-	   (sspec (erc-response.sender parsed))
-	   (nick (car (erc-response.command-args parsed)))
-	   (msg (erc-response.contents parsed)))
-      ;; continue only if we're sure it's the real nickserv for this network
-      ;; and it's asked us to identify
-      (when (and nickserv (equal sspec nickserv)
-		 (string-match identify-regex msg))
-	(erc-log "NickServ IDENTIFY request detected")
-	(erc-nickserv-call-identify-function nick)
-	nil))))
-
-(defun erc-nickserv-identify-on-connect (server nick)
-  "Identify to Nickserv after the connection to the server is established."
-  (unless (and (null erc-nickserv-passwords)
-	       (null erc-prompt-for-nickserv-password))
-    (erc-nickserv-call-identify-function nick)))
-
-(defun erc-nickserv-identify-on-nick-change (nick old-nick)
-  "Identify to Nickserv whenever your nick changes."
-  (unless (and (null erc-nickserv-passwords)
-	       (null erc-prompt-for-nickserv-password))
-    (erc-nickserv-call-identify-function nick)))
-
-(defun erc-nickserv-call-identify-function (nickname)
-  "Call `erc-nickserv-identify' interactively or run it with NICKNAME's
-password.
-The action is determined by the value of `erc-prompt-for-nickserv-password'."
-  (if erc-prompt-for-nickserv-password
-      (call-interactively 'erc-nickserv-identify)
-    (when erc-nickserv-passwords
-      (erc-nickserv-identify
-       (cdr (assoc nickname
-		   (nth 1 (assoc (erc-network)
-				 erc-nickserv-passwords))))))))
-
-;;;###autoload
-(defun erc-nickserv-identify (password)
-  "Send an \"identify <PASSWORD>\" message to NickServ.
-When called interactively, read the password using `read-passwd'."
-  (interactive
-   (list (read-passwd
-	  (format "NickServ password for %s on %s (RET to cancel): "
-		  (erc-current-nick)
-		  (or (and (erc-network)
-			   (symbol-name (erc-network)))
-		      "Unknown network")))))
-  (when (and password (not (string= "" password)))
-    (let* ((erc-auto-discard-away nil)
-	   (network (erc-network))
-	   (nickserv-info (assoc network erc-nickserv-alist))
-	   (nickserv (or (nth 3 nickserv-info) "NickServ"))
-	   (identify-word (or (nth 4 nickserv-info) "IDENTIFY"))
-	   (nick (if (nth 5 nickserv-info)
-		     (concat (erc-current-nick) " ")
-		   ""))
-	   (msgtype (or (nth 6 nickserv-info) "PRIVMSG")))
-      (erc-message msgtype
-		   (concat nickserv " " identify-word " " nick password)))))
-
-(provide 'erc-nickserv)
-
-;;; erc-nickserv.el ends here
-;;
-;; Local Variables:
-;; indent-tabs-mode: t
-;; tab-width: 8
-;; End:
-
-;; arch-tag: d401c8aa-d938-4255-96a9-3efb64c47e58
--- a/lisp/erc/erc-notify.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/erc/erc-notify.el	Sun Feb 12 00:15:44 2006 +0000
@@ -30,7 +30,7 @@
 ;;; Code:
 
 (require 'erc)
-(require 'erc-nets)
+(require 'erc-networks)
 (eval-when-compile
  (require 'cl)
  (require 'pcomplete))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/erc/erc-services.el	Sun Feb 12 00:15:44 2006 +0000
@@ -0,0 +1,337 @@
+;;; erc-services.el --- Identify to NickServ
+
+;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+
+;; 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:
+
+;; There are two ways to go about identifying yourself automatically to
+;; NickServ with this module.  The more secure way is to listen for identify
+;; requests from the user NickServ.  Another way is to identify yourself to
+;; NickServ directly after a successful connection and every time you change
+;; your nickname.  This method is rather insecure, though, because no checks
+;; are made to test if NickServ is the real NickServ for a given network or
+;; server.
+
+;; As a default, ERC has the data for the official nickname services on the
+;; networks Austnet, BrasNET, Dalnet, freenode, GalaxyNet, and Slashnet.
+;; You can add more by using M-x customize-variable RET erc-nickserv-alist.
+
+;; Usage:
+;;
+;; Put into your .emacs:
+;;
+;; (require 'erc-services)
+;; (erc-services-mode 1)
+;;
+;; Add your nickname and NickServ password to `erc-nickserv-passwords'.
+;; Using the freenode network as an example:
+;;
+;; (setq erc-nickserv-passwords '((freenode (("nickname" "password")))))
+;;
+;; The default automatic identification mode is autodetection of NickServ
+;; identify requests.  Set the variable `erc-nickserv-identify-mode' if
+;; you'd like to change this behavior.  You can also change the way
+;; automatic identification is handled by using:
+;;
+;; M-x erc-nickserv-identify-mode
+;;
+;; If you'd rather not identify yourself automatically but would like access
+;; to the functions contained in this file, just load this file without
+;; enabling `erc-services-mode'.
+;;
+
+;;; Code:
+
+(require 'erc)
+(require 'erc-networks)
+(eval-when-compile (require 'cl))
+
+;; Customization:
+
+(defgroup erc-services nil
+  "Configuration for IRC services.
+
+On some networks, there exists a special type of automated irc bot,
+called Services.  Those usually allow you to register your nickname,
+post/read memos to other registered users who are currently offline,
+and do various other things.
+
+This group allows you to set variables to somewhat automate
+communication with those Services."
+  :group 'erc)
+
+;;;###autoload (autoload 'erc-services-mode "erc-services" nil t)
+(define-erc-module services nickserv
+  "This mode automates communication with services."
+  ((erc-nickserv-identify-mode erc-nickserv-identify-mode))
+  ((remove-hook 'erc-server-NOTICE-functions
+		'erc-nickserv-identify-autodetect)
+   (remove-hook 'erc-after-connect
+		'erc-nickserv-identify-on-connect)
+   (remove-hook 'erc-nick-changed-functions
+		'erc-nickserv-identify-on-nick-change)))
+
+;;;###autoload
+(defun erc-nickserv-identify-mode (mode)
+  "Set up hooks according to which MODE the user has chosen."
+  (interactive
+   (list (intern (completing-read
+		  "Choose Nickserv identify mode (RET to disable): "
+		  '(("autodetect") ("nick-change")) nil t))))
+  (cond ((eq mode 'autodetect)
+	 (setq erc-nickserv-identify-mode 'autodetect)
+	 (add-hook 'erc-server-NOTICE-functions
+		   'erc-nickserv-identify-autodetect)
+	 (remove-hook 'erc-nick-changed-functions
+		      'erc-nickserv-identify-on-nick-change)
+	 (remove-hook 'erc-after-connect
+		      'erc-nickserv-identify-on-connect))
+	((eq mode 'nick-change)
+	 (setq erc-nickserv-identify-mode 'nick-change)
+	 (add-hook 'erc-after-connect
+		   'erc-nickserv-identify-on-connect)
+	 (add-hook 'erc-nick-changed-functions
+		   'erc-nickserv-identify-on-nick-change)
+	 (remove-hook 'erc-server-NOTICE-functions
+		      'erc-nickserv-identify-autodetect))
+	(t
+	 (setq erc-nickserv-identify-mode nil)
+	 (remove-hook 'erc-server-NOTICE-functions
+		      'erc-nickserv-identify-autodetect)
+	 (remove-hook 'erc-after-connect
+		      'erc-nickserv-identify-on-connect)
+	 (remove-hook 'erc-nick-changed-functions
+		      'erc-nickserv-identify-on-nick-change))))
+
+(defcustom erc-nickserv-identify-mode 'autodetect
+  "The mode which is used when identifying to Nickserv.
+
+Possible settings are:.
+
+'autodetect  - Identify when the real Nickserv sends an identify request.
+'nick-change - Identify when you change your nickname.
+nil          - Disables automatic Nickserv identification.
+
+You can also use M-x erc-nickserv-identify-mode to change modes."
+  :group 'erc-services
+  :type '(choice (const autodetect)
+		 (const nick-change)
+		 (const nil))
+  :set (lambda (sym val)
+	 (set-default sym val)
+	 (erc-nickserv-identify-mode val)))
+
+(defcustom erc-prompt-for-nickserv-password t
+  "Ask for the password when identifying to NickServ."
+  :group 'erc-services
+  :type 'boolean)
+
+(defcustom erc-nickserv-passwords nil
+  "Passwords used when identifying to NickServ automatically.
+
+Example of use:
+  (setq erc-nickserv-passwords
+        '((freenode ((\"nick-one\" . \"password\")
+                     (\"nick-two\" . \"password\")))
+          (DALnet ((\"nick\" . \"password\")))))"
+  :group 'erc-services
+  :type '(repeat
+	  (list :tag "Network"
+		(choice :tag "Network name"
+			(const freenode)
+			(const DALnet)
+			(const GalaxyNet)
+			(const SlashNET)
+			(const BRASnet)
+			(const iip)
+			(const Austnet)
+			(symbol :tag "Network name"))
+		(repeat :tag "Nickname and password"
+			(cons :tag "Identity"
+			      (string :tag "Nick")
+			      (string :tag "Password"))))))
+
+;; Variables:
+
+(defcustom erc-nickserv-alist
+  '((DALnet
+     "NickServ!service@dal.net"
+     "/msg\\s-NickServ@services.dal.net\\s-IDENTIFY\\s-<password>"
+     "NickServ@services.dal.net"
+     "IDENTIFY"
+     nil)
+    (freenode
+     "NickServ!NickServ@services."
+     "/msg\\s-NickServ\\s-IDENTIFY\\s-<password>"
+     "NickServ"
+     "IDENTIFY"
+     nil)
+    (GalaxyNet
+     "NS!nickserv@galaxynet.org"
+     "Please\\s-change\\s-nicks\\s-or\\s-authenticate."
+     "NS@services.galaxynet.org"
+     "AUTH"
+     t)
+    (SlashNET
+     "NickServ!services@services.slashnet.org"
+     "/msg\\s-NickServ\\s-IDENTIFY\\s-password"
+     "NickServ@services.slashnet.org"
+     "IDENTIFY"
+     nil)
+    (iip
+     "Trent@anon.iip"
+     "type\\s-/squery\\s-Trent\\s-identify\\s-<password>"
+     "Trent@anon.iip"
+     "IDENTIFY"
+     nil
+     "SQUERY")
+    (BRASnet
+     "NickServ!services@brasnet.org"
+     "/NickServ\\s-IDENTIFY\\s-senha"
+     "NickServ"
+     "IDENTIFY"
+     nil
+     "")
+     (Austnet
+      "NickOP!service@austnet.org"
+      "/msg\\s-NickOP@austnet.org\\s-identify\\s-<password>"
+      "nickop@austnet.org"
+      "identify"
+      nil)
+     (Azzurra
+      "NickServ!service@azzurra.org"
+      "/ns\\s-IDENTIFY\\s-password"
+      "NickServ"
+      "IDENTIFY"
+      nil)
+     (OFTC
+      "NickServ!services@services.oftc.net"
+      "/msg\\s-NickServ\\s-IDENTIFY\\s-\^_password"
+      "NickServ"
+      "IDENTIFY"
+      nil))
+   "Alist of NickServer details, sorted by network.
+Every element in the list has the form
+  \(SYMBOL NICKSERV REGEXP NICK KEYWORD USE-CURRENT ANSWER)
+
+SYMBOL is a network identifier, a symbol, as used in `erc-networks-alist'.
+NICKSERV is the description of the nickserv in the form nick!user@host.
+REGEXP is a regular expression matching the message from nickserv.
+NICK is nickserv's nickname.  Use nick@server where necessary/possible.
+KEYWORD is the keyword to use in the reply message to identify yourself.
+USE-CURRENT indicates whether the current nickname must be used when
+  identifying.
+ANSWER is the command to use for the answer.  The default is 'privmsg.
+  This last element is optional."
+   :group 'erc-services
+   :type '(repeat
+	   (list :tag "Nickserv data"
+		 (symbol :tag "Network name")
+		 (string :tag "Nickserv's nick!user@host")
+		 (regexp :tag "Identify request sent by Nickserv")
+		 (string :tag "Identify to")
+		 (string :tag "Identify keyword")
+		 (boolean :tag "Use current nick in identify message?")
+		 (choice :tag "Command to use (optional)"
+		  (string :tag "Command")
+		  (const :tag "No special command necessary" nil)))))
+
+;; Functions:
+
+(defun erc-nickserv-identify-autodetect (proc parsed)
+  "Check for a NickServ identify request everytime a notice is received.
+Make sure it is the real NickServ for this network and that it has
+specifically asked the user to IDENTIFY.
+If `erc-prompt-for-nickserv-password' is non-nil, prompt the user for the
+password for this nickname, otherwise try to send it automatically."
+  (unless (and (null erc-nickserv-passwords)
+	       (null erc-prompt-for-nickserv-password))
+    (let* ((network (erc-network))
+	   (nickserv (nth 1 (assoc network erc-nickserv-alist)))
+	   (identify-regex (nth 2 (assoc network erc-nickserv-alist)))
+	   (sspec (erc-response.sender parsed))
+	   (nick (car (erc-response.command-args parsed)))
+	   (msg (erc-response.contents parsed)))
+      ;; continue only if we're sure it's the real nickserv for this network
+      ;; and it's asked us to identify
+      (when (and nickserv (equal sspec nickserv)
+		 (string-match identify-regex msg))
+	(erc-log "NickServ IDENTIFY request detected")
+	(erc-nickserv-call-identify-function nick)
+	nil))))
+
+(defun erc-nickserv-identify-on-connect (server nick)
+  "Identify to Nickserv after the connection to the server is established."
+  (unless (and (null erc-nickserv-passwords)
+	       (null erc-prompt-for-nickserv-password))
+    (erc-nickserv-call-identify-function nick)))
+
+(defun erc-nickserv-identify-on-nick-change (nick old-nick)
+  "Identify to Nickserv whenever your nick changes."
+  (unless (and (null erc-nickserv-passwords)
+	       (null erc-prompt-for-nickserv-password))
+    (erc-nickserv-call-identify-function nick)))
+
+(defun erc-nickserv-call-identify-function (nickname)
+  "Call `erc-nickserv-identify' interactively or run it with NICKNAME's
+password.
+The action is determined by the value of `erc-prompt-for-nickserv-password'."
+  (if erc-prompt-for-nickserv-password
+      (call-interactively 'erc-nickserv-identify)
+    (when erc-nickserv-passwords
+      (erc-nickserv-identify
+       (cdr (assoc nickname
+		   (nth 1 (assoc (erc-network)
+				 erc-nickserv-passwords))))))))
+
+;;;###autoload
+(defun erc-nickserv-identify (password)
+  "Send an \"identify <PASSWORD>\" message to NickServ.
+When called interactively, read the password using `read-passwd'."
+  (interactive
+   (list (read-passwd
+	  (format "NickServ password for %s on %s (RET to cancel): "
+		  (erc-current-nick)
+		  (or (and (erc-network)
+			   (symbol-name (erc-network)))
+		      "Unknown network")))))
+  (when (and password (not (string= "" password)))
+    (let* ((erc-auto-discard-away nil)
+	   (network (erc-network))
+	   (nickserv-info (assoc network erc-nickserv-alist))
+	   (nickserv (or (nth 3 nickserv-info) "NickServ"))
+	   (identify-word (or (nth 4 nickserv-info) "IDENTIFY"))
+	   (nick (if (nth 5 nickserv-info)
+		     (concat (erc-current-nick) " ")
+		   ""))
+	   (msgtype (or (nth 6 nickserv-info) "PRIVMSG")))
+      (erc-message msgtype
+		   (concat nickserv " " identify-word " " nick password)))))
+
+(provide 'erc-services)
+
+;;; erc-services.el ends here
+;;
+;; Local Variables:
+;; indent-tabs-mode: t
+;; tab-width: 8
+;; End:
+
+;; arch-tag: d401c8aa-d938-4255-96a9-3efb64c47e58
--- a/lisp/erc/erc-stamp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/erc/erc-stamp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -199,20 +199,20 @@
     (erc-put-text-property 0 len 'field 'erc-timestamp s)
     (insert s)))
 
-(defun erc-insert-aligned (string pos &optional fallback)
+(defun erc-insert-aligned (string pos)
   "Insert STRING based on a fraction of the width of the buffer.
 Fraction is roughly (/ POS (window-width)).
 
-If `erc-timestamp-right-align-by-pixel' is nil, use
-\(- POS FALLBACK) to determine how many spaces to insert."
+If `erc-timestamp-right-align-by-pixel' is nil, insert STRING at the
+POSth column, without using pixel coordinates."
   (if (not erc-timestamp-right-align-by-pixel)
-      (insert (make-string (- pos fallback) ? ) string)
+      (indent-to pos)
     (insert " ")
     (let ((offset (floor (* (/ (1- pos) (window-width) 1.0)
 			    (nth 2 (window-inside-pixel-edges))))))
       (put-text-property (1- (point)) (point) 'display
-			 `(space :align-to (,offset))))
-    (insert string)))
+			 `(space :align-to (,offset)))))
+  (insert string))
 
 (defun erc-insert-timestamp-right (string)
   "Insert timestamp on the right side of the screen.
@@ -257,14 +257,16 @@
 	   indent)
       ;; deal with variable-width characters
       (setq pos (- pos (string-width string))
-	    ;; the following is a kludge that works with most
-	    ;; international input
+	    ;; The following is a kludge that works with most
+	    ;; international input.  It is now only used to calculate
+	    ;; whether to move to the next line before inserting a
+	    ;; stamp.
 	    col (+ col (ceiling (/ (- col (- (point) (point-at-bol))) 1.6))))
       (if (< col pos)
-	  (erc-insert-aligned string pos col)
+	  (erc-insert-aligned string pos)
 	(newline)
+	(indent-to pos)
 	(setq from (point))
-	(indent-to pos)
 	(insert string))
       (erc-put-text-property from (1+ (point)) 'field 'erc-timestamp)
       (erc-put-text-property from (1+ (point)) 'rear-nonsticky t)
--- a/lisp/erc/erc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/erc/erc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1716,6 +1716,22 @@
   "Used to keep track of how many times an attempt at changing nick is made.")
 (make-variable-buffer-local 'erc-nick-change-attempt-count)
 
+(defun erc-migrate-modules (mods)
+  "Migrate old names of ERC modules to new ones."
+  ;; modify `transforms' to specify what needs to be changed
+  ;; each item is in the format '(new .old)
+  (let ((transforms '((pcomplete . completion)))
+	(modules (copy-alist mods)))
+    (dolist (transform transforms)
+      (let ((addp nil))
+	(setq modules (erc-delete-if `(lambda (val)
+					(and (eq val ',(car transform))
+					     (setq addition t)))
+				     modules))
+	(when addp
+	  (add-to-list 'modules (cdr transform)))))
+    (erc-delete-dups modules)))
+
 (defcustom erc-modules '(netsplit fill button match track pcomplete readonly
 				  ring autojoin noncommands irccontrols
 				  stamp)
@@ -1723,6 +1739,9 @@
 If you set the value of this without using `customize' remember to call
 \(erc-update-modules) after you change it.  When using `customize', modules
 removed from the list will be disabled."
+  :get (lambda (sym)
+	 ;; replace outdated names with their newer equivalents
+	 (erc-migrate-modules (symbol-value sym)))
   :set (lambda (sym val)
 	 ;; disable modules which have just been removed
 	 (when (and (boundp 'erc-modules) erc-modules val)
@@ -1732,7 +1751,7 @@
 		 (when (and (fboundp f) (boundp f) (symbol-value f))
 		   (message "Disabling `erc-%s'" module)
 		   (funcall f 0))))))
-	 (set-default sym val)
+	 (set sym val)
 	 ;; this test is for the case where erc hasn't been loaded yet
 	 (when (fboundp 'erc-update-modules)
 	   (erc-update-modules)))
@@ -1753,8 +1772,8 @@
 		     "Notify when the online status of certain users changes"
 		     notify)
 	      (const :tag "Complete nicknames and commands (programmable)"
-		     pcomplete)
-	      (const :tag "Complete nicknames and commands (old)" completion)
+		     completion)
+	      (const :tag "Complete nicknames and commands (old)" hecomplete)
 	      (const :tag "Make displayed lines read-only" readonly)
 	      (const :tag "Replace text in messages" replace)
 	      (const :tag "Enable an input history" ring)
@@ -1781,10 +1800,13 @@
        ;; yuck. perhaps we should bring the filenames into sync?
        ((string= req "erc-completion")
 	(setq req "erc-pcomplete")
-	(setq mod 'pcomplete))
-       ((string= req "erc-services")
-	(setq req "erc-nickserv")
-	(setq mod 'services)))
+	(setq mod 'completion))
+       ((string= req "erc-pcomplete")
+	(setq req "erc-pcomplete")
+	(setq mod 'completion))
+       ((string= req "erc-autojoin")
+	(setq req "erc-join")
+	(setq mod 'autojoin)))
       (condition-case nil
 	  (require (intern req))
 	(error nil))
@@ -3142,12 +3164,6 @@
 			    (erc-modes)))
   t)
 
-(defun erc-cmd-SMV ()
-  "Say the current ERC module versions into channel."
-  (erc-send-message (format "I'm using the following module revisions: %s!"
-			    (erc-version-modules)))
-  t)
-
 (defun erc-cmd-DEOP (&rest people)
   "Remove the operator setting from user(s) given in PEOPLE."
   (when (> (length people) 0)
--- a/lisp/eshell/em-alias.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-alias.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-alias.el --- creation and management of command aliases
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-banner.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-banner.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-banner.el --- sample module that displays a login banner
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-basic.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-basic.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-basic.el --- basic shell builtin commands
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-cmpl.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-cmpl.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-cmpl.el --- completion using the TAB key
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-dirs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-dirs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-dirs.el --- directory navigation commands
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-glob.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-glob.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-glob.el --- extended file name globbing
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-hist.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-hist.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-hist.el --- history list management
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-ls.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-ls.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-ls.el --- implementation of ls in Lisp
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-pred.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-pred.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-pred.el --- argument predicates and modifiers (ala zsh)
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-prompt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-prompt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-prompt.el --- command prompts
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-rebind.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-rebind.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-rebind.el --- rebind keys when point is at current input
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-script.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-script.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-script.el --- Eshell script files
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-smart.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-smart.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-smart.el --- smart display of output
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-term.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-term.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-term.el --- running visual commands
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-unix.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-unix.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-unix.el --- UNIX command aliases
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/em-xtra.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/em-xtra.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; em-xtra.el --- extra alias functions
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-arg.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-arg.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-arg.el --- argument processing
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-cmd.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-cmd.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-cmd.el --- command invocation
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-ext.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-ext.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-ext.el --- commands external to Eshell
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-io.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-io.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-io.el --- I/O management
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-maint.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-maint.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-maint.el --- init code for building eshell -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-mode.el --- user interface
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-module.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-module.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-module.el --- Eshell modules
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes
--- a/lisp/eshell/esh-opt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-opt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-opt.el --- command options processing
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-proc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-proc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-proc.el --- process management
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-test.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-test.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-test.el --- Eshell test suite
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-util.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-util.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-util.el --- general utilities
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/esh-var.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/esh-var.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; esh-var.el --- handling of variables
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/eshell/eshell.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/eshell/eshell.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eshell.el --- the Emacs command shell
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Version: 2.4.2
--- a/lisp/expand.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/expand.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; expand.el --- make abbreviations more usable
 
 ;; Copyright (C) 1995, 1996, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
 ;; Maintainer: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
--- a/lisp/ezimage.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ezimage.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ezimage --- Generalized Image management
 
-;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
--- a/lisp/facemenu.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/facemenu.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; facemenu.el --- create a face menu for interactively adding fonts to text
 
 ;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: faces
--- a/lisp/faces.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/faces.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; faces.el --- Lisp faces
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/ffap.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ffap.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ffap.el --- find file (or url) at point
 
 ;; Copyright (C) 1995, 1996, 1997, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
 ;; Maintainer: Rajesh Vaidheeswarran  <rv@gnu.org>
--- a/lisp/filecache.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/filecache.el	Sun Feb 12 00:15:44 2006 +0000
@@ -5,7 +5,7 @@
 ;; Keywords: convenience
 ;;
 ;; Copyright (C) 1996, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/files.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/files.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,8 @@
 ;;; files.el --- file input and output commands for Emacs
 
-;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996,
+;;   1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -1024,7 +1025,7 @@
 
 Interactively, or if WILDCARDS is non-nil in a call from Lisp,
 expand wildcards (if any) and visit multiple files.  You can
-suppress wildcard expansion by setting `find-file-wildcards'.
+suppress wildcard expansion by setting `find-file-wildcards' to nil.
 
 To visit a file without any kind of conversion and without
 automatically choosing a major mode, use \\[find-file-literally]."
@@ -1076,7 +1077,7 @@
 
 (defun find-file-existing (filename &optional wildcards)
   "Edit the existing file FILENAME.
-Like \\[find-file] but only allow files that exists."
+Like \\[find-file] but only allow a file that exists."
   (interactive (find-file-read-args "Find existing file: " t))
   (unless (file-exists-p filename) (error "%s does not exist" filename))
   (find-file filename wildcards)
@@ -3795,8 +3796,8 @@
 to nil.
 
 Optional second argument NOCONFIRM means don't ask for confirmation at
-all.  (The local variable `revert-without-query', if non-nil, prevents
-confirmation.)
+all.  \(The variable `revert-without-query' offers another way to
+revert buffers without querying for confirmation.)
 
 Optional third argument PRESERVE-MODES non-nil means don't alter
 the files modes.  Normally we reinitialize them using `normal-mode'.
@@ -3831,13 +3832,10 @@
 	       (error "Buffer does not seem to be associated with any file"))
 	      ((or noconfirm
 		   (and (not (buffer-modified-p))
-			(let ((tail revert-without-query)
-			      (found nil))
-			  (while tail
-			    (if (string-match (car tail) file-name)
-				(setq found t))
-			    (setq tail (cdr tail)))
-			  found))
+			(catch 'found
+			  (dolist (regexp revert-without-query)
+			    (when (string-match regexp file-name)
+			      (throw 'found t)))))
 		   (yes-or-no-p (format "Revert buffer from file %s? "
 					file-name)))
 	       (run-hooks 'before-revert-hook)
@@ -3846,50 +3844,51 @@
 	       (and (not auto-save-p)
 		    (not (verify-visited-file-modtime (current-buffer)))
 		    (setq buffer-backed-up nil))
-	       ;; Get rid of all undo records for this buffer.
-	       (or (eq buffer-undo-list t)
-		   (setq buffer-undo-list nil))
 	       ;; Effectively copy the after-revert-hook status,
 	       ;; since after-find-file will clobber it.
 	       (let ((global-hook (default-value 'after-revert-hook))
-		     (local-hook-p (local-variable-p 'after-revert-hook))
-		     (local-hook (and (local-variable-p 'after-revert-hook)
-				      after-revert-hook)))
-		 (let (buffer-read-only
-		       ;; Don't make undo records for the reversion.
-		       (buffer-undo-list t))
-		   (if revert-buffer-insert-file-contents-function
-		       (funcall revert-buffer-insert-file-contents-function
-				file-name auto-save-p)
-		     (if (not (file-exists-p file-name))
-			 (error (if buffer-file-number
-				    "File %s no longer exists!"
-				  "Cannot revert nonexistent file %s")
-				file-name))
-		     ;; Bind buffer-file-name to nil
-		     ;; so that we don't try to lock the file.
-		     (let ((buffer-file-name nil))
-		       (or auto-save-p
-			   (unlock-buffer)))
-		     (widen)
-		     (let ((coding-system-for-read
-			    ;; Auto-saved file shoule be read by Emacs'
-			    ;; internal coding.
-			    (if auto-save-p 'auto-save-coding
-			      (or coding-system-for-read
-				  buffer-file-coding-system-explicit))))
-		       ;; This force after-insert-file-set-coding
-		       ;; (called from insert-file-contents) to set
-		       ;; buffer-file-coding-system to a proper value.
-		       (kill-local-variable 'buffer-file-coding-system)
-
-		       ;; Note that this preserves point in an intelligent way.
-		       (if preserve-modes
-			   (let ((buffer-file-format buffer-file-format))
-			     (insert-file-contents file-name (not auto-save-p)
-						   nil nil t))
-			 (insert-file-contents file-name (not auto-save-p)
-					       nil nil t)))))
+		     (local-hook (when (local-variable-p 'after-revert-hook)
+				   after-revert-hook))
+		     (inhibit-read-only t))
+		 (cond
+		  (revert-buffer-insert-file-contents-function
+		   (unless (eq buffer-undo-list t)
+		     ;; Get rid of all undo records for this buffer.
+		     (setq buffer-undo-list nil))
+		   ;; Don't make undo records for the reversion.
+		   (let ((buffer-undo-list t))
+		     (funcall revert-buffer-insert-file-contents-function
+			      file-name auto-save-p)))
+		  ((not (file-exists-p file-name))
+		   (error (if buffer-file-number
+			      "File %s no longer exists!"
+			    "Cannot revert nonexistent file %s")
+			  file-name))
+		  (t
+		   ;; Bind buffer-file-name to nil
+		   ;; so that we don't try to lock the file.
+		   (let ((buffer-file-name nil))
+		     (or auto-save-p
+			 (unlock-buffer)))
+		   (widen)
+		   (let ((coding-system-for-read
+			  ;; Auto-saved file should be read by Emacs'
+			  ;; internal coding.
+			  (if auto-save-p 'auto-save-coding
+			    (or coding-system-for-read
+				buffer-file-coding-system-explicit))))
+		     ;; This force after-insert-file-set-coding
+		     ;; (called from insert-file-contents) to set
+		     ;; buffer-file-coding-system to a proper value.
+		     (kill-local-variable 'buffer-file-coding-system)
+
+		     ;; Note that this preserves point in an intelligent way.
+		     (if preserve-modes
+			 (let ((buffer-file-format buffer-file-format))
+			   (insert-file-contents file-name (not auto-save-p)
+						 nil nil t))
+		       (insert-file-contents file-name (not auto-save-p)
+					     nil nil t)))))
 		 ;; Recompute the truename in case changes in symlinks
 		 ;; have changed the truename.
 		 (setq buffer-file-truename
@@ -3897,7 +3896,7 @@
 		 (after-find-file nil nil t t preserve-modes)
 		 ;; Run after-revert-hook as it was before we reverted.
 		 (setq-default revert-buffer-internal-hook global-hook)
-		 (if local-hook-p
+		 (if local-hook
 		     (set (make-local-variable 'revert-buffer-internal-hook)
 			  local-hook)
 		   (kill-local-variable 'revert-buffer-internal-hook))
@@ -3943,7 +3942,7 @@
 		   (insert-directory-safely file-name switches))))
 	     (yes-or-no-p (format "Recover auto save file %s? " file-name)))
 	   (switch-to-buffer (find-file-noselect file t))
-	   (let ((buffer-read-only nil)
+	   (let ((inhibit-read-only t)
 		 ;; Keep the current buffer-file-coding-system.
 		 (coding-system buffer-file-coding-system)
 		 ;; Auto-saved file shoule be read with special coding.
--- a/lisp/filesets.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/filesets.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; filesets.el --- handle group of files
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Thomas Link <t.link@gmx.at>
 ;; Maintainer: FSF
--- a/lisp/find-dired.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/find-dired.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; find-dired.el --- run a `find' command and dired the output
 
 ;; Copyright (C) 1992, 1994, 1995, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>,
 ;;	   Sebastian Kremer <sk@thp.uni-koeln.de>
--- a/lisp/find-file.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/find-file.el	Sun Feb 12 00:15:44 2006 +0000
@@ -5,7 +5,7 @@
 ;; Keywords: c, matching, tools
 
 ;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/find-lisp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/find-lisp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -3,10 +3,10 @@
 ;; Author: Peter Breton
 ;; Created: Fri Mar 26 1999
 ;; Keywords: unix
-;; Time-stamp: <2005-11-11 20:37:50 teirllm>
+;; Time-stamp: <2006-02-06 13:40:10 ttn>
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/finder.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/finder.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; finder.el --- topic & keyword-based code finder
 
 ;; Copyright (C) 1992, 1997, 1998, 1999, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Created: 16 Jun 1992
--- a/lisp/flow-ctrl.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/flow-ctrl.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control
 
 ;; Copyright (C) 1990, 1991, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author Kevin Gallagher
 ;; Maintainer: FSF
--- a/lisp/foldout.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/foldout.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode
 
-;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk>
 ;; Maintainer: FSF
--- a/lisp/follow.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/follow.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; follow.el --- synchronize windows showing the same buffer
 
 ;; Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
 ;; Maintainer: FSF (Anders' email bounces, Sep 2005)
--- a/lisp/font-core.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/font-core.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; font-core.el --- Core interface to font-lock
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: languages, faces
--- a/lisp/format.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/format.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; format.el --- read and save files in multiple formats
 
 ;; Copyright (C) 1994, 1995, 1997, 1999, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 
--- a/lisp/forms.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/forms.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; forms.el --- Forms mode: edit a file as a form to fill in
 
 ;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Johan Vromans <jvromans@squirrel.nl>
 
--- a/lisp/frame.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/frame.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; frame.el --- multi-frame management independent of window systems
 
 ;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -769,7 +769,7 @@
     (select-frame frame)
     (raise-frame frame)
     ;; Ensure, if possible, that frame gets input focus.
-    (cond ((eq (window-system frame) 'x)
+    (cond ((memq (window-system frame) '(x max))
 	   (x-focus-frame frame))
 	  ((eq (window-system frame) 'w32)
 	   (w32-focus-frame frame)))
--- a/lisp/fringe.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/fringe.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; fringe.el --- change fringes appearance in various ways
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Maintainer: FSF
--- a/lisp/generic-x.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/generic-x.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; generic-x.el --- A collection of generic modes
 
 ;; Copyright (C) 1997, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Tue Oct 08 1996
@@ -1706,6 +1706,8 @@
     "reiserfs"
     "romfs"
     "smbfs"
+    "cifs"
+    "usbdevfs"
     "sysv"
     "tmpfs"
     "udf"
@@ -1717,7 +1719,7 @@
     "swap"
     "auto"
     "ignore")
-  '(("^\\([/-A-Za-z0-9_]+\\)\\s-+\\([/-A-Za-z0-9_]+\\)"
+  '(("^\\([^# \t]+\\)\\s-+\\([^# \t]+\\)"
      (1 font-lock-type-face t)
      (2 font-lock-variable-name-face t)))
   '("/etc/[v]*fstab\\'")
@@ -1725,7 +1727,7 @@
    (function
     (lambda ()
       (setq imenu-generic-expression
-	    '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))))
+	    '((nil "^\\([^# \t]+\\)\\s-+" 1))))))))
 
 ;; From Jacques Duthen <jacques.duthen@sncf.fr>
 (when (memq 'show-tabs-generic-mode generic-extras-enable-list)
--- a/lisp/gnus/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,3 +1,85 @@
+2006-02-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.el: Remove bogus comment.
+
+2006-02-09  Daiki Ueno  <ueno@unixuser.org>
+
+	* pgg-gpg.el (pgg-gpg-encrypt-region): Don't convert line-endings
+	in elisp.
+	(pgg-gpg-encrypt-symmetric-region): Ditto.
+	(pgg-gpg-sign-region): Ditto.
+
+	* pgg-def.el (pgg-text-mode): New variable.
+
+	* mml2015.el (mml2015-pgg-sign): Enable pgg-text-mode.
+	(mml2015-pgg-encrypt): Ditto.
+
+	* mml1991.el (mml1991-pgg-sign): Enable pgg-text-mode.
+	(mml1991-pgg-encrypt): Ditto.
+
+2006-02-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nnfolder.el (nnfolder-insert-newsgroup-line): Use
+	message-make-date instead of current-time-string.
+
+	* mm-view.el (mm-inline-message): Don't set gnus-newsgroup-charset
+	to gnus-decoded which mm-uu might set.
+
+2006-02-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* rfc2231.el (rfc2231-parse-string): Sort segmented parameters;
+	don't decode quoted parameters; remove misimported Emacs code.
+	Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
+	(rfc2231-decode-encoded-string): Don't use split-string which
+	behaves differently according to Emacs version; use
+	mm-decode-coding-region to convert charset to coding-system.
+	Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
+	(rfc2231-encode-string): Remove misimported Emacs code.
+
+2006-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (article-decode-charset): Don't use ignore-errors
+	when calling mail-header-parse-content-type.
+	(article-de-quoted-unreadable): Ditto.
+	(article-de-base64-unreadable): Ditto.
+	(article-wash-html): Ditto.
+
+	* mm-decode.el (mm-dissect-buffer): Don't use ignore-errors when
+	calling mail-header-parse-content-type and
+	mail-header-parse-content-disposition.
+	(mm-find-raw-part-by-type): Don't use ignore-errors when calling
+	mail-header-parse-content-type.
+
+	* mml.el (mml-insert-mime-headers): Use mml-insert-parameter to
+	insert charset and format parameters; encode description after
+	inserting it to buffer.
+	(mml-insert-parameter): Fold lines properly even if a parameter is
+	segmented into two or more lines; change the max column to 76.
+
+	* rfc1843.el (rfc1843-decode-article-body): Don't use
+	ignore-errors when calling mail-header-parse-content-type.
+
+	* rfc2231.el (rfc2231-parse-string): Return at least type if
+	possible; don't cause an error even if it fails in parsing of
+	parameters.  Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
+	(rfc2231-encode-string): Don't break lines at the beginning, leave
+	it to mml-insert-parameter.
+
+	* webmail.el (webmail-yahoo-article): Don't use ignore-errors when
+	calling mail-header-parse-content-type.
+
+2006-02-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* spam-report.el (spam-report-gmane-use-article-number): Improve
+	doc string.
+	(spam-report-gmane-internal): Check if a suitable header was found
+	in the article.
+
+2006-02-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* rfc2231.el (rfc2231-parse-string): Revert 2006-02-03 change.
+	(rfc2231-encode-string): Make param*=value always begin with LWSP.
+
 2006-02-05  Romain Francoise  <romain@orebokech.com>
 
 	Update copyright notices of all files in the gnus directory.
@@ -6,7 +88,7 @@
 
 	* gnus-util.el (gnus-error): Describe `args'.
 
-2006-02-03  Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de>
+2006-02-03  Andreas Seltenreich  <uwi7@stud.uni-karlsruhe.de>
 
 	* nnweb.el (nnweb-request-group): Avoid growing overview files.
 
@@ -23,7 +105,7 @@
 	* mml.el (mml-generate-mime-1): Correct the order of inline signed
 	parts.
 
-2006-01-31  Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de>
+2006-01-31  Andreas Seltenreich  <uwi7@stud.uni-karlsruhe.de>
 
 	* nnweb.el (nnweb-group-alist): Use defvar instead of defvoo,
 	there's only one active file for all servers.
@@ -64,7 +146,7 @@
 
 	* nnweb.el (nnweb-google-parse-1): Clarify some comments.
 
-2006-01-30  Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de>
+2006-01-30  Andreas Seltenreich  <uwi7@stud.uni-karlsruhe.de>
 
 	* nnweb.el (nnweb-type-definition, nnweb-google-parse-1)
 	(nnweb-google-create-mapping, nnweb-google-search): Adapt to
@@ -422,6 +504,98 @@
 	as a buffer-local variable.  This avoids creating truncated
 	dribble files as a result of a hang up, eg.
 
+2005-11-04 Ken Manheimer  <ken.manheimer@gmail.com>
+
+	* pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
+	(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
+	(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
+	(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
+	argument to all these routines, so the passphrase can be managed
+	externally and passed in to the system.
+	(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
+	pgg-add-passphrase-to-cache function.
+
+	* pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
+	(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
+	(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
+	(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
+	argument to all these routines, so the passphrase can be managed
+	externally and passed in to the system.
+	(pgg-pgp5-sign-region): Use new name of	pgg-add-passphrase-to-cache
+	function.
+
+2005-10-29  Ken Manheimer  <ken.manheimer@gmail.com>
+
+	* pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
+	part of the decoded armor to find the key-identifier.
+	(pgg-gpg-lookup-key-owner): New function to return the
+	human-readable identifier of a key owner.
+	(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
+	key itself.
+	(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
+	the key value) if we have a key and can match it against a secret
+	key.  Also, added a note pointing out fact that the prompt only
+	indicates the first matching key.
+
+	* pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
+	pgg-decrypt-region.
+	(pgg-pending-timers): A new hash for tracking the passphrase cache
+	timers, so that new ones supercede old ones.
+	(pgg-add-passphrase-to-cache): Rename from
+	`pgg-add-passphrase-cache' to reduce confusion (all callers
+	changed).  Modified to cancel old timers when new ones are added.
+	(pgg-remove-passphrase-from-cache): Rename from
+	`pgg-remove-passphrase-cache' to reduce confusion (all callers
+	changed).  Modified to cancel old timers when their keys are
+	removed from the cache.
+	(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
+	XEmacs, an indirection to delete-itimer.
+	(pgg-read-passphrase-from-cache, pgg-read-passphrase):
+	Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
+	users can only check cache without risk of prompting.  Correct bug in
+	notruncate behavior.
+	(pgg-read-passphrase-from-cache, pgg-read-passphrase)
+	(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
+	Add informative docstrings.
+	(pgg-decrypt): Convey provided passphrase in subordinate call to
+	pgg-decrypt-region.
+
+2005-10-20  Ken Manheimer  <ken.manheimer+emacs@gmail.com>
+
+	* pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
+	(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
+	(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
+	'passphrase' argument, so the passphrase can be managed externally
+	and then passed in to the system.
+
+	* pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
+	(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
+	so the passphrase cache can be used reliably with identifiers
+	besides a pgp packet's key id.
+
+	* pgg-gpg.el (pgg-pgp-encrypt-region)
+	(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
+	(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
+	(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
+	argument to all these routines, so the passphrase can be managed
+	externally and passed in to the system.
+
+	* pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
+	'notruncate' argument, so the passphrase cache can be used
+	reliably with identifiers besides a pgp packet's key id.
+
+2005-10-29  Sascha Wilde  <swilde@sha-bang.de>
+
+	* pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
+	symmetric encryption.
+	(pgg-gpg-symmetric-key-p): New function to check for an symmetric
+	encrypted session key.
+	(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
+	message ask for the passphrase in a proper way.
+
+	* pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
+	New user commands for symmetric encryption.
+
 2005-11-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* gnus-delay.el (gnus-delay-group): Don't autoload.
--- a/lisp/gnus/gnus-art.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/gnus-art.el	Sun Feb 12 00:15:44 2006 +0000
@@ -2267,38 +2267,37 @@
 			   (error))
 			 gnus-newsgroup-ignored-charsets))
 	ct cte ctl charset format)
-  (save-excursion
-    (save-restriction
-      (article-narrow-to-head)
-      (setq ct (message-fetch-field "Content-Type" t)
-	    cte (message-fetch-field "Content-Transfer-Encoding" t)
-	    ctl (and ct (ignore-errors
-			  (mail-header-parse-content-type ct)))
-	    charset (cond
-		     (prompt
-		      (mm-read-coding-system "Charset to decode: "))
-		     (ctl
-		      (mail-content-type-get ctl 'charset)))
-	    format (and ctl (mail-content-type-get ctl 'format)))
-      (when cte
-	(setq cte (mail-header-strip cte)))
-      (if (and ctl (not (string-match "/" (car ctl))))
-	  (setq ctl nil))
-      (goto-char (point-max)))
-    (forward-line 1)
-    (save-restriction
-      (narrow-to-region (point) (point-max))
-      (when (and (eq mail-parse-charset 'gnus-decoded)
-		 (eq (mm-body-7-or-8) '8bit))
-	;; The text code could have been decoded.
-	(setq charset mail-parse-charset))
-      (when (and (or (not ctl)
-		     (equal (car ctl) "text/plain"))
-		 (not format)) ;; article with format will decode later.
-	(mm-decode-body
-	 charset (and cte (intern (downcase
-				   (gnus-strip-whitespace cte))))
-	 (car ctl)))))))
+    (save-excursion
+      (save-restriction
+	(article-narrow-to-head)
+	(setq ct (message-fetch-field "Content-Type" t)
+	      cte (message-fetch-field "Content-Transfer-Encoding" t)
+	      ctl (and ct (mail-header-parse-content-type ct))
+	      charset (cond
+		       (prompt
+			(mm-read-coding-system "Charset to decode: "))
+		       (ctl
+			(mail-content-type-get ctl 'charset)))
+	      format (and ctl (mail-content-type-get ctl 'format)))
+	(when cte
+	  (setq cte (mail-header-strip cte)))
+	(if (and ctl (not (string-match "/" (car ctl))))
+	    (setq ctl nil))
+	(goto-char (point-max)))
+      (forward-line 1)
+      (save-restriction
+	(narrow-to-region (point) (point-max))
+	(when (and (eq mail-parse-charset 'gnus-decoded)
+		   (eq (mm-body-7-or-8) '8bit))
+	  ;; The text code could have been decoded.
+	  (setq charset mail-parse-charset))
+	(when (and (or (not ctl)
+		       (equal (car ctl) "text/plain"))
+		   (not format)) ;; article with format will decode later.
+	  (mm-decode-body
+	   charset (and cte (intern (downcase
+				     (gnus-strip-whitespace cte))))
+	   (car ctl)))))))
 
 (defun article-decode-encoded-words ()
   "Remove encoded-word encoding from headers."
@@ -2390,9 +2389,7 @@
 	    (setq type
 		  (gnus-fetch-field "content-transfer-encoding"))
 	    (let* ((ct (gnus-fetch-field "content-type"))
-		   (ctl (and ct
-			     (ignore-errors
-			       (mail-header-parse-content-type ct)))))
+		   (ctl (and ct (mail-header-parse-content-type ct))))
 	      (setq charset (and ctl
 				 (mail-content-type-get ctl 'charset)))
 	      (if (stringp charset)
@@ -2420,9 +2417,7 @@
 	    (setq type
 		  (gnus-fetch-field "content-transfer-encoding"))
 	    (let* ((ct (gnus-fetch-field "content-type"))
-		   (ctl (and ct
-			     (ignore-errors
-			       (mail-header-parse-content-type ct)))))
+		   (ctl (and ct (mail-header-parse-content-type ct))))
 	      (setq charset (and ctl
 				 (mail-content-type-get ctl 'charset)))
 	      (if (stringp charset)
@@ -2488,9 +2483,7 @@
 	(when (gnus-buffer-live-p gnus-original-article-buffer)
 	  (with-current-buffer gnus-original-article-buffer
 	    (let* ((ct (gnus-fetch-field "content-type"))
-		   (ctl (and ct
-			     (ignore-errors
-			       (mail-header-parse-content-type ct)))))
+		   (ctl (and ct (mail-header-parse-content-type ct))))
 	      (setq charset (and ctl
 				 (mail-content-type-get ctl 'charset)))
 	      (when (stringp charset)
--- a/lisp/gnus/gnus.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/gnus.el	Sun Feb 12 00:15:44 2006 +0000
@@ -4257,9 +4257,6 @@
 		       (delete-frame gnus-other-frame-object))
 		     (setq gnus-other-frame-object nil)))))))
 
-;;(setq thing ?				; this is a comment
-;;      more 'yes)
-
 ;;;###autoload
 (defun gnus (&optional arg dont-connect slave)
   "Read network news.
--- a/lisp/gnus/mm-decode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/mm-decode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -534,13 +534,13 @@
 		  loose-mime
 		  (mail-fetch-field "mime-version"))
 	  (setq ct (mail-fetch-field "content-type")
-		ctl (ignore-errors (mail-header-parse-content-type ct))
+		ctl (and ct (mail-header-parse-content-type ct))
 		cte (mail-fetch-field "content-transfer-encoding")
 		cd (mail-fetch-field "content-disposition")
 		description (mail-fetch-field "content-description")
 		id (mail-fetch-field "content-id"))
 	  (unless from
-		(setq from (mail-fetch-field "from")))
+	    (setq from (mail-fetch-field "from")))
 	  ;; FIXME: In some circumstances, this code is running within
 	  ;; an unibyte macro.  mail-extract-address-components
 	  ;; creates unibyte buffers. This `if', though not a perfect
@@ -557,7 +557,7 @@
 				       (mail-header-remove-comments
 					cte)))))
 	   no-strict-mime
-	   (and cd (ignore-errors (mail-header-parse-content-disposition cd)))
+	   (and cd (mail-header-parse-content-disposition cd))
 	   description)
 	(setq type (split-string (car ctl) "/"))
 	(setq subtype (cadr type)
@@ -592,8 +592,7 @@
 					 (mail-header-remove-comments
 					  cte)))))
 	     no-strict-mime
-	     (and cd (ignore-errors
-		       (mail-header-parse-content-disposition cd)))
+	     (and cd (mail-header-parse-content-disposition cd))
 	     description id)
 	    ctl))))
 	(when id
@@ -1401,9 +1400,8 @@
 	(save-excursion
 	  (save-restriction
 	    (narrow-to-region start (1- (point)))
-	    (when (let ((ctl (ignore-errors
-			       (mail-header-parse-content-type
-				(mail-fetch-field "content-type")))))
+	    (when (let* ((ct (mail-fetch-field "content-type"))
+			 (ctl (and ct (mail-header-parse-content-type ct))))
 		    (if notp
 			(not (equal (car ctl) type))
 		      (equal (car ctl) type)))
@@ -1414,9 +1412,8 @@
       (save-excursion
 	(save-restriction
 	  (narrow-to-region start end)
-	  (when (let ((ctl (ignore-errors
-			     (mail-header-parse-content-type
-			      (mail-fetch-field "content-type")))))
+	  (when (let* ((ct (mail-fetch-field "content-type"))
+		       (ctl (and ct (mail-header-parse-content-type ct))))
 		  (if notp
 		      (not (equal (car ctl) type))
 		    (equal (car ctl) type)))
--- a/lisp/gnus/mm-view.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/mm-view.el	Sun Feb 12 00:15:44 2006 +0000
@@ -486,7 +486,8 @@
 	      ;; disable prepare hook
 	      gnus-article-prepare-hook
 	      (gnus-newsgroup-charset
-	       (or charset gnus-newsgroup-charset)))
+	       (unless (eq charset 'gnus-decoded) ;; mm-uu might set it.
+		 (or charset gnus-newsgroup-charset))))
 	  (let ((gnus-original-article-buffer (mm-handle-buffer handle)))
 	    (run-hooks 'gnus-article-decode-hook))
 	  (gnus-article-prepare-display)
--- a/lisp/gnus/mml.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/mml.el	Sun Feb 12 00:15:44 2006 +0000
@@ -664,10 +664,10 @@
 	 "Can't encode a part with several charsets"))
       (insert "Content-Type: " type)
       (when charset
-	(insert "; " (mail-header-encode-parameter
-		      "charset" (symbol-name charset))))
+	(mml-insert-parameter
+	 (mail-header-encode-parameter "charset" (symbol-name charset))))
       (when flowed
-	(insert "; format=flowed"))
+	(mml-insert-parameter "format=flowed"))
       (when parameters
 	(mml-insert-parameter-string
 	 cont mml-content-type-parameters))
@@ -687,8 +687,11 @@
     (unless (eq encoding '7bit)
       (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
     (when (setq description (cdr (assq 'description cont)))
-      (insert "Content-Description: "
-	      (mail-encode-encoded-word-string description) "\n"))))
+      (insert "Content-Description: ")
+      (setq description (prog1
+			    (point)
+			  (insert description "\n")))
+      (mail-encode-encoded-word-region description (point)))))
 
 (defun mml-parameter-string (cont types)
   (let ((string "")
@@ -841,14 +844,20 @@
 
 (defun mml-insert-parameter (&rest parameters)
   "Insert PARAMETERS in a nice way."
-  (dolist (param parameters)
-    (insert ";")
-    (let ((point (point)))
+  (let (start end)
+    (dolist (param parameters)
+      (insert ";")
+      (setq start (point))
       (insert " " param)
-      (when (> (current-column) 71)
-	(goto-char point)
-	(insert "\n ")
-	(end-of-line)))))
+      (setq end (point))
+      (goto-char start)
+      (end-of-line)
+      (if (> (current-column) 76)
+	  (progn
+	    (goto-char start)
+	    (insert "\n")
+	    (goto-char (1+ end)))
+	(goto-char end)))))
 
 ;;;
 ;;; Mode for inserting and editing MML forms
--- a/lisp/gnus/mml1991.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/mml1991.el	Sun Feb 12 00:15:44 2006 +0000
@@ -229,7 +229,8 @@
   (defvar pgg-output-buffer))
 
 (defun mml1991-pgg-sign (cont)
-  (let (headers cte)
+  (let ((pgg-text-mode t)
+	headers cte)
     ;; Don't sign headers.
     (goto-char (point-min))
     (while (not (looking-at "^$"))
@@ -261,7 +262,8 @@
     t))
 
 (defun mml1991-pgg-encrypt (cont &optional sign)
-  (let (cte)
+  (let ((pgg-text-mode t)
+	cte)
     ;; Strip MIME Content[^ ]: headers since it will be ASCII ARMOURED
     (goto-char (point-min))
     (while (looking-at "^Content[^ ]+:")
--- a/lisp/gnus/mml2015.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/mml2015.el	Sun Feb 12 00:15:44 2006 +0000
@@ -814,6 +814,7 @@
 	(boundary (mml-compute-boundary cont))
 	(pgg-default-user-id (or (message-options-get 'mml-sender)
 				 pgg-default-user-id))
+	(pgg-text-mode t)
 	entry)
     (unless (pgg-sign-region (point-min) (point-max))
       (pop-to-buffer mml2015-result-buffer)
@@ -841,6 +842,7 @@
 
 (defun mml2015-pgg-encrypt (cont &optional sign)
   (let ((pgg-errors-buffer mml2015-result-buffer)
+	(pgg-text-mode t)
 	(boundary (mml-compute-boundary cont)))
     (unless (pgg-encrypt-region (point-min) (point-max)
 				(split-string
--- a/lisp/gnus/nnfolder.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/nnfolder.el	Sun Feb 12 00:15:44 2006 +0000
@@ -826,7 +826,7 @@
       (insert "\n"))
     (forward-char -1)
     (insert (format (concat nnfolder-article-marker "%d   %s\n")
-		    (cdr group-art) (current-time-string)))))
+		    (cdr group-art) (message-make-date)))))
 
 (defun nnfolder-active-number (group)
   ;; Find the next article number in GROUP.
--- a/lisp/gnus/rfc1843.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/rfc1843.el	Sun Feb 12 00:15:44 2006 +0000
@@ -149,8 +149,7 @@
 	  (let* ((inhibit-point-motion-hooks t)
 		 (case-fold-search t)
 		 (ct (message-fetch-field "Content-Type" t))
-		 (ctl (and ct (ignore-errors
-				(mail-header-parse-content-type ct)))))
+		 (ctl (and ct (mail-header-parse-content-type ct))))
 	    (if (and ctl (not (string-match "/" (car ctl))))
 		(setq ctl nil))
 	    (goto-char (point-max))
--- a/lisp/gnus/rfc2231.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/rfc2231.el	Sun Feb 12 00:15:44 2006 +0000
@@ -41,22 +41,19 @@
 N.B.  This is in violation with RFC2047, but it seem to be in common use."
   (rfc2231-parse-string (rfc2047-decode-string string)))
 
-(defun rfc2231-parse-string (string)
+(defun rfc2231-parse-string (string &optional signal-error)
   "Parse STRING and return a list.
 The list will be on the form
- `(name (attribute . value) (attribute . value)...)"
+ `(name (attribute . value) (attribute . value)...)'.
+
+If the optional SIGNAL-ERROR is non-nil, signal an error when this
+function fails in parsing of parameters."
   (with-temp-buffer
     (let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token))
 	  (stoken (ietf-drums-token-to-list ietf-drums-tspecials))
 	  (ntoken (ietf-drums-token-to-list "0-9"))
-	  (prev-value "")
-	  display-name mailbox c display-string parameters
-	  attribute value type subtype number encoded
-	  prev-attribute prev-encoded)
-      ;; Some mailer (e.g. Thunderbird 1.5) doesn't terminate each
-      ;; line with semicolon when folding a long parameter value.
-      (while (string-match "\\([^\t\n\r ;]\\)[\t ]*\r?\n[\t ]+" string)
-	(setq string (replace-match "\\1;\n " nil nil string)))
+	  c type attribute encoded number prev-attribute vals
+	  prev-encoded parameters value)
       (ietf-drums-init (mail-header-remove-whitespace
 			(mail-header-remove-comments string)))
       (let ((table (copy-syntax-table ietf-drums-syntax-table)))
@@ -74,63 +71,76 @@
 	(setq type (downcase (buffer-substring
 			      (point) (progn (forward-sexp 1) (point)))))
 	;; Do the params
-	(while (not (eobp))
-	  (setq c (char-after))
-	  (unless (eq c ?\;)
-	    (error "Invalid header: %s" string))
-	  (forward-char 1)
-	  ;; If c in nil, then this is an invalid header, but
-	  ;; since elm generates invalid headers on this form,
-	  ;; we allow it.
-	  (when (setq c (char-after))
-	    (if (and (memq c ttoken)
-		     (not (memq c stoken)))
-		(setq attribute
-		      (intern
-		       (downcase
-			(buffer-substring
-			 (point) (progn (forward-sexp 1) (point))))))
-	      (error "Invalid header: %s" string))
-	    (setq c (char-after))
-	    (when (eq c ?*)
-	      (forward-char 1)
-	      (setq c (char-after))
-	      (if (not (memq c ntoken))
-		  (setq encoded t
-			number nil)
-		(setq number
-		      (string-to-number
-		       (buffer-substring
-			(point) (progn (forward-sexp 1) (point)))))
+	(condition-case err
+	    (progn
+	      (while (not (eobp))
 		(setq c (char-after))
-		(when (eq c ?*)
-		  (setq encoded t)
+		(unless (eq c ?\;)
+		  (error "Invalid header: %s" string))
+		(forward-char 1)
+		;; If c in nil, then this is an invalid header, but
+		;; since elm generates invalid headers on this form,
+		;; we allow it.
+		(when (setq c (char-after))
+		  (if (and (memq c ttoken)
+			   (not (memq c stoken)))
+		      (setq attribute
+			    (intern
+			     (downcase
+			      (buffer-substring
+			       (point) (progn (forward-sexp 1) (point))))))
+		    (error "Invalid header: %s" string))
+		  (setq c (char-after))
+		  (if (eq c ?*)
+		      (progn
+			(forward-char 1)
+			(setq c (char-after))
+			(if (not (memq c ntoken))
+			    (setq encoded t
+				  number nil)
+			  (setq number
+				(string-to-number
+				 (buffer-substring
+				  (point) (progn (forward-sexp 1) (point)))))
+			  (setq c (char-after))
+			  (when (eq c ?*)
+			    (setq encoded t)
+			    (forward-char 1)
+			    (setq c (char-after)))))
+		    (setq number nil
+			  encoded nil))
+		  ;; See if we have any previous continuations.
+		  (when (and prev-attribute
+			     (not (eq prev-attribute attribute)))
+		    (setq vals
+			  (mapconcat 'cdr (sort vals 'car-less-than-car) ""))
+		    (push (cons prev-attribute
+				(if prev-encoded
+				    (rfc2231-decode-encoded-string vals)
+				  vals))
+			  parameters)
+		    (setq prev-attribute nil
+			  vals nil
+			  prev-encoded nil))
+		  (unless (eq c ?=)
+		    (error "Invalid header: %s" string))
 		  (forward-char 1)
-		  (setq c (char-after)))))
-	    ;; See if we have any previous continuations.
-	    (when (and prev-attribute
-		       (not (eq prev-attribute attribute)))
-	      (push (cons prev-attribute
-			  (if prev-encoded
-			      (rfc2231-decode-encoded-string prev-value)
-			    prev-value))
-		    parameters)
-	      (setq prev-attribute nil
-		    prev-value ""
-		    prev-encoded nil))
-	    (unless (eq c ?=)
-	      (error "Invalid header: %s" string))
-	    (forward-char 1)
-	    (setq c (char-after))
-	    (cond
-	     ((eq c ?\")
-	      (setq value
-		    (buffer-substring (1+ (point))
-				      (progn (forward-sexp 1) (1- (point))))))
-	     ((and (or (memq c ttoken)
-		       (> c ?\177)) ;; EXTENSION: Support non-ascii chars.
-		   (not (memq c stoken)))
-	      (setq value (buffer-substring
+		  (setq c (char-after))
+		  (cond
+		   ((eq c ?\")
+		    (setq value (buffer-substring (1+ (point))
+						  (progn
+						    (forward-sexp 1)
+						    (1- (point)))))
+		    (when encoded
+		      (setq value (mapconcat (lambda (c) (format "%%%02x" c))
+					     value ""))))
+		   ((and (or (memq c ttoken)
+			     ;; EXTENSION: Support non-ascii chars.
+			     (> c ?\177))
+			 (not (memq c stoken)))
+		    (setq value
+			  (buffer-substring
 			   (point)
 			   (progn
 			     (forward-sexp)
@@ -142,59 +152,72 @@
 			       (forward-char 1)
 			       (forward-sexp))
 			     (point)))))
-	     (t
-	      (error "Invalid header: %s" string)))
-	    (if number
-		(setq prev-attribute attribute
-		      prev-value (concat prev-value value)
-		      prev-encoded encoded)
-	      (push (cons attribute
-			  (if encoded
-			      (rfc2231-decode-encoded-string value)
-			    value))
-		    parameters))))
+		   (t
+		    (error "Invalid header: %s" string)))
+		  (if number
+		      (progn
+			(push (cons number value) vals)
+			(setq prev-attribute attribute
+			      prev-encoded encoded))
+		    (push (cons attribute
+				(if encoded
+				    (rfc2231-decode-encoded-string value)
+				  value))
+			  parameters))))
 
-	;; Take care of any final continuations.
-	(when prev-attribute
-	  (push (cons prev-attribute
-		      (if prev-encoded
-			  (rfc2231-decode-encoded-string prev-value)
-			prev-value))
-		parameters))
+	      ;; Take care of any final continuations.
+	      (when prev-attribute
+		(setq vals (mapconcat 'cdr (sort vals 'car-less-than-car) ""))
+		(push (cons prev-attribute
+			    (if prev-encoded
+				(rfc2231-decode-encoded-string vals)
+			      vals))
+		      parameters)))
+	  (error
+	   (setq parameters nil)
+	   (if signal-error
+	       (signal (car err) (cdr err))
+	     ;;(message "%s" (error-message-string err))
+	     )))
 
 	(when type
 	  `(,type ,@(nreverse parameters)))))))
 
 (defun rfc2231-decode-encoded-string (string)
   "Decode an RFC2231-encoded string.
-These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
-  (with-temp-buffer
-    (let ((elems (split-string string "'")))
-      ;; The encoded string may contain zero to two single-quote
-      ;; marks.  This should give us the encoded word stripped
-      ;; of any preceding values.
-      (insert (car (last elems)))
+These look like:
+ \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"us-ascii''This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\",
+ \"''This%20is%20%2A%2A%2Afun%2A%2A%2A\", or
+ \"This is ***fun***\"."
+  (string-match "\\`\\(\\([^']+\\)?'\\([^']+\\)?'\\)?\\(.+\\)" string)
+  (let ((coding-system (mm-charset-to-coding-system (match-string 2 string)))
+	;;(language (match-string 3 string))
+	(value (match-string 4 string)))
+    (mm-with-multibyte-buffer
+      (insert value)
       (goto-char (point-min))
       (while (search-forward "%" nil t)
 	(insert
 	 (prog1
 	     (string-to-number (buffer-substring (point) (+ (point) 2)) 16)
 	   (delete-region (1- (point)) (+ (point) 2)))))
-      ;; Encode using the charset, if any.
-      (when (and (mm-multibyte-p)
-		 (> (length elems) 1)
-		 (not (equal (intern (downcase (car elems))) 'us-ascii)))
-	(mm-decode-coding-region (point-min) (point-max)
-				 (intern (downcase (car elems)))))
+      ;; Decode using the charset, if any.
+      (unless (memq coding-system '(nil ascii))
+	(mm-decode-coding-region (point-min) (point-max) coding-system))
       (buffer-string))))
 
 (defun rfc2231-encode-string (param value)
-  "Return and PARAM=VALUE string encoded according to RFC2231."
+  "Return and PARAM=VALUE string encoded according to RFC2231.
+Use `mml-insert-parameter' or `mml-insert-parameter-string' to insert
+the result of this function."
   (let ((control (ietf-drums-token-to-list ietf-drums-no-ws-ctl-token))
 	(tspecial (ietf-drums-token-to-list ietf-drums-tspecials))
 	(special (ietf-drums-token-to-list "*'%\n\t"))
 	(ascii (ietf-drums-token-to-list ietf-drums-text-token))
 	(num -1)
+	;; Don't make lines exceeding 76 column.
 	(limit (- 74 (length param)))
 	spacep encodep charsetp charset broken)
     (with-temp-buffer
@@ -241,17 +264,17 @@
 	(if (not broken)
 	    (insert param "*=")
 	  (while (not (eobp))
-	    (insert (if (>= num 0) " " "\n ")
+	    (insert (if (>= num 0) " " "")
 		    param "*" (format "%d" (incf num)) "*=")
 	    (forward-line 1))))
        (spacep
 	(goto-char (point-min))
-	(insert "\n " param "=\"")
+	(insert param "=\"")
 	(goto-char (point-max))
 	(insert "\""))
        (t
 	(goto-char (point-min))
-	(insert "\n " param "=")))
+	(insert param "=")))
       (buffer-string))))
 
 (provide 'rfc2231)
--- a/lisp/gnus/spam-report.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/spam-report.el	Sun Feb 12 00:15:44 2006 +0000
@@ -50,7 +50,11 @@
   :group 'spam-report)
 
 (defcustom spam-report-gmane-use-article-number t
-  "Whether the article number (faster!) or the header should be used."
+  "Whether the article number (faster!) or the header should be used.
+
+You must set this to nil if you don't read Gmane groups directly
+from news.gmane.org, e.g. when using local newsserver such as
+leafnode."
   :type 'boolean
   :group 'spam-report)
 
--- a/lisp/gnus/webmail.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gnus/webmail.el	Sun Feb 12 00:15:44 2006 +0000
@@ -637,7 +637,7 @@
 	  (goto-char (point-min))
 	  (delete-blank-lines)
 	  (setq ct (mail-fetch-field "content-type")
-		ctl (ignore-errors (mail-header-parse-content-type ct))
+		ctl (and ct (mail-header-parse-content-type ct))
 		;;cte (mail-fetch-field "content-transfer-encoding")
 		cd (mail-fetch-field "content-disposition")
 		description (mail-fetch-field "content-description")
--- a/lisp/gs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/gs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; gs.el --- interface to Ghostscript
 
 ;; Copyright (C) 1998, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/help-at-pt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/help-at-pt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; help-at-pt.el --- local help through the keyboard
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Luc Teirlinck <teirllm@auburn.edu>
 ;; Keywords: help
--- a/lisp/help-macro.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/help-macro.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; help-macro.el --- makes command line help such as help-for-help
 
 ;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
 ;; Maintainer: FSF
--- a/lisp/help-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/help-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; help-mode.el --- `help-mode' used by *Help* buffers
 
 ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
--- a/lisp/help.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/help.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; help.el --- help commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
@@ -556,7 +556,34 @@
 	    string
 	  (format "%s (translated from %s)" string otherstring))))))
 
-(defun describe-key-briefly (key &optional insert untranslated)
+(defun describe-key-briefly (&optional key insert untranslated)
+  "Print the name of the function KEY invokes.  KEY is a string.
+If INSERT (the prefix arg) is non-nil, insert the message in the buffer.
+If non-nil, UNTRANSLATED is a vector of the untranslated events.
+It can also be a number in which case the untranslated events from
+the last key hit are used.
+
+If KEY is a menu item or a tool-bar button that is disabled, this command
+temporarily enables it to allow getting help on disabled items and buttons."
+  (interactive)
+  (let ((enable-disabled-menus-and-buttons t)
+	(save-yank-menu))
+    (if key
+	;; Non-interactive invocation
+	(describe-key-briefly-internal key insert untranslated)
+      ;; If yank-menu is empty, populate it temporarily, so that
+      ;; "Select and Paste" menu can generate a complete event
+      (if (null (cdr yank-menu))
+	  (unwind-protect
+	      (progn
+		(setq save-yank-menu (copy-sequence yank-menu))
+		(menu-bar-update-yank-menu "(any string)" nil)
+		(call-interactively 'describe-key-briefly-internal))
+	    (progn (setq yank-menu (copy-sequence save-yank-menu))
+		   (fset 'yank-menu (cons 'keymap yank-menu))))
+	(call-interactively 'describe-key-briefly-internal)))))
+
+(defun describe-key-briefly-internal (key &optional insert untranslated)
   "Print the name of the function KEY invokes.  KEY is a string.
 If INSERT (the prefix arg) is non-nil, insert the message in the buffer.
 If non-nil UNTRANSLATED is a vector of the untranslated events.
@@ -601,7 +628,7 @@
 			 key-desc
 			 (if (symbolp defn) defn (prin1-to-string defn)))))))))
 
-(defun describe-key (key &optional untranslated up-event)
+(defun describe-key (&optional key untranslated up-event)
   "Display documentation of the function invoked by KEY.
 KEY can be any kind of a key sequence; it can include keyboard events,
 mouse events, and/or menu events.  When calling from a program,
@@ -609,8 +636,39 @@
 
 If non-nil, UNTRANSLATED is a vector of the corresponding untranslated events.
 It can also be a number, in which case the untranslated events from
-the last key sequence entered are used."
-  ;; UP-EVENT is the up-event that was discarded by reading KEY, or nil.
+the last key sequence entered are used.
+UP-EVENT is the up-event that was discarded by reading KEY, or nil.
+
+If KEY is a menu item or a tool-bar button that is disabled, this command
+temporarily enables it to allow getting help on disabled items and buttons."
+  (interactive)
+  (let ((enable-disabled-menus-and-buttons t)
+	(save-yank-menu))
+    (if key
+	;; Non-interactive invocation
+	(describe-key-internal key untranslated up-event)
+      ;; If yank-menu is empty, populate it temporarily, so that
+      ;; "Select and Paste" menu can generate a complete event
+      (if (null (cdr yank-menu))
+	  (unwind-protect
+	      (progn
+		(setq save-yank-menu (copy-sequence yank-menu))
+		(menu-bar-update-yank-menu "(any string)" nil)
+		(call-interactively 'describe-key-internal))
+	    (progn (setq yank-menu (copy-sequence save-yank-menu))
+		   (fset 'yank-menu (cons 'keymap yank-menu))))
+	(call-interactively 'describe-key-internal)))))
+
+(defun describe-key-internal (key &optional untranslated up-event)
+  "Display documentation of the function invoked by KEY.
+KEY can be any kind of a key sequence; it can include keyboard events,
+mouse events, and/or menu events.  When calling from a program,
+pass KEY as a string or a vector.
+
+If non-nil, UNTRANSLATED is a vector of the corresponding untranslated events.
+It can also be a number, in which case the untranslated events from
+the last key sequence entered are used.
+UP-EVENT is the up-event that was discarded by reading KEY, or nil."
   (interactive "kDescribe key (or click or menu item): \np\nU")
   (if (numberp untranslated)
       (setq untranslated (this-single-command-raw-keys)))
--- a/lisp/hexl.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/hexl.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; hexl.el --- edit a file in a hex dump format using the hexl filter
 
 ;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
 ;; Maintainer: FSF
--- a/lisp/hi-lock.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/hi-lock.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; hi-lock.el --- minor mode for interactive automatic highlighting
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: David M. Koppelman, koppel@ee.lsu.edu
 ;; Keywords: faces, minor-mode, matching, display
--- a/lisp/hilit-chg.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/hilit-chg.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; hilit-chg.el --- minor mode displaying buffer changes with special face
 
 ;; Copyright (C) 1998, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Richard Sharman <rsharman@pobox.com>
 ;; Keywords: faces
@@ -521,7 +521,7 @@
 This allows you to manually remove highlighting from uninteresting changes."
   (interactive "r")
   (let ((after-change-functions nil))
-    (remove-text-properties beg end  '(hilit-chg nil))
+    (remove-text-properties beg end '(hilit-chg nil))
     (hilit-chg-fixup beg end)))
 
 (defun hilit-chg-set-face-on-change (beg end leng-before
@@ -662,7 +662,7 @@
 	      ;; an argument is given
 	      ((eq arg 'active)
 	       'active)
-	      ((eq arg  'passive)
+	      ((eq arg 'passive)
 	       'passive)
 	      ((> (prefix-numeric-value arg) 0)
 	       'active)
@@ -673,7 +673,6 @@
 	(if new-highlight-changes-mode
 	    ;; mode is turned on -- but may be passive
 	    (progn
-	      (add-to-list 'desktop-locals-to-save 'highlight-changes-mode)
 	      (hilit-chg-set new-highlight-changes-mode)
 	      (or was-on
 		  ;; run highlight-changes-enable-hook once
@@ -960,9 +959,9 @@
   ;; which calls this function as a hook
   (defvar x)  ;; placate the byte-compiler
   (defvar y)
-  (setq  e (current-buffer))
+  (setq e (current-buffer))
   (let ((n 0) extent p va vb a b)
-    (setq  x nil  y nil)    ;; x and y are bound by hilit-chg-get-diff-info
+    (setq x nil y nil)    ;; x and y are bound by hilit-chg-get-diff-info
     (while (< n ediff-number-of-differences)
       (ediff-make-fine-diffs n)
       (setq va (ediff-get-fine-diff-vector n 'A))
@@ -1085,7 +1084,7 @@
       (progn
 	(if (eq arg 'active)
 	    (setq highlight-changes-global-initial-state 'active)
-	  (if (eq arg  'passive)
+	  (if (eq arg 'passive)
 	      (setq highlight-changes-global-initial-state 'passive)))
 	(setq global-highlight-changes t)
 	(message "Turning ON Global Highlight Changes mode in %s state"
@@ -1131,7 +1130,7 @@
 	       (memq major-mode highlight-changes-global-modes)))
 	    (t
 	     (and
-	      (not (string-match "^[ *]"  (buffer-name)))
+	      (not (string-match "^[ *]" (buffer-name)))
 	      (buffer-file-name))))
 	  (progn
 	    (hilit-chg-set value)
@@ -1146,14 +1145,15 @@
 
 
 (defun hilit-chg-update-all-buffers (value)
-  (mapcar
+  (mapc
    (function (lambda (buffer)
 	       (with-current-buffer buffer
 		 (if value
 		     (hilit-chg-turn-on-maybe value)
 		   (hilit-chg-turn-off-maybe))
 		 )))
-   (buffer-list)))
+   (buffer-list))
+  nil)
 
 ;;;; Desktop support.
 
@@ -1165,6 +1165,8 @@
 (add-to-list 'desktop-minor-mode-handlers
              '(highlight-changes-mode . hilit-chg-desktop-restore))
 
+(add-to-list 'desktop-locals-to-save 'highlight-changes-mode)
+
 ;; ===================== debug ==================
 ;; For debug & test use:
 ;;
--- a/lisp/hippie-exp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/hippie-exp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; hippie-exp.el --- expand text trying various ways to find its expansion
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Anders Holst <aho@sans.kth.se>
 ;; Last change: 3 March 1998
--- a/lisp/ibuf-macs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ibuf-macs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ibuf-macs.el --- macros for ibuffer
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
--- a/lisp/icomplete.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/icomplete.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; icomplete.el --- minibuffer completion incremental feedback
 
 ;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <klm@i.am>
 ;; Maintainer: Ken Manheimer <klm@i.am>
--- a/lisp/ido.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ido.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ido.el --- interactively do things with buffers and files.
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk>
@@ -2022,9 +2022,10 @@
 	(if (eq method 'insert)
 	    (progn
 	      (ido-record-command 'insert-buffer buf)
-	      (with-no-warnings
-		;; we really want to run insert-buffer here
-		(insert-buffer buf)))
+	      (push-mark
+	       (save-excursion
+		 (insert-buffer-substring (get-buffer buf))
+		 (point))))
 	  (ido-visit-buffer buf method t)))
 
        ;; buffer doesn't exist
@@ -2225,9 +2226,10 @@
 	 (if ido-find-literal 'insert-file-literally 'insert-file)
 	 filename)
 	(ido-record-work-directory)
-	(if ido-find-literal
-	    (insert-file-contents-literally filename)
-	  (insert-file-contents filename)))
+	(insert-file-1 filename
+		       (if ido-find-literal
+			   #'insert-file-contents-literally
+			 #'insert-file-contents)))
 
        (filename
 	(ido-record-work-file filename)
--- a/lisp/ielm.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ielm.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; ielm.el --- interaction mode for Emacs Lisp
 
-;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: David Smith <maa036@lancaster.ac.uk>
 ;; Maintainer: FSF
--- a/lisp/iimage.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/iimage.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; iimage.el --- Inline image minor mode.
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: KOSEKI Yoshinori <kose@meadowy.org>
 ;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org>
--- a/lisp/image-file.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/image-file.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; image-file.el --- support for visiting image files
 ;;
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: multimedia
--- a/lisp/image-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/image-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; image-mode.el --- support for visiting image files
 ;;
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Richard Stallman <rms@gnu.org>
 ;; Keywords: multimedia
@@ -140,7 +140,8 @@
     (let* ((image
 	    (if (and (buffer-file-name)
 		     (not (buffer-modified-p)))
-		(create-image (buffer-file-name))
+		(progn (clear-image-cache)
+		       (create-image (buffer-file-name)))
 	      (create-image
 	       (string-make-unibyte
 		(buffer-substring-no-properties (point-min) (point-max)))
--- a/lisp/image.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/image.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; image.el --- image API
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: multimedia
--- a/lisp/imenu.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/imenu.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; imenu.el --- framework for mode-specific buffer indexes
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se>
 ;;         Lars Lindberg <lli@sypro.cap.se>
--- a/lisp/indent.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/indent.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; indent.el --- indentation commands for Emacs
 
 ;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
--- a/lisp/info-look.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/info-look.el	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
 ;; An older version of this was known as libc.el.
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;;         (did not show signs of life (Nov 2001)  -stef)
--- a/lisp/info-xref.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/info-xref.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; info-xref.el --- check external references in an Info document
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kevin Ryde <user42@zip.com.au>
 ;; Keywords: docs
--- a/lisp/info.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/info.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; info.el --- info package for Emacs
 
 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
--- a/lisp/informat.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/informat.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; informat.el --- info support functions package for Emacs
 
-;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
--- a/lisp/isearch.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/isearch.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; isearch.el --- incremental search minor mode
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 ;; Maintainer: FSF
--- a/lisp/isearchb.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/isearchb.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; isearchb --- a marriage between iswitchb and isearch
 
-;; Copyright (C) 2004, 2005 John Wiegley
+;; Copyright (C) 2004, 2005, 2006 John Wiegley
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Created: 16 Apr 2004
--- a/lisp/iswitchb.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/iswitchb.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; iswitchb.el --- switch between buffers using substrings
 
 ;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
--- a/lisp/jit-lock.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/jit-lock.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; jit-lock.el --- just-in-time fontification
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Keywords: faces files
--- a/lisp/jka-cmpr-hook.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/jka-cmpr-hook.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: jka@ece.cmu.edu (Jay K. Adams)
 ;; Maintainer: FSF
--- a/lisp/jka-compr.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/jka-compr.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; jka-compr.el --- reading/writing/loading compressed files
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: jka@ece.cmu.edu (Jay K. Adams)
 ;; Maintainer: FSF
--- a/lisp/kermit.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/kermit.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; kermit.el --- additions to shell mode for use with kermit
 
-;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Jeff Norden <jeff@colgate.csnet>
 ;; Maintainer: FSF
--- a/lisp/kmacro.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/kmacro.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; kmacro.el --- enhanced keyboard macros
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard convenience
--- a/lisp/ledit.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ledit.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; ledit.el --- Emacs side of ledit interface
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: languages
--- a/lisp/loadhist.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/loadhist.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; loadhist.el --- lisp functions for working with feature groups
 
 ;; Copyright (C) 1995, 1998, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
--- a/lisp/loadup.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/loadup.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/locate.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/locate.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; locate.el --- interface to the locate command
 
 ;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Keywords: unix files
--- a/lisp/log-edit.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/log-edit.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; log-edit.el --- Major mode for editing CVS commit messages
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs cvs commit log
--- a/lisp/log-view.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/log-view.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-;;           Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: rcs sccs cvs log version-control
--- a/lisp/longlines.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/longlines.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; longlines.el --- automatically wrap long lines
 
-;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Authors:    Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;;             Alex Schroeder <alex@gnu.org>
--- a/lisp/lpr.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/lpr.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; lpr.el --- print Emacs buffer on line printer
 
 ;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix
--- a/lisp/ls-lisp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ls-lisp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp
 
 ;; Copyright (C) 1992, 1994, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>
--- a/lisp/macros.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/macros.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; macros.el --- non-primitive commands for keyboard macros
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev
--- a/lisp/mail/blessmail.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/blessmail.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/mail/emacsbug.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/emacsbug.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list
 
 ;; Copyright (C) 1985, 1994, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
--- a/lisp/mail/footnote.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/footnote.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; footnote.el --- footnote support for message mode  -*- coding: iso-latin-1;-*-
 
 ;; Copyright (C) 1997, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Steven L Baur <steve@xemacs.org>
 ;; Keywords: mail, news
--- a/lisp/mail/mail-extr.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/mail-extr.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@cs.bu.edu>
 ;; Maintainer: FSF
--- a/lisp/mail/mail-hist.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/mail-hist.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; mail-hist.el --- headers and message body history for outgoing mail
 
-;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Created: March, 1994
--- a/lisp/mail/mail-utils.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/mail-utils.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; mail-utils.el --- utility functions used both by rmail and rnews
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail, news
--- a/lisp/mail/mailabbrev.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/mailabbrev.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; mailabbrev.el --- abbrev-expansion of mail aliases
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1996, 1997, 2000, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>, now <jwz@jwz.org>
 ;; Maintainer: FSF
--- a/lisp/mail/mailalias.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/mailalias.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; mailalias.el --- expand and complete mailing address aliases
 
 ;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/mailclient.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/mailclient.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; mailclient.el --- mail sending via system's mail client.  -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 2005 Free Software Foundation
+;; Copyright (C) 2005, 2006 Free Software Foundation
 
 ;; Author: David Reitter <david.reitter@gmail.com>
 ;; Keywords: mail
--- a/lisp/mail/mailheader.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/mailheader.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; mailheader.el --- mail header parsing, merging, formatting
 
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 by Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Keywords: tools, mail, news
--- a/lisp/mail/metamail.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/metamail.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; metamail.el --- Metamail interface for GNU Emacs
 
 ;; Copyright (C) 1993, 1996, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
 ;; Keywords: mail, news, mime, multimedia
--- a/lisp/mail/mspools.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/mspools.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; mspools.el --- show mail spools waiting to be read
 
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
--- a/lisp/mail/reporter.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/reporter.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; reporter.el --- customizable bug reporting of lisp programs
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:          1993-1998 Barry A. Warsaw
 ;; Maintainer:      FSF
--- a/lisp/mail/rfc2368.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rfc2368.el	Sun Feb 12 00:15:44 2006 +0000
@@ -4,7 +4,7 @@
 ;; Keywords: mail
 
 ;; Copyright (C) 1998, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/mail/rfc822.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rfc822.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rfc822.el --- hairy rfc822 parser for mail and news and suchlike
 
 ;; Copyright (C) 1986, 1987, 1990, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Maintainer: FSF
--- a/lisp/mail/rmail-spam-filter.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rmail-spam-filter.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; rmail-spam-filter.el  --- spam filter for rmail, the emacs mail reader.
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 ;; Keywords: email, spam, filter, rmail
 ;; Author: Eli Tziperman <eli AT deas.harvard.edu>
 
--- a/lisp/mail/rmail.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rmail.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/rmailedit.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rmailedit.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rmailedit.el --- "RMAIL edit mode"  Edit the current message
 
 ;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/rmailkwd.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rmailkwd.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs
 
 ;; Copyright (C) 1985, 1988, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/rmailmsc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rmailmsc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/rmailout.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rmailout.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file
 
 ;; Copyright (C) 1985, 1987, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/rmailsort.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rmailsort.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rmailsort.el --- Rmail: sort messages
 
 ;; Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
 ;; Maintainer: FSF
--- a/lisp/mail/rmailsum.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/rmailsum.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rmailsum.el --- make summary buffers for the mail reader
 
 ;; Copyright (C) 1985, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/sendmail.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/sendmail.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; sendmail.el --- mail sending commands for Emacs.  -*- byte-compile-dynamic: t -*-
 
 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1998, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/smtpmail.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/smtpmail.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
 
-;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
 ;; Maintainer: Simon Josefsson <simon@josefsson.org>
--- a/lisp/mail/supercite.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/supercite.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; supercite.el --- minor mode for citing mail and news replies
 
 ;; Copyright (C) 1993, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org>
 ;; Maintainer:    Glenn Morris <rgm@gnu.org>
--- a/lisp/mail/uce.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/uce.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; uce.el --- facilitate reply to unsolicited commercial email
 
 ;; Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: stanislav shalunov <shalunov@mccme.ru>
 ;; Created: 10 Dec 1996
--- a/lisp/mail/undigest.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/undigest.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; undigest.el --- digest-cracking support for the RMAIL mail reader
 
 ;; Copyright (C) 1985, 1986, 1994, 1996, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/unrmail.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/unrmail.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; unrmail.el --- convert Rmail files to mailbox files
 
-;;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
--- a/lisp/mail/vms-pmail.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mail/vms-pmail.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; vms-pmail.el --- use Emacs as the editor within VMS mail
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Roland B Roberts <roberts@panix.com>
 ;; Maintainer: FSF
--- a/lisp/makesum.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/makesum.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; makesum.el --- generate key binding summary for Emacs
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
--- a/lisp/man.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/man.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
 
 ;; Copyright (C) 1993, 1994, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
 ;; Maintainer: FSF
--- a/lisp/menu-bar.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/menu-bar.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; menu-bar.el --- define a default menu bar
 
 ;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: RMS
 ;; Maintainer: FSF
@@ -1502,6 +1502,8 @@
 
 (put 'menu-bar-select-yank 'apropos-inhibit t)
 (defun menu-bar-select-yank ()
+  "Insert the stretch of previously-killed text selected from menu.
+The menu shows all the killed text sequences stored in `kill-ring'."
   (interactive "*")
   (push-mark (point))
   (insert last-command-event))
--- a/lisp/mh-e/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mh-e/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,3 +1,22 @@
+2006-02-10  Bill Wohler  <wohler@newt.com>
+
+	* mh-search.el (mh-search): Wrap code in (block mh-search ...)
+	rather than use defun*. XEmacs cannot create a proper autoload for
+	a defun*.
+
+2006-02-09  Bill Wohler  <wohler@newt.com>
+
+	* mh-utils.el (mh-folder-list): Don't replace "/*$" with "/" since
+	that causes an infinite loop on XEmacs.
+
+	* mh-compat.el(mh-replace-regexp-in-string): Add missing regexp
+	argument.
+
+2006-02-08  Peter S Galbraith  <psg@debian.org>
+
+	* mh-e.el (mh-invisible-header-fields-internal): Added entries
+	"X-BrightmailFiltered:", "X-Brightmail-Tracker:" and "X-Hashcash"
+
 2006-02-04  Bill Wohler  <wohler@newt.com>
 
 	* mh-e.el (mh-inc-spool-list): Update example for Emacs 22 which
--- a/lisp/mh-e/mh-compat.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mh-e/mh-compat.el	Sun Feb 12 00:15:44 2006 +0000
@@ -144,7 +144,7 @@
    (match-beginning num) (match-end num)))
 
 (mh-defun-compat mh-replace-regexp-in-string replace-regexp-in-string
-  (rep string &optional fixedcase literal subexp start)
+  (regexp rep string &optional fixedcase literal subexp start)
   "Replace REGEXP with REP everywhere in STRING and return result.
 This function is used by XEmacs that lacks `replace-regexp-in-string'.
 The function `replace-in-string' is used instead.
--- a/lisp/mh-e/mh-e.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mh-e/mh-e.el	Sun Feb 12 00:15:44 2006 +0000
@@ -2306,6 +2306,8 @@
     "X-Authentication-Warning:"         ; sendmail
     "X-Beenthere:"                      ; Mailman mailing list manager
     "X-Bogosity:"                       ; bogofilter
+    "X-BrightmailFiltered:"             ; Brightmail
+    "X-Brightmail-Tracker:"             ; Brightmail
     "X-Bugzilla-*"                      ; Bugzilla
     "X-Complaints-To:"
     "X-ContentStamp:"                   ; NetZero
@@ -2333,6 +2335,7 @@
     "X-Habeas-SWE-7:"                   ; Spam
     "X-Habeas-SWE-8:"                   ; Spam
     "X-Habeas-SWE-9:"                   ; Spam
+    "X-Hashcash:"                       ; hashcash
     "X-Info:"                           ; NTMail
     "X-Juno-"                           ; Juno
     "X-List-Host:"                      ; Unknown mailing list managers
--- a/lisp/mh-e/mh-search.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mh-e/mh-search.el	Sun Feb 12 00:15:44 2006 +0000
@@ -81,8 +81,8 @@
 ;;; MH-Folder Commands
 
 ;;;###mh-autoload
-(defun* mh-search (folder search-regexp
-                          &optional redo-search-flag window-config)
+(defun mh-search (folder search-regexp
+                         &optional redo-search-flag window-config)
   "Search your MH mail.
 
 This command helps you find messages in your entire corpus of
@@ -230,96 +230,98 @@
                   mh-search-regexp-builder)
              (current-window-configuration)
            nil)))
-  ;; Redoing a sequence search?
-  (when (and redo-search-flag mh-index-data mh-index-sequence-search-flag
-             (not mh-flists-called-flag))
-    (let ((mh-flists-called-flag t))
-      (apply #'mh-index-sequenced-messages mh-index-previous-search))
-    (return-from mh-search))
-  ;; We have fancy query parsing.
-  (when (symbolp search-regexp)
-    (mh-search-folder folder window-config)
-    (return-from mh-search))
-  ;; Begin search proper.
-  (mh-checksum-choose)
-  (let ((result-count 0)
-        (old-window-config (or window-config mh-previous-window-config))
-        (previous-search mh-index-previous-search)
-        (index-folder (format "%s/%s" mh-index-folder
-                              (mh-index-generate-pretty-name search-regexp))))
-    ;; Create a new folder for the search results or recreate the old one...
-    (if (and redo-search-flag mh-index-previous-search)
-        (let ((buffer-name (buffer-name (current-buffer))))
-          (mh-process-or-undo-commands buffer-name)
-          (save-excursion (mh-exec-cmd-quiet nil "rmf" buffer-name))
-          (mh-exec-cmd-quiet nil "folder" "-create" "-fast" buffer-name)
-          (setq index-folder buffer-name))
-      (setq index-folder (mh-index-new-folder index-folder search-regexp)))
+  (block mh-search
+    ;; Redoing a sequence search?
+    (when (and redo-search-flag mh-index-data mh-index-sequence-search-flag
+               (not mh-flists-called-flag))
+      (let ((mh-flists-called-flag t))
+        (apply #'mh-index-sequenced-messages mh-index-previous-search))
+      (return-from mh-search))
+    ;; We have fancy query parsing.
+    (when (symbolp search-regexp)
+      (mh-search-folder folder window-config)
+      (return-from mh-search))
+    ;; Begin search proper.
+    (mh-checksum-choose)
+    (let ((result-count 0)
+          (old-window-config (or window-config mh-previous-window-config))
+          (previous-search mh-index-previous-search)
+          (index-folder (format "%s/%s" mh-index-folder
+                                (mh-index-generate-pretty-name search-regexp))))
+      ;; Create a new folder for the search results or recreate the old one...
+      (if (and redo-search-flag mh-index-previous-search)
+          (let ((buffer-name (buffer-name (current-buffer))))
+            (mh-process-or-undo-commands buffer-name)
+            (save-excursion (mh-exec-cmd-quiet nil "rmf" buffer-name))
+            (mh-exec-cmd-quiet nil "folder" "-create" "-fast" buffer-name)
+            (setq index-folder buffer-name))
+        (setq index-folder (mh-index-new-folder index-folder search-regexp)))
 
-    (let ((folder-path (format "%s%s" mh-user-path (substring folder 1)))
-          (folder-results-map (make-hash-table :test #'equal))
-          (origin-map (make-hash-table :test #'equal)))
-      ;; Run search program...
-      (message "Executing %s... " mh-searcher)
-      (funcall mh-search-function folder-path search-regexp)
+      (let ((folder-path (format "%s%s" mh-user-path (substring folder 1)))
+            (folder-results-map (make-hash-table :test #'equal))
+            (origin-map (make-hash-table :test #'equal)))
+        ;; Run search program...
+        (message "Executing %s... " mh-searcher)
+        (funcall mh-search-function folder-path search-regexp)
 
-      ;; Parse searcher output.
-      (message "Processing %s output... " mh-searcher)
-      (goto-char (point-min))
-      (loop for next-result = (funcall mh-search-next-result-function)
-            while next-result
-            do (unless (eq next-result 'error)
-                 (unless (gethash (car next-result) folder-results-map)
-                   (setf (gethash (car next-result) folder-results-map)
-                         (make-hash-table :test #'equal)))
-                 (setf (gethash (cadr next-result)
-                                (gethash (car next-result) folder-results-map))
-                       t)))
+        ;; Parse searcher output.
+        (message "Processing %s output... " mh-searcher)
+        (goto-char (point-min))
+        (loop for next-result = (funcall mh-search-next-result-function)
+              while next-result
+              do (unless (eq next-result 'error)
+                   (unless (gethash (car next-result) folder-results-map)
+                     (setf (gethash (car next-result) folder-results-map)
+                           (make-hash-table :test #'equal)))
+                   (setf (gethash (cadr next-result)
+                                  (gethash (car next-result) folder-results-map))
+                         t)))
 
-      ;; Copy the search results over.
-      (maphash #'(lambda (folder msgs)
-                   (let ((cur (car (mh-translate-range folder "cur")))
-                         (msgs (sort (loop for msg being the hash-keys of msgs
-                                           collect msg)
-                                     #'<)))
-                     (mh-exec-cmd "refile" msgs "-src" folder
-                                  "-link" index-folder)
-                     ;; Restore cur to old value, that refile changed
-                     (when cur
-                       (mh-exec-cmd-quiet nil "mark" folder "-add" "-zero"
-                                          "-sequence" "cur" (format "%s" cur)))
-                     (loop for msg in msgs
-                           do (incf result-count)
-                           (setf (gethash result-count origin-map)
-                                 (cons folder msg)))))
-               folder-results-map)
+        ;; Copy the search results over.
+        (maphash #'(lambda (folder msgs)
+                     (let ((cur (car (mh-translate-range folder "cur")))
+                           (msgs (sort (loop for msg being the hash-keys of msgs
+                                             collect msg)
+                                       #'<)))
+                       (mh-exec-cmd "refile" msgs "-src" folder
+                                    "-link" index-folder)
+                       ;; Restore cur to old value, that refile changed
+                       (when cur
+                         (mh-exec-cmd-quiet nil "mark" folder "-add" "-zero"
+                                            "-sequence"
+                                            "cur" (format "%s" cur)))
+                       (loop for msg in msgs
+                             do (incf result-count)
+                             (setf (gethash result-count origin-map)
+                                   (cons folder msg)))))
+                 folder-results-map)
 
-      ;; Vist the results folder.
-      (mh-visit-folder index-folder () (list folder-results-map origin-map))
+        ;; Vist the results folder.
+        (mh-visit-folder index-folder () (list folder-results-map origin-map))
 
-      (goto-char (point-min))
-      (forward-line)
-      (mh-update-sequences)
-      (mh-recenter nil)
+        (goto-char (point-min))
+        (forward-line)
+        (mh-update-sequences)
+        (mh-recenter nil)
 
-      ;; Update the speedbar, if needed.
-      (when (mh-speed-flists-active-p)
-        (mh-speed-flists t mh-current-folder))
+        ;; Update the speedbar, if needed.
+        (when (mh-speed-flists-active-p)
+          (mh-speed-flists t mh-current-folder))
 
-      ;; Maintain history.
-      (when (or (and redo-search-flag previous-search) window-config)
-        (setq mh-previous-window-config old-window-config))
-      (setq mh-index-previous-search (list folder mh-searcher search-regexp))
+        ;; Maintain history.
+        (when (or (and redo-search-flag previous-search) window-config)
+          (setq mh-previous-window-config old-window-config))
+        (setq mh-index-previous-search (list folder mh-searcher search-regexp))
 
-      ;; Write out data to disk.
-      (unless mh-flists-called-flag (mh-index-write-data))
+        ;; Write out data to disk.
+        (unless mh-flists-called-flag (mh-index-write-data))
 
-      (message "%s found %s matches in %s folders"
-               (upcase-initials (symbol-name mh-searcher))
-               (loop for msg-hash being hash-values of mh-index-data
-                     sum (hash-table-count msg-hash))
-               (loop for msg-hash being hash-values of mh-index-data
-                     count (> (hash-table-count msg-hash) 0))))))
+        (message "%s found %s matches in %s folders"
+                 (upcase-initials (symbol-name mh-searcher))
+                 (loop for msg-hash being hash-values of mh-index-data
+                       sum (hash-table-count msg-hash))
+                 (loop for msg-hash being hash-values of mh-index-data
+                       count (> (hash-table-count msg-hash) 0)))))))
 
 ;; Shush compiler.
 (eval-when-compile (mh-do-in-xemacs (defvar pick-folder)))
--- a/lisp/mh-e/mh-utils.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mh-e/mh-utils.el	Sun Feb 12 00:15:44 2006 +0000
@@ -516,13 +516,15 @@
 the sub-folders have not been explicitly viewed, then they will
 not be returned."
   (let ((folder-list))
-    ;; Normalize folder. Strip leading +. Add trailing slash. If no
-    ;; folder is specified, ensure it is nil to ensure we get the
-    ;; top-level folders; otherwise mh-sub-folders returns all the
-    ;; files in / if given an empty string or +.
+    ;; Normalize folder. Strip leading +. Add trailing slash (done in
+    ;; two steps to avoid infinite loops when replacing "/*$" with "/"
+    ;; in XEmacs). If no folder is specified, ensure it is nil to
+    ;; ensure we get the top-level folders; otherwise mh-sub-folders
+    ;; returns all the files in / if given an empty string or +.
     (when folder
       (setq folder (mh-replace-regexp-in-string "^\+" "" folder))
-      (setq folder (mh-replace-regexp-in-string "/*$" "/" folder))
+      (setq folder (mh-replace-regexp-in-string "/+$" "" folder))
+      (setq folder (concat folder "/"))
       (if (equal folder "")
         (setq folder nil)))
     (loop for f in (mh-sub-folders folder) do
--- a/lisp/midnight.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/midnight.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; midnight.el --- run something every midnight, e.g., kill old buffers
 
-;;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Sam Steingold <sds@usa.net>
 ;; Maintainer: Sam Steingold <sds@usa.net>
--- a/lisp/minibuf-eldef.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/minibuf-eldef.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; minibuf-eldef.el --- Only show defaults in prompts when applicable
 ;;
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: convenience
--- a/lisp/misc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/misc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; misc.el --- some nonstandard basic editing commands for Emacs
 
-;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience
--- a/lisp/mouse-copy.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mouse-copy.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; mouse-copy.el --- one-click text copy and move
 
-;; Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse
--- a/lisp/mouse-drag.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mouse-drag.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling
 
 ;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse
--- a/lisp/mouse-sel.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mouse-sel.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; mouse-sel.el --- multi-click selection support for Emacs 19
 
 ;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mike Williams <mdub@bigfoot.com>
 ;; Keywords: mouse
--- a/lisp/mouse.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mouse.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; mouse.el --- window system-independent mouse support
 
 ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: hardware, mouse
@@ -1036,13 +1036,13 @@
 					   (if (> mouse-1-click-follows-link 0)
 					       (<= (- t1 t0) mouse-1-click-follows-link)
 					     (< (- t0 t1) mouse-1-click-follows-link))))))))
-		  ;; Reselect previous selected window,
+		  ;; If we rebind to mouse-2, reselect previous selected window,
 		  ;; so that the mouse-2 event runs in the same
 		  ;; situation as if user had clicked it directly.
 		  ;; Fixes the bug reported by juri@jurta.org on 2005-12-27.
-		  (select-window original-window)
 		  (if (or (vectorp on-link) (stringp on-link))
 		      (setq event (aref on-link 0))
+		    (select-window original-window)
 		    (setcar event 'mouse-2)
 		    ;; If this mouse click has never been done by
 		    ;; the user, it doesn't have the necessary
--- a/lisp/msb.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/msb.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; msb.el --- customizable buffer-selection with multiple menus
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Lindberg <lars.lindberg@home.se>
 ;; Maintainer: FSF
--- a/lisp/mwheel.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/mwheel.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; mwheel.el --- Wheel mouse support
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2002, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;; Maintainer: William M. Perry <wmperry@gnu.org>
 ;; Keywords: mouse
 
@@ -77,7 +77,7 @@
       'wheel-down
     (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s")
 		    mouse-wheel-up-button)))
-  "Event used for scrolling down."
+  "Event used for scrolling up."
   :group 'mouse
   :type 'symbol
   :set 'mouse-wheel-change-button)
--- a/lisp/net/ange-ftp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/ange-ftp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
 
 ;; Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
 ;; Maintainer: FSF
--- a/lisp/net/browse-url.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/browse-url.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; browse-url.el --- pass a URL to a WWW browser
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
 ;; Maintainer: FSF
--- a/lisp/net/eudc-bob.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/eudc-bob.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eudc-bob.el --- Binary Objects Support for EUDC
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
--- a/lisp/net/eudc-export.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/eudc-export.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eudc-export.el --- functions to export EUDC query results
 
 ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
--- a/lisp/net/eudc-hotlist.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/eudc-hotlist.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eudc-hotlist.el --- hotlist management for EUDC
 
 ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
--- a/lisp/net/eudc-vars.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/eudc-vars.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eudc-vars.el --- Emacs Unified Directory Client
 
 ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
--- a/lisp/net/eudc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/eudc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eudc.el --- Emacs Unified Directory Client
 
 ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
--- a/lisp/net/eudcb-bbdb.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/eudcb-bbdb.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend
 
 ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
--- a/lisp/net/eudcb-ldap.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/eudcb-ldap.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend
 
 ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
--- a/lisp/net/eudcb-mab.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/eudcb-mab.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; eudcb-mab.el --- Emacs Unified Directory Client - AddressBook backend
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: comm
--- a/lisp/net/eudcb-ph.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/eudcb-ph.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend
 
 ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
--- a/lisp/net/goto-addr.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/goto-addr.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; goto-addr.el --- click to browse URL or to send to e-mail address
 
 ;; Copyright (C) 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eric Ding <ericding@alum.mit.edu>
 ;; Maintainer: FSF
--- a/lisp/net/ldap.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/ldap.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ldap.el --- client interface to LDAP for Emacs
 
 ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: FSF
--- a/lisp/net/net-utils.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/net-utils.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; net-utils.el --- network functions
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Mar 16 1997
--- a/lisp/net/netrc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/netrc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; netrc.el --- .netrc parsing functionality
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
--- a/lisp/net/newsticker.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/newsticker.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; newsticker.el --- A Newsticker for Emacs.
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/net/quickurl.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/quickurl.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; quickurl.el --- insert an URL based on text at point in buffer
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Maintainer: Dave Pearson <davep@davep.org>
--- a/lisp/net/rcirc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/rcirc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; rcirc.el --- default, simple IRC client.
 
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ryan Yeske
 ;; URL: http://www.nongnu.org/rcirc
@@ -79,7 +79,7 @@
   :type 'string
   :group 'rcirc)
 
-(defcustom rcirc-startup-channels-alist nil
+(defcustom rcirc-startup-channels-alist '(("^irc.freenode.net$" "#emacs"))
   "Alist of channels to join at startup.
 Each element looks like (SERVER-REGEXP . CHANNEL-LIST)."
   :type '(alist :key-type string :value-type (repeat string))
@@ -111,11 +111,6 @@
   "If non-nil, ignore activity in this buffer.")
 (make-variable-buffer-local 'rcirc-ignore-buffer-activity-flag)
 
-(defcustom rcirc-ignore-all-activity-flag nil
-  "*Non-nil means do not indicate any activity in the modeline."
-  :type 'boolean
-  :group 'rcirc)
-
 (defcustom rcirc-time-format "%H:%M "
   "*Describes how timestamps are printed.
 Used as the first arg to `format-time-string'."
@@ -140,29 +135,42 @@
 		 (integer :tag "Number of lines"))
   :group 'rcirc)
 
-(defcustom rcirc-authinfo-file-name
-  "~/.rcirc-authinfo"
-  "File containing rcirc authentication passwords.
-The file consists of a single list, with each element itself a
-list with a SERVER-REGEXP string, a NICK-REGEXP string, a METHOD
-and the remaining method specific ARGUMENTS.  The valid METHOD
-symbols are `nickserv', `chanserv' and `bitlbee'.
+(defcustom rcirc-authinfo nil
+  "List of authentication passwords.
+Each element of the list is a list with a SERVER-REGEXP string
+and a method symbol followed by method specific arguments.
+
+The valid METHOD symbols are `nickserv', `chanserv' and
+`bitlbee'.
 
 The required ARGUMENTS for each METHOD symbol are:
-  `nickserv': PASSWORD
-  `chanserv': CHANNEL PASSWORD
-  `bitlbee': PASSWORD
+  `nickserv': NICK PASSWORD
+  `chanserv': NICK CHANNEL PASSWORD
+  `bitlbee': NICK PASSWORD
 
 Example:
- ((\"freenode\" \"bob\" nickserv \"p455w0rd\")
-  (\"freenode\" \"bob\" chanserv \"#bobland\" \"passwd99\")
-  (\"bitlbee\" \"robert\" bitlbee \"sekrit\"))"
-  :type 'string
+ ((\"freenode\" nickserv \"bob\" \"p455w0rd\")
+  (\"freenode\" chanserv \"bob\" \"#bobland\" \"passwd99\")
+  (\"bitlbee\" bitlbee \"robert\" \"sekrit\"))"
+  :type '(alist :key-type (string :tag "Server")
+		:value-type (choice (list :tag "NickServ"
+					  (const nickserv)
+					  (string :tag "Nick")
+					  (string :tag "Password"))
+				    (list :tag "ChanServ"
+					  (const chanserv)
+					  (string :tag "Nick")
+					  (string :tag "Channel")
+					  (string :tag "Password"))
+				    (list :tag "BitlBee"
+					  (const bitlbee)
+					  (string :tag "Nick")
+					  (string :tag "Password"))))
   :group 'rcirc)
 
-(defcustom rcirc-auto-authenticate-flag (file-readable-p rcirc-authinfo-file-name)
+(defcustom rcirc-auto-authenticate-flag t
   "*Non-nil means automatically send authentication string to server.
-See also `rcirc-authinfo-file-name'."
+See also `rcirc-authinfo'."
   :type 'boolean
   :group 'rcirc)
 
@@ -187,6 +195,12 @@
   :type '(repeat string)
   :group 'rcirc)
 
+(defcustom rcirc-nick-abbrevs nil
+  "List of short replacements for printing nicks."
+  :type '(alist :key-type (string :tag "Nick")
+		:value-type (string :tag "Abbrev"))
+  :group 'rcirc)
+
 (defvar rcirc-ignore-list-automatic ()
   "List of ignored nicks added to `rcirc-ignore-list' because of renaming.
 When an ignored person renames, their nick is added to both lists.
@@ -199,6 +213,11 @@
   :type 'hook
   :group 'rcirc)
 
+(defcustom rcirc-always-use-server-buffer-flag nil
+  "Non-nil means messages without a channel target will go to the server buffer."
+  :type 'boolean
+  :group 'rcirc)
+
 (defvar rcirc-prompt-start-marker nil)
 (defvar rcirc-prompt-end-marker nil)
 
@@ -238,37 +257,35 @@
 
 (defvar rcirc-startup-channels nil)
 ;;;###autoload
-(defun rcirc (&optional server port nick channels)
+(defun rcirc (arg)
   "Connect to IRC.
-
-If any of the the optional SERVER, PORT, NICK or CHANNELS are not
-supplied, they are taken from the variables `rcirc-server',
-`rcirc-port', `rcirc-nick', and `rcirc-startup-channels-alist',
-respectively."
-  (interactive (list (read-string "IRC Server: " rcirc-server)
-		     (read-string "IRC Port: " (number-to-string rcirc-port))
-		     (read-string "IRC Nick: " rcirc-nick)))
-  (or server (setq server rcirc-server))
-  (or port (setq port rcirc-port))
-  (or nick (setq nick rcirc-nick))
-  (or channels
-      (setq channels
-	    (if (interactive-p)
-		(split-string
-		 (read-string "Channels: "
-			      (mapconcat 'identity
-					 (rcirc-startup-channels server)
-					 " "))
-			 "[, ]+" t)
-	      (rcirc-startup-channels server))))
-  (or global-mode-string (setq global-mode-string '("")))
-  (and (not (memq 'rcirc-activity-string global-mode-string))
-       (setq global-mode-string
-	     (append global-mode-string '(rcirc-activity-string))))
-  (add-hook 'window-configuration-change-hook
-	    'rcirc-window-configuration-change)
-  (rcirc-connect server port nick rcirc-user-name rcirc-user-full-name
-		 channels))
+If ARG is non-nil, prompt for a server to connect to."
+  (interactive "P")
+  (if arg
+      (let* ((server (read-string "IRC Server: " rcirc-server))
+	     (port (read-string "IRC Port: " (number-to-string rcirc-port)))
+	     (nick (read-string "IRC Nick: " rcirc-nick))
+	     (channels (split-string
+			(read-string "IRC Channels: "
+				     (mapconcat 'identity
+						(rcirc-startup-channels server)
+						" "))
+			"[, ]+" t)))
+	(rcirc-connect server port nick rcirc-user-name rcirc-user-full-name
+		       channels))
+    ;; make new connection using defaults unless already connected to
+    ;; the default rcirc-server
+    (let ((default-server (default-value 'rcirc-server))
+	  connected)
+      (dolist (p (rcirc-process-list))
+	(when (string= default-server (process-name p))
+	  (setq connected p)))
+      (if (not connected)
+	  (rcirc-connect rcirc-server rcirc-port rcirc-nick
+			 rcirc-user-name rcirc-user-full-name
+			 (rcirc-startup-channels rcirc-server))
+	(switch-to-buffer (process-buffer connected))
+	(message "Connected to %s" rcirc-server)))))
 
 ;;;###autoload
 (defalias 'irc 'rcirc)
@@ -279,11 +296,9 @@
 (defvar rcirc-keepalive-timer nil)
 (defvar rcirc-last-server-message-time nil)
 (defun rcirc-connect (server port nick user-name full-name startup-channels)
-  "Return a connection to SERVER on PORT.
+  (add-hook 'window-configuration-change-hook
+	    'rcirc-window-configuration-change)
 
-User will identify using the values of NICK, USER-NAME and
-FULL-NAME.  The variable list of channel names in
-STARTUP-CHANNELS will automatically be joined on startup."
   (save-excursion
     (message "Connecting to %s..." server)
     (let* ((inhibit-eol-conversion)
@@ -377,13 +392,13 @@
     (rcirc-debug process (format "SENTINEL: %S %S\n" process sentinel))
     (with-rcirc-process-buffer process
       (dolist (buffer (cons nil (mapcar 'cdr rcirc-buffer-alist)))
-        (rcirc-print process "rcirc.el" "ERROR" buffer
-                     (format "%s: %s (%S)"
-                             (process-name process)
-                             sentinel
-                             (process-status process)) t)
-	;; remove the prompt from buffers
 	(with-current-buffer (or buffer (current-buffer))
+	  (rcirc-print process "rcirc.el" "ERROR" rcirc-target
+		       (format "%s: %s (%S)"
+			       (process-name process)
+			       sentinel
+			       (process-status process)) t)
+	  ;; remove the prompt from buffers
 	  (let ((inhibit-read-only t))
 	    (delete-region rcirc-prompt-start-marker
 			   rcirc-prompt-end-marker)))))
@@ -428,7 +443,8 @@
 
 (defun rcirc-process-server-response-1 (process text)
   (if (string-match "^\\(:\\([^ ]+\\) \\)?\\([^ ]+\\) \\(.+\\)$" text)
-      (let* ((sender (match-string 2 text))
+      (let* ((user (match-string 2 text))
+	     (sender (rcirc-user-nick user))
              (cmd (match-string 3 text))
              (args (match-string 4 text))
              (handler (intern-soft (concat "rcirc-handler-" cmd))))
@@ -470,6 +486,11 @@
   (with-rcirc-process-buffer process
     rcirc-nick))
 
+(defun rcirc-abbrev-nick (nick)
+  "If NICK has an entry in `rcirc-nick-abbrevs', return its abbreviation,
+otherwise return NICK."
+  (or (cdr (assoc nick rcirc-nick-abbrevs)) nick))
+
 (defvar rcirc-max-message-length 450
   "Messages longer than this value will be split.")
 
@@ -487,12 +508,10 @@
                  text))
          (more (if oversize
                    (substring message rcirc-max-message-length))))
-    (rcirc-print process (rcirc-nick process) response
-		 (rcirc-get-buffer-create process target)
-		 text)
+    (rcirc-get-buffer-create process target)
+    (rcirc-print process (rcirc-nick process) response target text)
     (rcirc-send-string process (concat response " " target " :" text))
-    (if more
-        (rcirc-send-message process target more noticep))))
+    (when more (rcirc-send-message process target more noticep))))
 
 (defvar rcirc-input-ring nil)
 (defvar rcirc-input-ring-index 0)
@@ -582,10 +601,6 @@
 (define-key rcirc-mode-map (kbd "C-c C-s") 'rcirc-switch-to-server-buffer)
 (define-key rcirc-mode-map (kbd "C-c C-a") 'rcirc-jump-to-first-unread-line)
 
-(define-key global-map (kbd "C-c `") 'rcirc-next-active-buffer)
-(define-key global-map (kbd "C-c C-@") 'rcirc-next-active-buffer)
-(define-key global-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer)
-
 (defvar rcirc-browse-url-map (make-sparse-keymap)
   "Keymap used for browsing URLs in `rcirc-mode'.")
 
@@ -730,8 +745,6 @@
 (defun rcirc-get-buffer (process target &optional server)
   "Return the buffer associated with the PROCESS and TARGET.
 
-If TARGET is nil, return the server buffer.
-
 If optional argument SERVER is non-nil, return the server buffer
 if there is no existing buffer for TARGET, otherwise return nil."
   (with-rcirc-process-buffer process
@@ -744,7 +757,11 @@
   "Return the buffer associated with the PROCESS and TARGET.
 Create the buffer if it doesn't exist."
   (let ((buffer (rcirc-get-buffer process target)))
-    (or buffer
+    (if buffer
+	(progn
+	  (when (not rcirc-target)
+	    (setq rcirc-target target))
+	  buffer)
 	;; create the buffer
 	(with-rcirc-process-buffer process
 	  (let ((new-buffer (get-buffer-create
@@ -781,36 +798,45 @@
 	  (delete-backward-char 1))
 	(let ((input (buffer-substring-no-properties
 		      rcirc-prompt-end-marker (point))))
-	  ;; process a /cmd
-	  (if (string-match "^/\\([^ ]+\\) ?\\(.*\\)$" input)
-	      (let* ((command (match-string 1 input))
-		     (fun (intern-soft (concat "rcirc-cmd-" command)))
-		     (args (match-string 2 input)))
-		(newline)
-		(with-current-buffer (current-buffer)
-		  (delete-region rcirc-prompt-end-marker (point))
-		  (if (string= command "me")
-		      (rcirc-print rcirc-process (rcirc-nick rcirc-process)
-				   "ACTION" (current-buffer) args)
-		    (rcirc-print rcirc-process (rcirc-nick rcirc-process)
-				 "COMMAND" (current-buffer) input))
-		  (set-marker rcirc-prompt-end-marker (point))
-		  (if (fboundp fun)
-		      (funcall fun args rcirc-process target)
-		    (rcirc-send-string rcirc-process
-				       (concat command " " args)))))
-	    ;; send message to server
-	    (if (not rcirc-target)
-		(message "Not joined")
-	      (delete-region rcirc-prompt-end-marker (point))
-	      (mapc (lambda (message)
-		      (rcirc-send-message rcirc-process target message))
-		    (split-string input "\n"))))
+	  (dolist (line (split-string input "\n"))
+	    (rcirc-process-input-line rcirc-process target line))
 	  ;; add to input-ring
 	  (save-excursion
 	    (ring-insert rcirc-input-ring input)
 	    (setq rcirc-input-ring-index 0)))))))
 
+(defun rcirc-process-input-line (process target line)
+  (if (string-match "^/\\([^ ]+\\) ?\\(.*\\)$" line)
+      (rcirc-process-command (match-string 1 line)
+			     (match-string 2 line)
+			     line)
+    (rcirc-process-message line)))
+
+(defun rcirc-process-message (line)
+  (if (not rcirc-target)
+      (message "Not joined")
+    (delete-region rcirc-prompt-end-marker (point))
+    (rcirc-send-message rcirc-process rcirc-target line)))
+
+(defun rcirc-process-command (command args line)
+  (if (eq (aref command 0) ?/)
+      ;; "//text" will send "/text" as a message
+      (rcirc-process-message (substring line 1))
+    (let* ((fun (intern-soft (concat "rcirc-cmd-" command))))
+      (newline)
+      (with-current-buffer (current-buffer)
+	(delete-region rcirc-prompt-end-marker (point))
+	(if (string= command "me")
+	    (rcirc-print rcirc-process (rcirc-nick rcirc-process)
+			 "ACTION" rcirc-target args)
+	  (rcirc-print rcirc-process (rcirc-nick rcirc-process)
+		       "COMMAND" rcirc-target line))
+	(set-marker rcirc-prompt-end-marker (point))
+	(if (fboundp fun)
+	    (funcall fun args rcirc-process rcirc-target)
+	  (rcirc-send-string rcirc-process
+			     (concat command " " args)))))))
+
 (defvar rcirc-parent-buffer nil)
 (defvar rcirc-window-configuration nil)
 (defun rcirc-edit-multiline ()
@@ -828,7 +854,8 @@
       (setq rcirc-parent-buffer parent)
       (setq rcirc-process process)
       (insert text)
-      (and (> pos 0) (goto-char pos)))))
+      (and (> pos 0) (goto-char pos))
+      (message "Type C-c C-c to return text to %s, or C-c C-k to cancel" parent))))
 
 (define-derived-mode rcirc-multiline-edit-mode
   text-mode "rcirc multi"
@@ -879,46 +906,130 @@
 	buffer
       (process-buffer process))))
 
+(defcustom rcirc-response-formats
+  '(("PRIVMSG" . "%T<%n> %m")
+    ("NOTICE"  . "%T-%n- %m")
+    ("ACTION"  . "%T[%n] %m")
+    ("COMMAND" . "%T%m")
+    ("ERROR"   . "%T%fw!!! %m")
+    (t         . "%T%fp*** %fs%n %r %m"))
+  "An alist of formats used for printing responses.
+The format is looked up using the response-type as a key;
+if no match is found, the default entry (with a key of `t') is used.
+
+The entry's value part should be a string, which is inserted with
+the of the following escape sequences replaced by the described values:
+
+  %m        The message text
+  %n        The sender's nick (with face `rcirc-my-nick' or `rcirc-other-nick')
+  %r        The response-type
+  %T        The timestamp (with face `rcirc-timestamp')
+  %t        The target
+  %fw       Following text uses the face `font-lock-warning-face'
+  %fp       Following text uses the face `rcirc-server-prefix'
+  %fs       Following text uses the face `rcirc-server'
+  %f[FACE]  Following text uses the face FACE
+  %f-        Following text uses the default face
+  %%        A literal `%' character
+"
+  :type '(alist :key-type (choice (string :tag "Type")
+				  (const :tag "Default" t))
+		:value-type string)
+  :group 'rcirc)
+
 (defun rcirc-format-response-string (process sender response target text)
-  (concat (rcirc-facify (format-time-string rcirc-time-format (current-time))
-			'rcirc-timestamp)
-          (cond ((or (string= response "PRIVMSG")
-                     (string= response "NOTICE")
-                     (string= response "ACTION"))
-                 (let (first middle end)
-                   (cond ((string= response "PRIVMSG")
-                          (setq first "<" middle "> "))
-                         ((string= response "NOTICE")
-			  (when sender
-			    (setq first "-" middle "- ")))
-                         (t
-                          (setq first "[" middle " " end "]")))
-                   (concat first
-                           (rcirc-facify (rcirc-user-nick sender)
-                                         (if (string= sender
-                                                      (rcirc-nick process))
-                                             'rcirc-my-nick
-                                           'rcirc-other-nick))
-                           middle
-                           (rcirc-mangle-text process text)
-                           end)))
-                ((string= response "COMMAND")
-                 text)
-                ((string= response "ERROR")
-                 (propertize (concat "!!! " text)
-			     'face 'font-lock-warning-face))
-                (t
-                 (rcirc-mangle-text
-                  process
-		  (concat (rcirc-facify "*** " 'rcirc-server-prefix)
-			  (rcirc-facify
-			   (concat
-			    (when (not (string= sender (rcirc-server process)))
-			      (concat (rcirc-user-nick sender) " "))
-			    (when (zerop (string-to-number response))
-			      (concat response " "))
-			    text)
-			   'rcirc-server)))))))
+  "Return a nicely-formatted response string, incorporating TEXT
+\(and perhaps other arguments).  The specific formatting used
+is found by looking up RESPONSE in `rcirc-response-formats'."
+  (let ((chunks
+	 (split-string (or (cdr (assoc response rcirc-response-formats))
+			   (cdr (assq t rcirc-response-formats)))
+		       "%"))
+	(result "")
+	(face nil)
+	key face-key repl)
+    (when (equal (car chunks) "")
+      (pop chunks))
+    (dolist (chunk chunks)
+      (if (equal chunk "")
+	  (setq key ?%)
+	(setq key (aref chunk 0))
+	(setq chunk (substring chunk 1)))
+      (setq repl
+	    (cond ((eq key ?%)
+		   ;; %% -- literal % character	;
+		   "%")
+		  ((eq key ?n)
+		   ;; %n -- nick	;
+		   (rcirc-facify (concat (rcirc-abbrev-nick sender)
+					 (and target (concat "," target)))
+				 (if (string= sender (rcirc-nick process))
+				     'rcirc-my-nick
+				   'rcirc-other-nick)))
+		  ((eq key ?T)
+		   ;; %T -- timestamp	;
+		   (rcirc-facify
+		    (format-time-string rcirc-time-format (current-time))
+		    'rcirc-timestamp))
+		  ((eq key ?m)
+		   ;; %m -- message text ;
+		   ;; We add the text property `rcirc-text' to identify this ;
+		   ;; as the body text.	;
+		   (propertize
+		    (rcirc-mangle-text process (rcirc-facify text face))
+		    'rcirc-text text))
+		  ((eq key ?t)
+		   ;; %t -- target	;
+		   (rcirc-facify (or rcirc-target "") face))
+		  ((eq key ?r)
+		   ;; %r -- response	;
+		   (rcirc-facify response face))
+		  ((eq key ?f)
+		   ;; %f -- change face	;
+		   (setq face-key (aref chunk 0))
+		   (cond ((eq face-key ?w)
+			  ;; %fw -- warning face ;
+			  (setq face 'font-lock-warning-face))
+			 ((eq face-key ?p)
+			  ;; %fp -- server-prefix face ;
+			  (setq face 'rcirc-server-prefix))
+			 ((eq face-key ?s)
+			  ;; %fs -- warning face ;
+			  (setq face 'rcirc-server))
+			 ((eq face-key ?-)
+			  ;; %fs -- warning face ;
+			  (setq face nil))
+			 ((and (eq face-key ?\[)
+			       (string-match "^[[]\\([^]]*\\)[]]" chunk)
+			       (facep (match-string 1 chunk)))
+			  ;; %f[...] -- named face ;
+			  (setq face (intern (match-string 1 chunk)))
+			  (setq chunk (substring chunk (match-end 1)))))
+		   (setq chunk (substring chunk 1))
+		   "")
+		  (t
+		   ;; just insert the key literally ;
+		   (rcirc-facify (substring chunk 0 1) face))))
+      (setq result (concat result repl (rcirc-facify chunk face))))
+    result))
+
+(defun rcirc-target-buffer (process sender response target text)
+  "Return a buffer to print the server response."
+  (assert (not (bufferp target)))
+  (with-rcirc-process-buffer process
+    (cond ((not target)
+	   (if rcirc-always-use-server-buffer-flag
+	       (process-buffer process)
+	     (rcirc-get-any-buffer process)))
+	  ((not (rcirc-channel-p target))
+	   ;; message from another user
+	   (if (string= response "PRIVMSG")
+	       (rcirc-get-buffer-create process (if (string= sender rcirc-nick)
+						    target
+						  sender))
+	     (rcirc-get-buffer process target t)))
+	  ((or (rcirc-get-buffer process target)
+	       (rcirc-get-any-buffer process))))))
 
 (defvar rcirc-activity-type nil)
 (make-variable-buffer-local 'rcirc-activity-type)
@@ -926,19 +1037,11 @@
   "Print TEXT in the buffer associated with TARGET.
 Format based on SENDER and RESPONSE.  If ACTIVITY is non-nil,
 record activity."
-  (unless (or (member (rcirc-user-nick sender) rcirc-ignore-list)
+  (unless (or (member sender rcirc-ignore-list)
 	      (member (with-syntax-table rcirc-nick-syntax-table
 			(when (string-match "^\\([^/]\\w*\\)[:,]" text)
 			  (match-string 1 text))) rcirc-ignore-list))
-    (let* ((buffer (cond ((bufferp target)
-			  target)
-			 ((not target)
-			  (rcirc-get-any-buffer process))
-			 ((not (rcirc-channel-p target))
-			  (rcirc-get-buffer-create process
-						   (rcirc-user-nick sender)))
-			 ((or (rcirc-get-buffer process target)
-			      (rcirc-get-any-buffer process)))))
+    (let* ((buffer (rcirc-target-buffer process sender response target text))
 	   (inhibit-read-only t))
       (with-current-buffer buffer
 	(let ((moving (= (point) rcirc-prompt-end-marker))
@@ -960,38 +1063,31 @@
 	  (goto-char rcirc-prompt-start-marker)
 	  (set-marker-insertion-type rcirc-prompt-start-marker t)
 	  (set-marker-insertion-type rcirc-prompt-end-marker t)
-	  (insert
-	   (rcirc-format-response-string process sender response target text)
-	   (propertize "\n" 'hard t))
-	  (set-marker-insertion-type rcirc-prompt-start-marker nil)
-	  (set-marker-insertion-type rcirc-prompt-end-marker nil)
+
+	  (let ((fmted-text
+		 (rcirc-format-response-string process sender response nil
+					       text)))
+
+	    (insert fmted-text (propertize "\n" 'hard t))
+	    (set-marker-insertion-type rcirc-prompt-start-marker nil)
+	    (set-marker-insertion-type rcirc-prompt-end-marker nil)
 
-	  ;; fill the text we just inserted, maybe
-	  (when (and rcirc-fill-flag
-		     (not (string= response "372"))) ;/motd
-	    (let ((fill-prefix
-		   (or rcirc-fill-prefix
-		       (make-string
-			(+ (if rcirc-time-format
-			       (length (format-time-string
-					rcirc-time-format))
-			     0)
-			   (cond ((or (string= response "PRIVMSG")
-				      (string= response "NOTICE"))
-				  (+ (length (rcirc-user-nick sender))
-				     2)) ; <>
-				 ((string= response "ACTION")
-				  (+ (length (rcirc-user-nick sender))
-				     1))	; [
-				 (t 3))		; ***
-			   1)
-			?\s)))
-		  (fill-column (cond ((eq rcirc-fill-column 'frame-width)
-				      (1- (frame-width)))
-				     (rcirc-fill-column
-				      rcirc-fill-column)
-				     (t fill-column))))
-	      (fill-region fill-start rcirc-prompt-start-marker 'left t)))
+	    ;; fill the text we just inserted, maybe
+	    (when (and rcirc-fill-flag
+		       (not (string= response "372"))) ;/motd
+	      (let ((fill-prefix
+		     (or rcirc-fill-prefix
+			 (make-string
+			  (or (next-single-property-change 0 'rcirc-text
+							   fmted-text)
+			      8)
+			  ?\s)))
+		    (fill-column (cond ((eq rcirc-fill-column 'frame-width)
+					(1- (frame-width)))
+				       (rcirc-fill-column
+					rcirc-fill-column)
+				       (t fill-column))))
+		(fill-region fill-start rcirc-prompt-start-marker 'left t))))
 
 	  ;; set inserted text to be read-only
 	  (when rcirc-read-only-flag
@@ -1056,17 +1152,17 @@
 (defun rcirc-join-channels (process channels)
   "Join CHANNELS."
   (save-window-excursion
-    (mapc (lambda (channel)
-            (with-rcirc-process-buffer process
-              (rcirc-cmd-join channel process)))
-          channels)))
+    (dolist (channel channels)
+      (with-rcirc-process-buffer process
+	(rcirc-cmd-join channel process)))))
 
 ;;; nick management
 (defun rcirc-user-nick (user)
   "Return the nick from USER.  Remove any non-nick junk."
-  (if (string-match "^[@%+]?\\([^! ]+\\)!?" (or user ""))
-      (match-string 1 user)
-    user))
+  (save-match-data
+    (if (string-match "^[@%+]?\\([^! ]+\\)!?" (or user ""))
+	(match-string 1 user)
+      user)))
 
 (defun rcirc-user-non-nick (user)
   "Return the non-nick portion of USER."
@@ -1076,17 +1172,15 @@
 
 (defun rcirc-nick-channels (process nick)
   "Return list of channels for NICK."
-  (let ((nick (rcirc-user-nick nick)))
-    (with-rcirc-process-buffer process
-      (mapcar (lambda (x) (car x))
-              (gethash nick rcirc-nick-table)))))
+  (with-rcirc-process-buffer process
+    (mapcar (lambda (x) (car x))
+	    (gethash nick rcirc-nick-table))))
 
 (defun rcirc-put-nick-channel (process nick channel)
   "Add CHANNEL to list associated with NICK."
   (with-rcirc-process-buffer process
-    (let* ((nick (rcirc-user-nick nick))
-           (chans (gethash nick rcirc-nick-table))
-           (record (assoc-string channel chans t)))
+    (let* ((chans (gethash nick rcirc-nick-table))
+	   (record (assoc-string channel chans t)))
       (if record
           (setcdr record (current-time))
         (puthash nick (cons (cons channel (current-time))
@@ -1101,8 +1195,7 @@
 (defun rcirc-remove-nick-channel (process nick channel)
   "Remove the CHANNEL from list associated with NICK."
   (with-rcirc-process-buffer process
-    (let* ((nick (rcirc-user-nick nick))
-           (chans (gethash nick rcirc-nick-table))
+    (let* ((chans (gethash nick rcirc-nick-table))
            (newchans
 	    ;; instead of assoc-string-delete-all:
 	    (let ((record (assoc-string channel chans t)))
@@ -1136,28 +1229,44 @@
 	    (delete nick rcirc-ignore-list))))
 
 ;;; activity tracking
+(defvar rcirc-track-minor-mode-map (make-sparse-keymap)
+  "Keymap for rcirc track minor mode.")
+
+(define-key rcirc-track-minor-mode-map (kbd "C-c `") 'rcirc-next-active-buffer)
+(define-key rcirc-track-minor-mode-map (kbd "C-c C-@") 'rcirc-next-active-buffer)
+(define-key rcirc-track-minor-mode-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer)
+
+;;; FIXME: the code to insert `rcirc-activity-string' into
+;;; `global-mode-string' isn't called when the mode is activated by
+;;; customize.  I don't know how to set that up.
+(define-minor-mode rcirc-track-minor-mode
+  "Global minor mode for tracking activity in rcirc buffers."
+  :init-value nil
+  :lighter ""
+  :keymap rcirc-track-minor-mode-map
+  :global t
+  :group 'rcirc
+  (or global-mode-string (setq global-mode-string '("")))
+  ;; toggle the mode-line channel indicator
+  (if rcirc-track-minor-mode
+      (and (not (memq 'rcirc-activity-string global-mode-string))
+	   (setq global-mode-string
+		 (append global-mode-string '(rcirc-activity-string))))
+    (setq global-mode-string 
+	  (delete 'rcirc-activity-string global-mode-string))))
+
 (or (assq 'rcirc-ignore-buffer-activity-flag minor-mode-alist)
     (setq minor-mode-alist
           (cons '(rcirc-ignore-buffer-activity-flag " Ignore") minor-mode-alist)))
 
-(defun rcirc-toggle-ignore-buffer-activity (&optional all)
-  "Toggle the value of `rcirc-ignore-buffer-activity-flag'.
-If ALL is non-nil, instead toggle the value of
-`rcirc-ignore-all-activity-flag'."
-  (interactive "P")
-  (if all
-      (progn
-        (setq rcirc-ignore-all-activity-flag
-              (not rcirc-ignore-all-activity-flag))
-        (message (if rcirc-ignore-all-activity-flag
-		     "Hide all buffer activity"
-		   "Display buffer activity"))
-        (rcirc-update-activity-string))
-    (setq rcirc-ignore-buffer-activity-flag
-          (not rcirc-ignore-buffer-activity-flag))
-    (message (if rcirc-ignore-buffer-activity-flag
-		 "Ignore activity in this buffer"
-	       "Notice activity in this buffer")))
+(defun rcirc-toggle-ignore-buffer-activity ()
+  "Toggle the value of `rcirc-ignore-buffer-activity-flag'."
+  (interactive)
+  (setq rcirc-ignore-buffer-activity-flag
+	(not rcirc-ignore-buffer-activity-flag))
+  (message (if rcirc-ignore-buffer-activity-flag
+	       "Ignore activity in this buffer"
+	     "Notice activity in this buffer"))
   (force-mode-line-update))
 
 (defvar rcirc-switch-to-buffer-function 'switch-to-buffer
@@ -1229,21 +1338,18 @@
 (defun rcirc-update-activity-string ()
   "Update mode-line string."
   (setq rcirc-activity-string
-	(cond (rcirc-ignore-all-activity-flag
-	       " DND")
-	      ((not rcirc-activity)
-	       "")
-	      (t
-	       (concat " ["
-		       (mapconcat
-			(lambda (b)
-			  (let ((s (rcirc-short-buffer-name b)))
-			    (with-current-buffer b
-			      (if (not (eq rcirc-activity-type 'nick))
-				  s
-				(rcirc-facify s 'rcirc-mode-line-nick)))))
-			rcirc-activity ",")
-		       "]")))))
+	(if (not rcirc-activity)
+	       ""
+	  (concat " ["
+		  (mapconcat
+		   (lambda (b)
+		     (let ((s (rcirc-short-buffer-name b)))
+		       (with-current-buffer b
+			 (if (not (eq rcirc-activity-type 'nick))
+			     s
+			   (rcirc-facify s 'rcirc-mode-line-nick)))))
+		   rcirc-activity ",")
+		  "]"))))
 
 (defun rcirc-short-buffer-name (buffer)
   "Return a short name for BUFFER to use in the modeline indicator."
@@ -1488,23 +1594,22 @@
 nicks when no NICK is given.  When listing ignored nicks, the
 ones added to the list automatically are marked with an asterisk."
   (interactive "sToggle ignoring of nick: ")
-  (if (string= "" nick)
-      (rcirc-print process (rcirc-nick process) "NOTICE" target
-		   (mapconcat
-		    (lambda (nick)
-		      (concat nick
-			      (if (member nick rcirc-ignore-list-automatic)
-				  "*" "")))
-		    rcirc-ignore-list " "))
+  (when (not (string= "" nick))
     (if (member nick rcirc-ignore-list)
 	(setq rcirc-ignore-list (delete nick rcirc-ignore-list))
-      (setq rcirc-ignore-list (cons nick rcirc-ignore-list)))))
-
+      (setq rcirc-ignore-list (cons nick rcirc-ignore-list))))
+  (rcirc-print process (rcirc-nick process) "IGNORE" target 
+	       (mapconcat
+		(lambda (nick)
+		  (concat nick
+			  (if (member nick rcirc-ignore-list-automatic)
+			      "*" "")))
+		rcirc-ignore-list " ")))
 
 
 (defun rcirc-message-leader (sender face)
   "Return a string with SENDER propertized with FACE."
-  (rcirc-facify (concat "<" (rcirc-user-nick sender) "> ") face))
+  (rcirc-facify (concat "<" sender "> ") face))
 
 (defun rcirc-facify (string face)
   "Return a copy of STRING with FACE property added."
@@ -1518,8 +1623,8 @@
 	       "://"
 	       (1+ (char "a-zA-Z0-9_."))
 	       (optional ":" (1+ (char "0-9")))))
-      (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,"))
-      (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;"))
+      (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]"))
+      (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]"))
   "Regexp matching URLs.  Set to nil to disable URL features in rcirc.")
 
 (defun rcirc-browse-url (&optional arg)
@@ -1603,7 +1708,7 @@
 					'mouse-face 'highlight
 					'keymap rcirc-browse-url-map)
 				  string))
-	     (push (substring string start end) rcirc-urls))
+	     (push (substring-no-properties string start end) rcirc-urls))
 	   rcirc-url-regexp
 	   text))
   text)
@@ -1627,7 +1732,7 @@
 (defun rcirc-handler-PRIVMSG (process sender args text)
   (let ((target (if (rcirc-channel-p (car args))
                     (car args)
-                  (rcirc-user-nick sender)))
+                  sender))
         (message (or (cadr args) "")))
     (if (string-match "^\C-a\\(.*\\)\C-a$" message)
         (rcirc-handler-CTCP process target sender (match-string 1 message))
@@ -1650,25 +1755,21 @@
 			  (match-string 1 message))
 			 (sender
 			  (if (string= sender (rcirc-server process))
-			      (process-buffer process)
-			    (rcirc-user-nick sender))))
+			      nil	; server notice
+			    sender)))
                  message t))))
-    ;; do we need this:
-    ;;(and sender (rcirc-put-nick-channel process sender target))))
 
 (defun rcirc-handler-WALLOPS (process sender args text)
-  (let ((target (rcirc-user-nick sender)))
-    (rcirc-print process sender "WALLOPS" target (car args) t)))
+  (rcirc-print process sender "WALLOPS" sender (car args) t))
 
 (defun rcirc-handler-JOIN (process sender args text)
-  (let ((channel (car args))
-        (nick (rcirc-user-nick sender)))
+  (let ((channel (car args)))
     (rcirc-get-buffer-create process channel)
     (rcirc-print process sender "JOIN" channel "")
 
     ;; print in private chat buffer if it exists
-    (when (rcirc-get-buffer rcirc-process nick)
-      (rcirc-print process sender "JOIN" nick channel))
+    (when (rcirc-get-buffer rcirc-process sender)
+      (rcirc-print process sender "JOIN" sender channel))
 
     (rcirc-put-nick-channel process sender channel)))
 
@@ -1695,9 +1796,9 @@
 	  (setq rcirc-target nil))))))
 
 (defun rcirc-handler-PART (process sender args text)
-  (rcirc-ignore-update-automatic (rcirc-user-nick sender))
+  (rcirc-ignore-update-automatic sender)
   (rcirc-handler-PART-or-KICK process "PART"
-                              (car args) sender (rcirc-user-nick sender)
+                              (car args) sender sender
                               (cadr args)))
 
 (defun rcirc-handler-KICK (process sender args text)
@@ -1705,21 +1806,19 @@
                               (caddr args)))
 
 (defun rcirc-handler-QUIT (process sender args text)
-  (rcirc-ignore-update-automatic (rcirc-user-nick sender))
-  (let ((nick (rcirc-user-nick sender)))
-    (mapc (lambda (channel)
-            (rcirc-print process sender "QUIT" channel (apply 'concat args)))
-          (rcirc-nick-channels process nick))
+  (rcirc-ignore-update-automatic sender)
+  (mapc (lambda (channel)
+	  (rcirc-print process sender "QUIT" channel (apply 'concat args)))
+	(rcirc-nick-channels process sender))
 
-    ;; print in private chat buffer if it exists
-    (let ((buffer (rcirc-get-buffer rcirc-process nick)))
-      (when buffer
-	(rcirc-print process sender "QUIT" buffer (apply 'concat args))))
+  ;; print in private chat buffer if it exists
+  (when (rcirc-get-buffer rcirc-process sender)
+    (rcirc-print process sender "QUIT" sender (apply 'concat args)))
 
-    (rcirc-nick-remove process nick)))
+  (rcirc-nick-remove process sender))
 
 (defun rcirc-handler-NICK (process sender args text)
-  (let* ((old-nick (rcirc-user-nick sender))
+  (let* ((old-nick sender)
          (new-nick (car args))
          (channels (rcirc-nick-channels process old-nick)))
     ;; update list of ignored nicks
@@ -1796,9 +1895,8 @@
 
     ;; print in private chat buffers if they exist
     (mapc (lambda (nick)
-	    (let ((existing-buffer (rcirc-get-buffer process nick)))
-	      (when existing-buffer
-		(rcirc-print process sender "MODE" existing-buffer msg))))
+	    (when (rcirc-get-buffer process nick)
+	      (rcirc-print process sender "MODE" nick msg)))
 	  (cddr args))))
 
 (defun rcirc-get-temp-buffer-create (process channel)
@@ -1834,40 +1932,35 @@
 
 (defun rcirc-authenticate ()
   "Send authentication to process associated with current buffer.
-Passwords are read from `rcirc-authinfo-file-name' (which see)."
+Passwords are stored in `rcirc-authinfo' (which see)."
   (interactive)
-  (let ((password-alist
-         (with-temp-buffer
-           (insert-file-contents-literally rcirc-authinfo-file-name)
-           (goto-char (point-min))
-           (read (current-buffer)))))
-    (with-rcirc-process-buffer rcirc-process
-      (dolist (i password-alist)
-        (let ((server (car i))
-              (nick (cadr i))
-              (method (caddr i))
-              (args (cdddr i)))
-          (when (and (string-match server rcirc-server)
-                     (string-match nick rcirc-nick))
-            (cond ((equal method 'nickserv)
-                   (rcirc-send-string
-                    rcirc-process
-                    (concat
-                     "PRIVMSG nickserv :identify "
-		     (car args))))
-                  ((equal method 'chanserv)
-                   (rcirc-send-string
-                    rcirc-process
-                    (concat
-                     "PRIVMSG chanserv :identify "
-		     (car args) " " (cadr args))))
-                  ((equal method 'bitlbee)
-                   (rcirc-send-string
-                    rcirc-process
-                    (concat "PRIVMSG #bitlbee :identify " (car args))))
-                  (t
-                   (message "No %S authentication method defined"
-			    method)))))))))
+  (with-rcirc-process-buffer rcirc-process
+    (dolist (i rcirc-authinfo)
+      (let ((server (car i))
+	    (nick (caddr i))
+	    (method (cadr i))
+	    (args (cdddr i)))
+	(when (and (string-match server rcirc-server)
+		   (string-match nick rcirc-nick))
+	  (cond ((equal method 'nickserv)
+		 (rcirc-send-string
+		  rcirc-process
+		  (concat
+		   "PRIVMSG nickserv :identify "
+		   (car args))))
+		((equal method 'chanserv)
+		 (rcirc-send-string
+		  rcirc-process
+		  (concat
+		   "PRIVMSG chanserv :identify "
+		   (cadr args) " " (car args))))
+		((equal method 'bitlbee)
+		 (rcirc-send-string
+		  rcirc-process
+		  (concat "PRIVMSG &bitlbee :identify " (car args))))
+		(t
+		 (message "No %S authentication method defined"
+			  method))))))))
 
 (defun rcirc-handler-INVITE (process sender args text)
   (rcirc-print process sender "INVITE" nil (mapconcat 'identity args " ") t))
@@ -1879,22 +1972,19 @@
   (if (string-match "^\\([^ ]+\\) *\\(.*\\)$" text)
       (let* ((request (upcase (match-string 1 text)))
              (args (match-string 2 text))
-             (nick (rcirc-user-nick sender))
              (handler (intern-soft (concat "rcirc-handler-ctcp-" request))))
         (if (not (fboundp handler))
-            (rcirc-print process sender "ERROR"
-			 (rcirc-get-buffer process target)
-                         (format "%s sent unsupported ctcp: %s" nick text)
+            (rcirc-print process sender "ERROR" target
+                         (format "%s sent unsupported ctcp: %s" sender text)
 			 t)
           (funcall handler process target sender args)
           (if (not (string= request "ACTION"))
-              (rcirc-print process sender "CTCP"
-			   (rcirc-get-buffer process target)
+              (rcirc-print process sender "CTCP" target
 			   (format "%s" text) t))))))
 
 (defun rcirc-handler-ctcp-VERSION (process target sender args)
   (rcirc-send-string process
-                     (concat "NOTICE " (rcirc-user-nick sender)
+                     (concat "NOTICE " sender
                              " :\C-aVERSION " rcirc-id-string
                              "\C-a")))
 
@@ -1903,7 +1993,7 @@
 
 (defun rcirc-handler-ctcp-TIME (process target sender args)
   (rcirc-send-string process
-                     (concat "NOTICE " (rcirc-user-nick sender)
+                     (concat "NOTICE " sender
                              " :\C-aTIME " (current-time-string) "\C-a")))
 
 (defun rcirc-handler-CTCP-response (process target sender message)
@@ -1960,7 +2050,7 @@
   :group 'rcirc-faces)
 
 (defface rcirc-server-prefix	 ; font-lock-comment-delimiter-face
-  '((default :inherit font-lock-comment-face)
+  '((default :inherit rcirc-server)
     (((class grayscale)))
     (((class color) (min-colors 16)))
     (((class color) (min-colors 8) (background light))
--- a/lisp/net/rcompile.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/rcompile.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rcompile.el --- run a compilation on a remote machine
 
 ;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Albert    <alon@milcse.rtsg.mot.com>
 ;; Maintainer: FSF
--- a/lisp/net/rlogin.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/rlogin.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rlogin.el --- remote login interface
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman
 ;; Maintainer: Noah Friedman <friedman@splode.com>
--- a/lisp/net/snmp-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/snmp-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode
 
 ;; Copyright (C) 1995, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Paul D. Smith <psmith@BayNetworks.com>
 ;; Keywords: data
--- a/lisp/net/telnet.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/telnet.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; telnet.el --- run a telnet session from within an Emacs buffer
 
 ;; Copyright (C) 1985, 1988, 1992, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: William F. Schelter
 ;; Maintainer: FSF
--- a/lisp/net/tls.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/tls.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
--- a/lisp/net/tramp-smb.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/tramp-smb.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; tramp-smb.el --- Tramp access functions for SMB servers -*- coding: iso-8859-1; -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
--- a/lisp/net/tramp-uu.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/tramp-uu.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; -*- coding: iso-2022-7bit; -*-
 ;;; tramp-uu.el --- uuencode in Lisp
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
 ;; Keywords: comm, terminals
--- a/lisp/net/tramp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/tramp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1735,7 +1735,7 @@
 (defvar tramp-perl-encode
   "%s -e '
 # This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2006 Free Software Foundation, Inc.
 use strict;
 
 my %%trans = do {
@@ -1777,7 +1777,7 @@
 (defvar tramp-perl-decode
   "%s -e '
 # This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2006 Free Software Foundation, Inc.
 use strict;
 
 my %%trans = do {
@@ -6482,7 +6482,8 @@
 		 p (processp p) (memq (process-status p) '(run open)))
 	(tramp-send-command
 	 multi-method method user host "echo are you awake" nil t)
-	(unless (tramp-wait-for-output 10)
+	(unless (and (memq (process-status p) '(run open))
+                     (tramp-wait-for-output 10))
 	  (delete-process p)
 	  (setq p nil))
 	(erase-buffer)))
--- a/lisp/net/trampver.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/trampver.el	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
 ;;; trampver.el --- Transparent Remote Access, Multiple Protocol
 ;;; lisp/trampver.el.  Generated from trampver.el.in by configure.
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
 ;; Keywords: comm, processes
--- a/lisp/net/webjump.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/webjump.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; webjump.el --- programmable Web hotlist
 
 ;; Copyright (C) 1996, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:    Neil W. Van Dyke <nwv@acm.org>
 ;; Created:   09-Aug-1996
--- a/lisp/net/zone-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/net/zone-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; zone-mode.el --- major mode for editing DNS zone files
 
-;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@isi.edu>
 ;; Keywords: DNS, languages
--- a/lisp/novice.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/novice.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal, help
--- a/lisp/outline.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/outline.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; outline.el --- outline mode commands for Emacs
 
 ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: outlines
--- a/lisp/paren.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/paren.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; paren.el --- highlight matching paren
 
 ;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: rms@gnu.org
 ;; Maintainer: FSF
--- a/lisp/paths.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/paths.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/pcmpl-cvs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcmpl-cvs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcmpl-cvs.el --- functions for dealing with cvs completions
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
--- a/lisp/pcmpl-gnu.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcmpl-gnu.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcmpl-gnu.el --- completions for GNU project tools
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/pcmpl-linux.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcmpl-linux.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcmpl-linux.el --- functions for dealing with GNU/Linux completions
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/pcmpl-rpm.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcmpl-rpm.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcmpl-rpm.el --- functions for dealing with rpm completions
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/pcmpl-unix.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcmpl-unix.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcmpl-unix.el --- standard UNIX completions
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/pcomplete.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcomplete.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcomplete.el --- programmable completion
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-;;   2005 Free Sofware Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes abbrev
--- a/lisp/pcvs-defs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcvs-defs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcvs-defs.el --- variable definitions for PCL-CVS
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
--- a/lisp/pcvs-info.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcvs-info.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcvs-info.el --- internal representation of a fileinfo entry
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
--- a/lisp/pcvs-parse.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcvs-parse.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcvs-parse.el --- the CVS output parser
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
--- a/lisp/pcvs-util.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcvs-util.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcvs-util.el --- utility functions for PCL-CVS  -*- byte-compile-dynamic: t -*-
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
--- a/lisp/pcvs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pcvs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pcvs.el --- a front-end to CVS
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com
 ;;	(Per Cederqvist) ceder@lysator.liu.se
--- a/lisp/pgg-def.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pgg-def.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; pgg-def.el --- functions/macros for defining PGG functions
 
-;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
@@ -82,6 +83,9 @@
 (defvar pgg-scheme nil
   "Current scheme of PGP implementation.")
 
+(defvar pgg-text-mode nil
+  "If t, inform the recipient that the input is text.")
+
 (defmacro pgg-truncate-key-identifier (key)
   `(if (> (length ,key) 8) (substring ,key 8) ,key))
 
--- a/lisp/pgg-gpg.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pgg-gpg.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pgg-gpg.el --- GnuPG support for PGG.
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de>
@@ -87,7 +87,9 @@
 	    (buffer-disable-undo)
 	    (erase-buffer)
 	    (if (file-exists-p output-file-name)
-		(let ((coding-system-for-read 'raw-text-dos))
+		(let ((coding-system-for-read (if pgg-text-mode
+						  'raw-text
+						'binary)))
 		  (insert-file-contents output-file-name)))
 	    (set-buffer errors-buffer)
 	    (if (not (equal exit-status 0))
@@ -187,7 +189,8 @@
                             pgg-gpg-user-id))))
 	 (args
 	  (append
-	   (list "--batch" "--textmode" "--armor" "--always-trust" "--encrypt")
+	   (list "--batch" "--armor" "--always-trust" "--encrypt")
+	   (if pgg-text-mode (list "--textmode"))
 	   (if sign (list "--sign" "--local-user" pgg-gpg-user-id))
 	   (if recipients
 	       (apply #'nconc
@@ -196,8 +199,7 @@
 			      (append recipients
 				      (if pgg-encrypt-for-me
 					  (list pgg-gpg-user-id)))))))))
-    (pgg-as-lbt start end 'CRLF
-      (pgg-gpg-process-region start end passphrase pgg-gpg-program args))
+    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
     (when sign
       (with-current-buffer pgg-errors-buffer
 	;; Possibly cache passphrase under, e.g. "jas", for future sign.
@@ -215,9 +217,9 @@
                          (pgg-read-passphrase
                           "GnuPG passphrase for symmetric encryption: ")))
 	 (args
-	  (append (list "--batch" "--textmode" "--armor" "--symmetric" ))))
-    (pgg-as-lbt start end 'CRLF
-      (pgg-gpg-process-region start end passphrase pgg-gpg-program args))
+	  (append (list "--batch" "--armor" "--symmetric" )
+		  (if pgg-text-mode (list "--textmode")))))
+    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
     (pgg-process-when-success)))
 
 (defun pgg-gpg-decrypt-region (start end &optional passphrase)
@@ -279,13 +281,13 @@
                           (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
                           pgg-gpg-user-id)))
 	 (args
-	  (list (if cleartext "--clearsign" "--detach-sign")
-		"--armor" "--batch" "--verbose"
-		"--local-user" pgg-gpg-user-id))
+	  (append (list (if cleartext "--clearsign" "--detach-sign")
+			"--armor" "--batch" "--verbose"
+			"--local-user" pgg-gpg-user-id)
+		  (if pgg-text-mode (list "--textmode"))))
 	 (inhibit-read-only t)
 	 buffer-read-only)
-    (pgg-as-lbt start end 'CRLF
-      (pgg-gpg-process-region start end passphrase pgg-gpg-program args))
+    (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
     (with-current-buffer pgg-errors-buffer
       ;; Possibly cache passphrase under, e.g. "jas", for future sign.
       (pgg-gpg-possibly-cache-passphrase passphrase pgg-gpg-user-id)
--- a/lisp/pgg-parse.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pgg-parse.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; pgg-parse.el --- OpenPGP packet parsing
 
-;; Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/10/28
--- a/lisp/pgg-pgp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pgg-pgp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG.
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
--- a/lisp/pgg-pgp5.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pgg-pgp5.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pgg-pgp5.el --- PGP 5.* support for PGG.
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
--- a/lisp/pgg.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/pgg.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pgg.el --- glue for the various PGP implementations.
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de>
--- a/lisp/printing.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/printing.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,10 +1,11 @@
 ;;; printing.el --- printing utilities
 
-;; Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2005-09-18 05:57:14 deego>
+;; Time-stamp: <2006-02-06 15:06:40 ttn>
 ;; Keywords: wp, print, PostScript
 ;; Version: 6.8.4
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
--- a/lisp/progmodes/ada-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ada-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ada-mode.el --- major-mode for editing Ada sources
 
 ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;               2005  Free Software Foundation, Inc.
+;;               2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Rolf Ebert      <ebert@inf.enst.fr>
 ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
--- a/lisp/progmodes/ada-prj.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ada-prj.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; ada-prj.el --- easy editing of project files for the ada-mode
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 
 ;; Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot <briot@gnat.com>
--- a/lisp/progmodes/ada-stmt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ada-stmt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates
 
 ;; Copyright(C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;              2003, 2004, 2005 Free Software Foundation, Inc.
+;;              2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/progmodes/ada-xref.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ada-xref.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ada-xref.el --- for lookup and completion in Ada mode
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;               2004, 2005 Free Software Foundation, Inc.
+;;               2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Rolf Ebert <ebert@inf.enst.fr>
--- a/lisp/progmodes/antlr-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/antlr-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; antlr-mode.el --- major mode for ANTLR grammar files
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 ;;
 ;; Author: Christoph.Wedler@sap.com
--- a/lisp/progmodes/asm-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/asm-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; asm-mode.el --- mode for editing assembler code
 
-;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
--- a/lisp/progmodes/autoconf.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/autoconf.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; autoconf.el --- mode for editing Autoconf configure.in files
 
-;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005
+;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
@@ -52,7 +52,7 @@
   "AC_\\(SUBST\\|DEFINE\\(_UNQUOTED\\)?\\)(\\(\\sw+\\)")
 
 (defvar autoconf-font-lock-keywords
-  `(("A[CHMS]_\\sw+" . font-lock-keyword-face)
+  `(("\\_<A[CHMS]_\\sw+" . font-lock-keyword-face)
     (,autoconf-definition-regexp
      3 font-lock-function-name-face)
     ;; Are any other M4 keywords really appropriate for configure.in,
--- a/lisp/progmodes/cc-align.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-align.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cc-align.el --- custom indentation functions for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
--- a/lisp/progmodes/cc-awk.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-awk.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-awk.el --- AWK specific code within cc-mode.
 
-;; Copyright (C) 1988,94,96,2000, 2001, 2002, 2003, 2004, 2005  Free
-;; Software Foundation, Inc.
+;; Copyright (C) 1988,94,96,2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Author: Alan Mackenzie <acm@muc.de> (originally based on awk-mode.el)
 ;; Maintainer: FSF
--- a/lisp/progmodes/cc-bytecomp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-bytecomp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-bytecomp.el --- compile time setup for proper compilation
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Author:     Martin Stjernholm
 ;; Maintainer: bug-cc-mode@gnu.org
--- a/lisp/progmodes/cc-cmds.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-cmds.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-cmds.el --- user level commands for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
--- a/lisp/progmodes/cc-compat.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-compat.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;	       1994-1999 Barry A. Warsaw
--- a/lisp/progmodes/cc-defs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-defs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-defs.el --- compile time definitions for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
--- a/lisp/progmodes/cc-engine.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-engine.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-engine.el --- core syntax guessing engine for CC mode
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
--- a/lisp/progmodes/cc-fonts.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-fonts.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cc-fonts.el --- font lock support for CC Mode
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             2002- Martin Stjernholm
--- a/lisp/progmodes/cc-langs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-langs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-langs.el --- language specific settings for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
@@ -258,9 +258,12 @@
 	     (c-fn-region-is-active-p)]))
       "----"
       ("Toggle..."
-       ["Syntactic indentation" c-toggle-syntactic-indentation t]
-       ["Auto newline"          c-toggle-auto-newline t]
-       ["Hungry delete"         c-toggle-hungry-state t])))
+       ["Syntactic indentation" c-toggle-syntactic-indentation
+	:style toggle :selected c-syntactic-indentation]
+       ["Auto newline" c-toggle-auto-newline
+	:style toggle :selected c-auto-newline]
+       ["Hungry delete" c-toggle-hungry-state
+	:style toggle :selected c-hungry-delete-key])))
 
 
 ;;; Syntax tables.
--- a/lisp/progmodes/cc-menus.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-menus.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-menus.el --- imenu support for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
--- a/lisp/progmodes/cc-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-mode.el --- major mode for editing C and similar languages
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             1998- Martin Stjernholm
--- a/lisp/progmodes/cc-styles.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-styles.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-styles.el --- support for styles in CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
--- a/lisp/progmodes/cc-subword.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-subword.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cc-subword.el --- Handling capitalized subwords in a nomenclature
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO
 
--- a/lisp/progmodes/cc-vars.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cc-vars.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cc-vars.el --- user customization variables for CC Mode
 
-;; Copyright (C) 1985,1987,1992-2003, 2004, 2005 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
--- a/lisp/progmodes/cfengine.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cfengine.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; cfengine.el --- mode for editing Cfengine files
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
--- a/lisp/progmodes/cmacexp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cmacexp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cmacexp.el --- expand C macros in a region
 
-;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Francesco Potorti` <pot@gnu.org>
--- a/lisp/progmodes/compile.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/compile.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; compile.el --- run compiler as inferior of Emacs, parse error messages
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Authors: Roland McGrath <roland@gnu.org>,
 ;;	    Daniel Pfeiffer <occitan@esperanto.org>
--- a/lisp/progmodes/cperl-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cperl-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; cperl-mode.el --- Perl code editing commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich and Bob Olson
--- a/lisp/progmodes/cpp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cpp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cpp.el --- highlight or hide text according to cpp conditionals
 
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
--- a/lisp/progmodes/cwarn.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/cwarn.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; cwarn.el --- highlight suspicious C and C++ constructions
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
--- a/lisp/progmodes/dcl-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/dcl-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; dcl-mode.el --- major mode for editing DCL command files
 
-;; Copyright (c) 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (c) 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Odd Gripenstam <gripenstamol@decus.se>
--- a/lisp/progmodes/delphi.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/delphi.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; delphi.el --- major mode for editing Delphi source (Object Pascal) in Emacs
 
-;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Ray Blaak <blaak@infomatch.com>
--- a/lisp/progmodes/ebnf-abn.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ebnf-abn.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF)
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
--- a/lisp/progmodes/ebnf-bnf.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ebnf-bnf.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-bnf.el --- parser for EBNF
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
--- a/lisp/progmodes/ebnf-dtd.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ebnf-dtd.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML)
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
--- a/lisp/progmodes/ebnf-ebx.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ebnf-ebx.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX)
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
--- a/lisp/progmodes/ebnf-iso.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ebnf-iso.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-iso.el --- parser for ISO EBNF
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
--- a/lisp/progmodes/ebnf-otz.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ebnf-otz.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-otz.el --- syntactic chart OpTimiZer
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
--- a/lisp/progmodes/ebnf-yac.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ebnf-yac.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf-yac.el --- parser for Yacc/Bison
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Sofware Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
--- a/lisp/progmodes/ebnf2ps.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ebnf2ps.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; ebnf2ps.el --- translate an EBNF to a syntactic chart on PostScript
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
--- a/lisp/progmodes/ebrowse.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ebrowse.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ebrowse.el --- Emacs C++ class browser & tags facility
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;; 2002, 2003, 2004, 2005
+;; 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
--- a/lisp/progmodes/etags.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/etags.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; etags.el --- etags facility for Emacs
 
 ;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1998,
-;;               2000, 2001, 2002, 2003, 2004, 2005
+;;               2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;	Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
--- a/lisp/progmodes/executable.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/executable.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; executable.el --- base functionality for executable interpreter scripts -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
--- a/lisp/progmodes/f90.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/f90.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; f90.el --- Fortran-90 mode (free format)
 
-;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
--- a/lisp/progmodes/gdb-ui.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/gdb-ui.el	Sun Feb 12 00:15:44 2006 +0000
@@ -4,7 +4,8 @@
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
 
-;; Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 
+;; Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -77,16 +78,9 @@
 ;;; TODO:
 
 ;; 1) Use MI command -data-read-memory for memory window.
-;; 2) Highlight changed register values (use MI commands
-;;    -data-list-register-values and -data-list-changed-registers instead
-;;    of 'info registers' after release of 22.1.
-;; 3) Use tree-widget.el instead of the speedbar for watch-expressions?
-;; 4) Mark breakpoint locations on scroll-bar of source buffer?
-;; 5) After release of 22.1, use "-var-list-children --all-values"
-;;    and "-stack-list-locals --simple-values" which need GDB 6.1 onwards.
-;; 6) After release of 22.1, use "-var-update --all-values" which needs
-;;    GDB 6.4 onwards.
-;; 7) With gud-print and gud-pstar, print the variable name in the GUD
+;; 2) Use tree-widget.el instead of the speedbar for watch-expressions?
+;; 3) Mark breakpoint locations on scroll-bar of source buffer?
+;; 4) With gud-print and gud-pstar, print the variable name in the GUD
 ;;    buffer instead of the value's history number.
 
 ;;; Code:
@@ -1192,6 +1186,8 @@
   (unless (or gdb-pending-triggers gdb-first-post-prompt)
     (gdb-get-selected-frame)
     (gdb-invalidate-frames)
+    ;; Regenerate breakpoints buffer in case it has been inadvertantly deleted.
+    (gdb-get-create-buffer 'gdb-breakpoints-buffer)
     (gdb-invalidate-breakpoints)
     ;; Do this through gdb-get-selected-frame -> gdb-frame-handler
     ;; so gdb-frame-address is updated.
@@ -1645,12 +1641,19 @@
     (define-key map [menu-bar breakpoints] (cons "Breakpoints" menu))
     (define-key map " " 'gdb-toggle-breakpoint)
     (define-key map "D" 'gdb-delete-breakpoint)
-    (define-key map "q" 'kill-this-buffer)
+    ;; Don't bind "q" to kill-this-buffer as we need it for breakpoint icons.
+    (define-key map "q" 'gdb-delete-frame-or-window)
     (define-key map "\r" 'gdb-goto-breakpoint)
     (define-key map [mouse-2] 'gdb-goto-breakpoint)
     (define-key map [follow-link] 'mouse-face)
     map))
 
+(defun gdb-delete-frame-or-window ()
+  "Delete frame if there is only one window.  Otherwise delete the window."
+  (interactive)
+  (if (one-window-p) (delete-frame)
+    (delete-window)))
+
 (defun gdb-breakpoints-mode ()
   "Major mode for gdb breakpoints.
 
@@ -2966,6 +2969,35 @@
   (gdb-invalidate-assembler))
 
 
+;; For debugging Emacs only (assumes that usual stack buffer already exists).
+(defun gdb-xbacktrace ()
+  "Generate a full lisp level backtrace with arguments."
+  (interactive)
+  (setq my-frames nil)
+  (with-current-buffer (get-buffer-create "xbacktrace")
+    (erase-buffer))
+  (let (frame-number gdb-frame-number)
+    (with-current-buffer (gdb-get-buffer 'gdb-stack-buffer)
+      (save-excursion
+	(goto-char (point-min))
+	(while (search-forward "in Ffuncall " nil t)
+	  (goto-char (line-beginning-position))
+	  (looking-at "^#\\([0-9]+\\)")
+	  (push (match-string-no-properties 1) my-frames)
+	  (forward-line 1))))
+    (dolist (frame my-frames)
+      (gdb-enqueue-input (list (concat "server frame " frame "\n")
+			       'ignore))
+;    (gdb-enqueue-input (list "server ppargs\n" 'gdb-get-arguments))
+      (gud-basic-call "server ppargs")
+)
+    (gdb-enqueue-input (list (concat "server frame " frame-number "\n")
+			     'ignore))))
+    
+(defun gdb-get-arguments ()
+  (with-current-buffer "xbacktrace"
+    (insert-buffer-substring (gdb-get-buffer 'gdb-partial-output-buffer))))
+
 ;; Code specific to GDB 6.4
 (defconst gdb-source-file-regexp-1 "fullname=\"\\(.*?\\)\"")
 
--- a/lisp/progmodes/glasses.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/glasses.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; glasses.el --- make cantReadThis readable
 
-;; Copyright (C) 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
 ;; Maintainer: Milan Zamazal <pdm@zamazal.org>
@@ -67,13 +67,31 @@
 
 
 (defcustom glasses-separator "_"
-  "*String to be displayed as a visual separator in unreadable identifiers."
+  "*String to be displayed as a visual separator in identifiers.
+It is used both for adding missing separators and for replacing separators
+defined by `glasses-original-separator'.  If you don't want to add missing
+separators, set `glasses-separator' to an empty string.  If you don't want to
+replace existent separators, set `glasses-original-separator' to an empty
+string."
   :group 'glasses
   :type 'string
   :set 'glasses-custom-set
   :initialize 'custom-initialize-default)
 
 
+(defcustom glasses-original-separator "_"
+  "*String to be displayed as `glasses-separator' in separator positions.
+For instance, if you set it to \"_\" and set `glasses-separator' to \"-\",
+underscore separators are displayed as hyphens.
+If `glasses-original-separator' is an empty string, no such display change is
+performed."
+  :group 'glasses
+  :type 'string
+  :set 'glasses-custom-set
+  :initialize 'custom-initialize-default
+  :version "22.1")
+
+
 (defcustom glasses-face nil
   "*Face to be put on capitals of an identifier looked through glasses.
 If it is nil, no face is placed at the capitalized letter.
@@ -196,15 +214,20 @@
 	      (overlay-put o 'invisible t)
 	      (overlay-put o 'after-string (downcase (match-string n))))))
         ;; Separator change
-        (unless (string= glasses-separator "_")
+	(when (and (not (string= glasses-original-separator glasses-separator))
+		   (not (string= glasses-original-separator "")))
           (goto-char beg)
-          (while (re-search-forward "[a-zA-Z0-9]\\(_+\\)[a-zA-Z0-9]" end t)
-            (goto-char (match-beginning 1))
-            (while (eql (char-after) ?\_)
-              (let ((o (glasses-make-overlay (point) (1+ (point)))))
-                ;; `concat' ensures the character properties won't merge
-                (overlay-put o 'display (concat glasses-separator)))
-              (forward-char))))
+	  (let ((original-regexp (regexp-quote glasses-original-separator)))
+	    (while (re-search-forward
+		    (format "[a-zA-Z0-9]\\(\\(%s\\)+\\)[a-zA-Z0-9]"
+			    original-regexp)
+		    end t)
+	      (goto-char (match-beginning 1))
+	      (while (looking-at original-regexp)
+		(let ((o (glasses-make-overlay (point) (1+ (point)))))
+		  ;; `concat' ensures the character properties won't merge
+		  (overlay-put o 'display (concat glasses-separator)))
+		(goto-char (match-end 0))))))
 	;; Parentheses
 	(when glasses-separate-parentheses-p
 	  (goto-char beg)
@@ -237,13 +260,13 @@
 	  (let ((n (if (match-string 1) 1 2)))
 	    (replace-match "" t nil nil n)
 	    (goto-char (match-end n))))
-        (unless (string= glasses-separator "_")
-          (goto-char (point-min))
-          (while (re-search-forward (format "[a-zA-Z0-9]\\(%s+\\)[a-zA-Z0-9]"
-                                            separator)
-                                    nil t)
-            (replace-match "_" nil nil nil 1)
-            (goto-char (match-beginning 1))))
+	(unless (string= glasses-separator glasses-original-separator)
+	  (goto-char (point-min))
+	  (while (re-search-forward (format "[a-zA-Z0-9]\\(%s+\\)[a-zA-Z0-9]"
+					    separator)
+				    nil t)
+	    (replace-match glasses-original-separator nil nil nil 1)
+	    (goto-char (match-beginning 1))))
 	(when glasses-separate-parentheses-p
 	  (goto-char (point-min))
 	  (while (re-search-forward "[a-zA-Z]_*\\( \\)\(" nil t)
--- a/lisp/progmodes/grep.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/grep.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; grep.el --- run Grep as inferior of Emacs, parse match messages
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2001, 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
--- a/lisp/progmodes/gud.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/gud.el	Sun Feb 12 00:15:44 2006 +0000
@@ -5,7 +5,7 @@
 ;; Keywords: unix, tools
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003,
-;;  2004, 2005 Free Software Foundation, Inc.
+;;  2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -3231,7 +3231,6 @@
 
 ;;; Customizable settings
 
-;;;###autoload
 (define-minor-mode gud-tooltip-mode
   "Toggle the display of GUD tooltips."
   :global t
--- a/lisp/progmodes/hideif.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/hideif.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; hideif.el --- hides selected code within ifdef
 
-;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004 2005
+;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
--- a/lisp/progmodes/hideshow.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/hideshow.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-;;               2004, 2005  Free Software Foundation, Inc.
+;;               2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Thien-Thi Nguyen <ttn@gnu.org>
 ;;      Dan Nicolaescu <dann@ics.uci.edu>
--- a/lisp/progmodes/icon.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/icon.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; icon.el --- mode for editing Icon code
 
-;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Chris Smith <csmith@convex.com>
--- a/lisp/progmodes/idlw-complete-structtag.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/idlw-complete-structtag.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 ;;; idlw-complete-structtag.el --- Completion of structure tags.
-;; Copyright (c) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
--- a/lisp/progmodes/idlw-help.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/idlw-help.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; idlw-help.el --- HTML Help code for IDLWAVE
 ;; Copyright (c) 2000 Carsten Dominik
 ;; Copyright (c) 2001, 2002 J.D. Smith
-;; Copyright (c) 2003, 2004, 2005, Free Software Foundation
+;; Copyright (c) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 ;;
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/progmodes/idlw-rinfo.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/idlw-rinfo.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; idlw-rinfo.el --- Routine Information for IDLWAVE
 ;; Copyright (c) 1999 Carsten Dominik
-;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;; Free Software Foundation
+;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Author: J.D. Smith <jdsmith@as.arizona.edu>
 ;; Version: 5.7_22
--- a/lisp/progmodes/idlw-shell.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/idlw-shell.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;; idlw-shell.el --- run IDL as an inferior process of Emacs.
-;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;; Free Software Foundation
+;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@astro.uva.nl>
--- a/lisp/progmodes/idlw-toolbar.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/idlw-toolbar.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; idlw-toolbar.el --- a debugging toolbar for IDLWAVE
-;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;; Free Software Foundation
+;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
--- a/lisp/progmodes/idlwave.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/idlwave.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;; idlwave.el --- IDL editing mode for GNU Emacs
-;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;;    Free Software Foundation
+;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;;    Free Software Foundation, Inc.
 
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/progmodes/inf-lisp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/inf-lisp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; inf-lisp.el --- an inferior-lisp mode
 
-;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
--- a/lisp/progmodes/ld-script.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ld-script.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; ld-script.el --- GNU linker script editing mode for Emacs
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO<jet@gyve.org>
 ;; Keywords: languages, faces
--- a/lisp/progmodes/m4-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/m4-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; m4-mode.el --- m4 code editing commands for Emacs
 
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Andrew Csillag <drew_csillag@geocities.com>
--- a/lisp/progmodes/make-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/make-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; make-mode.el --- makefile editing commands for Emacs
 
-;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Thomas Neumann <tom@smart.bo.open.de>
--- a/lisp/progmodes/mantemp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/mantemp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output
 
-;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Tom Houlder <thoulder@icor.fr>
--- a/lisp/progmodes/meta-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/meta-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Ulrik Vieth <vieth@thphy.uni-duesseldorf.de>
--- a/lisp/progmodes/mixal-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/mixal-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; mixal-mode.el --- Major mode for the mix asm language.
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
--- a/lisp/progmodes/octave-hlp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/octave-hlp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; octave-hlp.el --- getting help on Octave symbols using info
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
--- a/lisp/progmodes/octave-inf.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/octave-inf.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; octave-inf.el --- running Octave as an inferior Emacs process
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
--- a/lisp/progmodes/octave-mod.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/octave-mod.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; octave-mod.el --- editing Octave source files under Emacs
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
--- a/lisp/progmodes/pascal.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/pascal.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pascal.el --- major mode for editing pascal source in Emacs
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-;;               2003, 2004, 2005 Free Software Foundation, Inc.
+;;               2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Espen Skoglund <esk@gnu.org>
 ;; Keywords: languages
--- a/lisp/progmodes/perl-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/perl-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; perl-mode.el --- Perl code editing commands for GNU Emacs
 
-;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: William F. Mann
--- a/lisp/progmodes/prolog.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/prolog.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; prolog.el --- major mode for editing and running Prolog under Emacs
 
-;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
--- a/lisp/progmodes/ps-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/ps-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; ps-mode.el --- PostScript mode for GNU Emacs
 
-;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author:     Peter Kleiweg <p.c.j.kleiweg@rug.nl>
--- a/lisp/progmodes/python.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/python.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; python.el --- silly walks for Python
 
-;; Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: FSF
--- a/lisp/progmodes/scheme.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/scheme.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; scheme.el --- Scheme (and DSSSL) editing mode
 
-;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2001, 2002, 2003, 2004, 2005
-;;           Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2001, 2002, 2003, 2004, 2005,
+;;   2006  Free Software Foundation, Inc.
 
 ;; Author: Bill Rozas <jinx@martigny.ai.mit.edu>
 ;; Adapted-by: Dave Love <d.love@dl.ac.uk>
--- a/lisp/progmodes/sh-script.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/sh-script.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; sh-script.el --- shell-script editing commands for Emacs
 
-;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2003, 2004, 2005,
+;;  2006  Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Version: 2.0f
--- a/lisp/progmodes/simula.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/simula.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; simula.el --- SIMULA 87 code editing commands for Emacs
 
-;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no>
--- a/lisp/progmodes/sql.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/sql.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; sql.el --- specialized comint.el for SQL interpreters
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
--- a/lisp/progmodes/vhdl-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/vhdl-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; vhdl-mode.el --- major mode for editing VHDL code
 
-;; Copyright (C) 1992-2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Authors:     Reto Zimmermann <reto@gnu.org>
 ;;              Rodney J. Whitby <software.vhdl-mode@rwhitby.net>
--- a/lisp/progmodes/which-func.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/which-func.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; which-func.el --- print current function in mode line
 
-;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
 ;;           Free Software Foundation, Inc.
 
 ;; Author:   Alex Rezinsky <alexr@msil.sps.mot.com>
--- a/lisp/progmodes/xscheme.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/progmodes/xscheme.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; xscheme.el --- run MIT Scheme under Emacs
 
-;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005, 2006
 ;;  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
--- a/lisp/ps-bdf.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ps-bdf.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; ps-bdf.el --- BDF font file handler for ps-print
 
-;; Copyright (C) 1998, 1999, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2001, 2006 Free Software Foundation, Inc.
 ;; Copyright (C) 1998, 1999, 2001, 2003
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
--- a/lisp/ps-mule.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ps-mule.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ps-mule.el --- provide multi-byte character facility to ps-print
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <vinicius@cpqd.com.br>
 ;;	Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
--- a/lisp/ps-print.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ps-print.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; ps-print.el --- print text from the buffer as PostScript
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
 ;;	Jacques Duthen (was <duthen@cegelec-red.fr>)
--- a/lisp/recentf.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/recentf.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; recentf.el --- setup a menu of recently opened files
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Created: July 19 1999
--- a/lisp/rect.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/rect.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rect.el --- rectangle functions for GNU Emacs
 
 ;; Copyright (C) 1985, 1999, 2000, 2001, 2002, 2003, 2004
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: Didier Verna <didier@xemacs.org>
 ;; Keywords: internal
--- a/lisp/register.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/register.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; register.el --- register commands for Emacs
 
 ;; Copyright (C) 1985, 1993, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/repeat.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/repeat.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; repeat.el --- convenient way to repeat the previous command
 
-;; Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Will Mengarini <seldon@eskimo.com>
 ;; Created: Mo 02 Mar 98
--- a/lisp/replace.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/replace.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; replace.el --- replace commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001,
-;;   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
--- a/lisp/reposition.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/reposition.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; reposition.el --- center a Lisp function or comment on the screen
 
 ;; Copyright (C) 1991, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
 ;; Created: Jan 1991
--- a/lisp/resume.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/resume.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; resume.el --- process command line args from within a suspended Emacs job
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@bucsf.bu.edu>
 ;; Adapted-By: ESR
--- a/lisp/rfn-eshadow.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/rfn-eshadow.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; rfn-eshadow.el --- Highlight `shadowed' part of read-file-name input text
 ;;
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: convenience minibuffer
--- a/lisp/rot13.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/rot13.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; rot13.el --- display a buffer in rot13
 
-;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
--- a/lisp/ruler-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/ruler-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; ruler-mode.el --- display a ruler in the header line
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
--- a/lisp/s-region.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/s-region.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; s-region.el --- set region using shift key
 
 ;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: terminals
--- a/lisp/savehist.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/savehist.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; savehist.el --- Save minibuffer history.
 
-;; Copyright (C) 1997, 2005 Free Software Foundation
+;; Copyright (C) 1997, 2005, 2006 Free Software Foundation
 
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
 ;; Keywords: minibuffer
--- a/lisp/saveplace.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/saveplace.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; saveplace.el --- automatically save place in files
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: FSF
--- a/lisp/sb-image.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/sb-image.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; sb-image --- Image management for speedbar
 
-;;; Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
--- a/lisp/scroll-all.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/scroll-all.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; scroll-all.el --- scroll all buffers together minor mode
 
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Gary D. Foster <Gary.Foster@corp.sun.com>
 ;; Keywords: scroll crisp brief lock
--- a/lisp/scroll-bar.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/scroll-bar.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; scroll-bar.el --- window system-independent scroll bar support
 
 ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: hardware
--- a/lisp/scroll-lock.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/scroll-lock.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; scroll-lock.el --- Scroll lock scrolling.
 
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: FSF
--- a/lisp/select.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/select.el	Sun Feb 12 00:15:44 2006 +0000
@@ -4,7 +4,7 @@
 ;; Keywords: internal
 
 ;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;; Based partially on earlier release by Lucid.
 
 ;; This file is part of GNU Emacs.
--- a/lisp/server.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/server.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process
 
 ;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
 ;; Maintainer: FSF
--- a/lisp/shadowfile.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/shadowfile.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; shadowfile.el --- automatic file copying
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: comm files
--- a/lisp/shell.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/shell.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; shell.el --- specialized comint.el for running the shell
 
 ;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000,
-;;   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;	Simon Marshall <simon@gnu.org>
--- a/lisp/skeleton.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/skeleton.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; skeleton.el --- Lisp language extension for writing statement skeletons
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Maintainer: FSF
--- a/lisp/smerge-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/smerge-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: tools revision-control merge diff3 cvs conflict
--- a/lisp/sort.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/sort.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; sort.el --- commands to sort text in an Emacs buffer
 
 ;; Copyright (C) 1986, 1987, 1994, 1995, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Howie Kaye
 ;; Maintainer: FSF
--- a/lisp/soundex.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/soundex.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; soundex.el --- implement Soundex algorithm
 
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Christian Plaunt <chris@bliss.berkeley.edu>
 ;; Maintainer: FSF
--- a/lisp/speedbar.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/speedbar.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; speedbar --- quick access to files and tags in a frame
 
-;;; Copyright (C) 1996, 97, 98, 99, 00, 01, 02, 03, 04, 05 Free Software Foundation
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
--- a/lisp/strokes.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/strokes.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; strokes.el --- control Emacs through mouse strokes
 
 ;; Copyright (C) 1997, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: David Bakhash <cadet@alum.mit.edu>
 ;; Maintainer: FSF
--- a/lisp/subr.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/subr.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; subr.el --- basic lisp subroutines for Emacs
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -561,7 +561,7 @@
 Alternatively, if optional fourth argument OLDMAP is specified, we redefine
 in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP.
 
-For most uses, it is simpler and safer to use command remappping like this:
+For most uses, it is simpler and safer to use command remapping like this:
   \(define-key KEYMAP [remap OLDDEF] NEWDEF)"
   ;; Don't document PREFIX in the doc string because we don't want to
   ;; advertise it.  It's meant for recursive calls only.  Here's its
@@ -607,8 +607,7 @@
 	    (nconc (nreverse skipped) newdef)))
       ;; Look past a symbol that names a keymap.
       (setq inner-def
-	    (and defn
-		 (condition-case nil (indirect-function defn) (error defn))))
+	    (or (indirect-function defn t) defn))
       ;; For nested keymaps, we use `inner-def' rather than `defn' so as to
       ;; avoid autoloading a keymap.  This is mostly done to preserve the
       ;; original non-autoloading behavior of pre-map-keymap times.
--- a/lisp/tabify.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/tabify.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tabify.el --- tab conversion commands for Emacs
 
 ;; Copyright (C) 1985, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
--- a/lisp/talk.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/talk.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; talk.el --- allow several users to talk to each other through Emacs
 
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: comm, frames
--- a/lisp/tar-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/tar-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tar-mode.el --- simple editing of tar files from GNU emacs
 
 ;; Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;; Maintainer: FSF
--- a/lisp/tempo.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/tempo.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tempo.el --- Flexible template insertion
 
 ;; Copyright (C) 1994, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: David K}gedal <davidk@lysator.liu.se>
 ;; Created: 16 Feb 1994
--- a/lisp/term/AT386.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/AT386.el	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,8 @@
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Keywords: terminals
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/term/internal.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/internal.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; internal.el --- support for PC internal terminal -*- coding: raw-text; no-byte-compile: t -*-
 
 ;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 
--- a/lisp/term/iris-ansi.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/iris-ansi.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Dan Nicolaescu <dann@ics.uci.edu>
 
--- a/lisp/term/mac-win.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/mac-win.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Andrew Choi <akochoi@mac.com>
 ;; Keywords: terminals
@@ -1918,9 +1918,9 @@
 ;; characters decoded from mac-roman encoding (ascii, latin-iso8859-1,
 ;; and mule-unicode-xxxx-yyyy) are displayed by a mac-roman font.
 (create-fontset-from-fontset-spec
- "-etl-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-mac,
+ "-etl-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-standard,
 ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
-(fontset-add-mac-fonts "fontset-mac" t)
+(fontset-add-mac-fonts "fontset-standard" t)
 
 ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
 (create-fontset-from-x-resource)
--- a/lisp/term/news.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/news.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
--- a/lisp/term/pc-win.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/pc-win.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; pc-win.el --- setup support for `PC windows' (whatever that is)
 
 ;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Maintainer: FSF
--- a/lisp/term/rxvt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/rxvt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; rxvt.el --- define function key sequences and standard colors for rxvt
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Keywords: terminals
--- a/lisp/term/sun-mouse.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/sun-mouse.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; sun-mouse.el --- mouse handling for Sun windows
 
-;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck
 ;; Maintainer: FSF
--- a/lisp/term/sun.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/sun.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; sun.el --- keybinding for standard default sunterm keys
 
 ;; Copyright (C) 1987, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Keywords: terminals
--- a/lisp/term/sup-mouse.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/sup-mouse.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; sup-mouse.el --- supdup mouse support for lisp machines
 
 ;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Wolfgang Rupprecht
 ;; Maintainer: FSF
--- a/lisp/term/tty-colors.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/tty-colors.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tty-colors.el --- color support for character terminals
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: FSF
--- a/lisp/term/tvi970.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/tvi970.el	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,8 @@
 ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992
 ;; Keywords: terminals
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
--- a/lisp/term/vt100.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/vt100.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vt100.el --- define VT100 function key sequences in function-key-map
 
 ;; Copyright (C) 1989, 1993, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
--- a/lisp/term/wyse50.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/wyse50.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1989, 1993, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
 ;;	Jim Blandy <jimb@occs.cs.oberlin.edu>
--- a/lisp/term/x-win.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/x-win.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; x-win.el --- parse relevant switches and set up for X  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals, i18n
--- a/lisp/term/xterm.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/term/xterm.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; xterm.el --- define function key sequences and standard colors for xterm
 
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
--- a/lisp/terminal.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/terminal.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; terminal.el --- terminal emulator for GNU Emacs
 
 ;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Maintainer: FSF
--- a/lisp/textmodes/artist.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/artist.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; artist.el --- draw ascii graphics with your mouse
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:       Tomas Abrahamsson <tab@lysator.liu.se>
 ;; Maintainer:   Tomas Abrahamsson <tab@lysator.liu.se>
--- a/lisp/textmodes/bib-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/bib-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; bib-mode.el --- major mode for editing bib files
 
-;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: bib
--- a/lisp/textmodes/bibtex.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/bibtex.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; bibtex.el --- BibTeX mode for GNU Emacs
 
 ;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
 ;;      Bengt Martensson <bengt@mathematik.uni-Bremen.de>
--- a/lisp/textmodes/conf-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/conf-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: conf ini windows java
--- a/lisp/textmodes/dns-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/dns-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files
 
-;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: DNS master zone file SOA
--- a/lisp/textmodes/enriched.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/enriched.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; enriched.el --- read and save files in text/enriched format
 
 ;; Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: wp, faces
--- a/lisp/textmodes/fill.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/fill.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; fill.el --- fill commands for Emacs		-*- coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1999, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
--- a/lisp/textmodes/makeinfo.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/makeinfo.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; makeinfo.el --- run makeinfo conveniently
 
 ;; Copyright (C) 1991, 1993, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Maintainer: FSF
--- a/lisp/textmodes/nroff-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/nroff-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -42,8 +42,9 @@
   :group 'wp
   :prefix "nroff-")
 
+
 (defcustom nroff-electric-mode nil
-  "*Non-nil means automatically closing requests when you insert an open."
+  "Non-nil means automatically closing requests when you insert an open."
   :group 'nroff
   :type 'boolean)
 
@@ -51,10 +52,10 @@
   (let ((map (make-sparse-keymap)))
     (define-key map "\t"  'tab-to-tab-stop)
     (define-key map "\es" 'center-line)
-    (define-key map "\e?" 'count-text-lines)
-    (define-key map "\n"  'electric-nroff-newline)
-    (define-key map "\en" 'forward-text-line)
-    (define-key map "\ep" 'backward-text-line)
+    (define-key map "\e?" 'nroff-count-text-lines)
+    (define-key map "\n"  'nroff-electric-newline)
+    (define-key map "\en" 'nroff-forward-text-line)
+    (define-key map "\ep" 'nroff-backward-text-line)
     map)
   "Major mode keymap for `nroff-mode'.")
 
@@ -66,7 +67,7 @@
     (modify-syntax-entry ?\" "\"  2" st)
     ;; Comments are delimited by \" and newline.
     (modify-syntax-entry ?\\ "\\  1" st)
-    (modify-syntax-entry ?\n ">  1" st)
+    (modify-syntax-entry ?\n ">" st)
     st)
   "Syntax table used while in `nroff-mode'.")
 
@@ -116,7 +117,6 @@
        ;; near the end of large buffers due to searching to buffer's
        ;; beginning.
        '(nroff-font-lock-keywords nil t nil backward-paragraph))
-  (set (make-local-variable 'nroff-electric-mode) nil)
   (set (make-local-variable 'outline-regexp) "\\.H[ ]+[1-7]+ ")
   (set (make-local-variable 'outline-level) 'nroff-outline-level)
   ;; now define a bunch of variables for use by commands in this mode
@@ -138,8 +138,8 @@
     (skip-chars-forward ".H ")
     (string-to-number (buffer-substring (point) (+ 1 (point))))))
 
-;;; Compute how much to indent a comment in nroff/troff source.
-;;; By mit-erl!gildea April 86
+;; Compute how much to indent a comment in nroff/troff source.
+;; By mit-erl!gildea April 86
 (defun nroff-comment-indent ()
   "Compute indent for an nroff/troff comment.
 Puts a full-stop before comments on a line by themselves."
@@ -161,21 +161,21 @@
 			      9) 8)))))) ; add 9 to ensure at least two blanks
       (goto-char pt))))
 
-(defun count-text-lines (start end &optional print)
+(defun nroff-count-text-lines (start end &optional print)
   "Count lines in region, except for nroff request lines.
 All lines not starting with a period are counted up.
 Interactively, print result in echo area.
 Noninteractively, return number of non-request lines from START to END."
   (interactive "r\np")
   (if print
-      (message "Region has %d text lines" (count-text-lines start end))
+      (message "Region has %d text lines" (nroff-count-text-lines start end))
     (save-excursion
       (save-restriction
 	(narrow-to-region start end)
 	(goto-char (point-min))
 	(- (buffer-size) (forward-text-line (buffer-size)))))))
 
-(defun forward-text-line (&optional cnt)
+(defun nroff-forward-text-line (&optional cnt)
   "Go forward one nroff text line, skipping lines of nroff requests.
 An argument is a repeat count; if negative, move backward."
   (interactive "p")
@@ -193,11 +193,11 @@
     (setq cnt (+ cnt 1)))
   cnt)
 
-(defun backward-text-line (&optional cnt)
+(defun nroff-backward-text-line (&optional cnt)
   "Go backward one nroff text line, skipping lines of nroff requests.
 An argument is a repeat count; negative means move forward."
   (interactive "p")
-  (forward-text-line (- cnt)))
+  (nroff-forward-text-line (- cnt)))
 
 (defconst nroff-brace-table
   '((".(b" . ".)b")
@@ -235,7 +235,7 @@
     (".nf" . ".fi")
     (".de" . "..")))
 
-(defun electric-nroff-newline (arg)
+(defun nroff-electric-newline (arg)
   "Insert newline for nroff mode; special if electric-nroff mode.
 In `electric-nroff-mode', if ending a line containing an nroff opening request,
 automatically inserts the matching closing request after point."
@@ -256,23 +256,23 @@
 	(if needs-nl (insert "\n")))
       (forward-char 1))))
 
-(defun electric-nroff-mode (&optional arg)
+(define-minor-mode nroff-electric-mode
   "Toggle `nroff-electric-newline' minor mode.
 `nroff-electric-newline' forces Emacs to check for an nroff request at the
 beginning of the line, and insert the matching closing request if necessary.
 This command toggles that mode (off->on, on->off), with an argument,
 turns it on iff arg is positive, otherwise off."
-  (interactive "P")
-  (or (eq major-mode 'nroff-mode) (error "Must be in nroff mode"))
-  (or (assq 'nroff-electric-mode minor-mode-alist)
-      (setq minor-mode-alist (append minor-mode-alist
-				     (list '(nroff-electric-mode
-					     " Electric")))))
-  (setq nroff-electric-mode
-	(cond ((null arg) (null nroff-electric-mode))
-	      (t (> (prefix-numeric-value arg) 0)))))
+  :lighter " Electric"
+  (or (derived-mode-p 'nroff-mode) (error "Must be in nroff mode")))
+
+;; Old names that were not namespace clean.
+(define-obsolete-function-alias 'count-text-lines 'nroff-count-text-lines "22.1")
+(define-obsolete-function-alias 'forward-text-line 'nroff-forward-text-line "22.1")
+(define-obsolete-function-alias 'backward-text-line 'nroff-backward-text-line "22.1")
+(define-obsolete-function-alias 'electric-nroff-newline 'nroff-electric-newline "22.1")
+(define-obsolete-function-alias 'electric-nroff-mode 'nroff-electric-mode "22.1")
 
 (provide 'nroff-mode)
 
-;;; arch-tag: 6e276340-6c65-4f65-b4e3-0ca431ddfb6c
+;; arch-tag: 6e276340-6c65-4f65-b4e3-0ca431ddfb6c
 ;;; nroff-mode.el ends here
--- a/lisp/textmodes/org.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/org.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; org.el --- Outline-based notes management and organize
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (c) 2004, 2005, 2006 Free Software Foundation
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
--- a/lisp/textmodes/page-ext.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/page-ext.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; page-ext.el --- extended page handling commands
 
 ;; Copyright (C) 1990, 1991, 1993, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: Robert J. Chassell <bob@gnu.org>
 ;; Keywords: wp data
--- a/lisp/textmodes/page.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/page.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; page.el --- page motion commands for Emacs
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp convenience
--- a/lisp/textmodes/paragraphs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/paragraphs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; paragraphs.el --- paragraph and sentence parsing
 
 ;; Copyright (C) 1985, 1986, 1987, 1991, 1994, 1995, 1996, 1997, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
--- a/lisp/textmodes/picture.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/picture.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model
 
 ;; Copyright (C) 1985, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
--- a/lisp/textmodes/po.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/po.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; po.el --- basic support of PO translation files -*- coding: latin-1; -*-
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Authors: François Pinard <pinard@iro.umontreal.ca>,
 ;;          Greg McGary <gkm@magilla.cichlid.com>,
--- a/lisp/textmodes/refbib.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/refbib.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; refbib.el --- convert refer-style references to ones usable by Latex bib
 
-;; Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Henry Kautz <kautz@research.att.com>
 ;; Maintainer: FSF
--- a/lisp/textmodes/refer.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/refer.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; refer.el --- look up references in bibliography files
 
 ;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ashwin Ram <ashwin@cc.gatech.edu>
 ;; Maintainer: Gernot Heiser <gernot@acm.org>
--- a/lisp/textmodes/refill.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/refill.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; refill.el --- `auto-fill' by refilling paragraphs on changes
 
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: Miles Bader <miles@gnu.org>
--- a/lisp/textmodes/reftex-auc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-auc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-auc.el --- RefTeX's interface to AUCTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
@@ -75,7 +75,7 @@
 
 
 (defun reftex-arg-index-tag (optional &optional prompt &rest args)
-  "Prompt for an index tag with completion. 
+  "Prompt for an index tag with completion.
 This is the name of an index, not the entry."
   (let (tag taglist)
     (setq prompt (concat (if optional "(Optional) " "")
@@ -85,8 +85,8 @@
         ;; Use RefTeX completion
         (progn
           (reftex-access-scan-info nil)
-          (setq taglist 
-                (cdr (assoc 'index-tags 
+          (setq taglist
+                (cdr (assoc 'index-tags
                             (symbol-value reftex-docstruct-symbol)))
                 tag (completing-read prompt (mapcar 'list taglist))))
       ;; Just ask like AUCTeX does.
@@ -131,7 +131,7 @@
   ;; Replace AUCTeX functions with RefTeX functions.
   ;; Which functions are replaced is controlled by the variable
   ;; `reftex-plug-into-AUCTeX'.
-  
+
   (if (reftex-plug-flag 0)
       (setq LaTeX-label-function 'reftex-label)
     (setq LaTeX-label-function nil))
@@ -143,11 +143,11 @@
   (and (reftex-plug-flag 3)
        (fboundp 'TeX-arg-cite)
        (fset 'TeX-arg-cite 'reftex-arg-cite))
-  
-  (and (reftex-plug-flag 4) 
+
+  (and (reftex-plug-flag 4)
        (fboundp 'TeX-arg-index-tag)
        (fset 'TeX-arg-index-tag 'reftex-arg-index-tag))
-  (and (reftex-plug-flag 4) 
+  (and (reftex-plug-flag 4)
        (fboundp 'TeX-arg-index)
        (fset 'TeX-arg-index 'reftex-arg-index)))
 
--- a/lisp/textmodes/reftex-cite.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-cite.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-cite.el --- creating citations with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/reftex-dcr.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-dcr.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/reftex-global.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-global.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-global.el --- operations on entire documents with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/reftex-index.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-index.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-index.el --- index support with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/reftex-parse.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-parse.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-parse.el --- parser functions for RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/reftex-ref.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-ref.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-ref.el --- code to create labels and references with RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/reftex-sel.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-sel.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-sel.el --- the selection modes for RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2440, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2440, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/reftex-toc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-toc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-toc.el --- RefTeX's table of contents mode
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/reftex-vars.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex-vars.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex-vars.el --- configuration variables for RefTeX
-;; Copyright (c) 1997, 1998, 1999, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/reftex.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/reftex.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX
-;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: VERSIONTAG
--- a/lisp/textmodes/sgml-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/sgml-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; sgml-mode.el --- SGML- and HTML-editing modes -*- coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 1992, 1995, 1996, 1998, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: James Clark <jjc@jclark.com>
 ;; Maintainer: FSF
--- a/lisp/textmodes/spell.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/spell.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; spell.el --- spelling correction interface for Emacs
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp, unix
--- a/lisp/textmodes/tex-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/tex-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: tex
--- a/lisp/textmodes/texinfmt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/texinfmt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993,
 ;;   1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: Robert J. Chassell <bug-texinfo@gnu.org>
 ;; Keywords: maint, tex, docs
--- a/lisp/textmodes/texinfo.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/texinfo.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; texinfo.el --- major mode for editing Texinfo files -*- coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997,
-;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Date:   [See date below for texinfo-version]
--- a/lisp/textmodes/texnfo-upd.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/texnfo-upd.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files
 
 ;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Maintainer: bug-texinfo@gnu.org
--- a/lisp/textmodes/text-mode.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/text-mode.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; text-mode.el --- text mode, and its idiosyncratic commands
 
 ;; Copyright (C) 1985, 1992, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
--- a/lisp/textmodes/tildify.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/tildify.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tildify.el --- adding hard spaces into texts
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:     Milan Zamazal <pdm@zamazal.org>
 ;; Version:    4.5
--- a/lisp/textmodes/two-column.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/two-column.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; two-column.el --- minor mode for editing of two-column text
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Adapted-By: ESR, Daniel Pfeiffer
--- a/lisp/textmodes/underline.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/textmodes/underline.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
--- a/lisp/thingatpt.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/thingatpt.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; thingatpt.el --- get the `thing' at point
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000
-;;   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Mike Williams <mikew@gopher.dosli.govt.nz>
 ;; Maintainer: FSF
--- a/lisp/thumbs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/thumbs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; thumbs.el --- Thumbnails previewer for images files
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
 ;; Maintainer: FSF
--- a/lisp/time-stamp.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/time-stamp.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,11 +1,11 @@
 ;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs
 
 ;; Copyright (C) 1989, 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
-;; Maintainer's Time-stamp: <2004-09-25 20:55:35 gildea>
+;; Maintainer's Time-stamp: <2006-02-06 15:11:58 ttn>
 ;; Maintainer: Stephen Gildea <gildea@stop.mail-abuse.org>
 ;; Keywords: tools
 
--- a/lisp/time.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/time.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
--- a/lisp/timezone.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/timezone.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; timezone.el --- time zone package for GNU Emacs
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Masanobu Umeda
 ;; Maintainer: umerin@mse.kyutech.ac.jp
--- a/lisp/tmm.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/tmm.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tmm.el --- text mode access to menu-bar
 
 ;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu>
 ;; Maintainer: FSF
--- a/lisp/tool-bar.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/tool-bar.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tool-bar.el --- setting up the tool bar
 ;;
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: mouse frames
--- a/lisp/tooltip.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/tooltip.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; tooltip.el --- show tooltip windows
 
 ;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@acm.org>
 ;; Keywords: help c mouse tools
--- a/lisp/tree-widget.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/tree-widget.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; tree-widget.el --- Tree widget
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
--- a/lisp/tumme.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/tumme.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,8 +1,8 @@
 ;;; tumme.el --- use dired to browse and manipulate your images
 ;;
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 ;;
-;; Version: 0.4.10
+;; Version: 0.4.11
 ;; Keywords: multimedia
 ;; Author: Mathias Dahl <mathias.rem0veth1s.dahl@gmail.com>
 
@@ -57,8 +57,8 @@
 ;;
 ;;  `tumme' stores the thumbnail files in `tumme-dir' using the file
 ;; name format ORIGNAME.thumb.ORIGEXT.  For example
-;; ~/.tumme/myimage01.thumb.jpg.  The "database" is for now just a
-;; plain text file with the following format:
+;; ~/.emacs.d/tumme/myimage01.thumb.jpg.  The "database" is for now
+;; just a plain text file with the following format:
 ;;
 ;; file-name-non-directory;comment:comment-text;tag1;tag2;tag3;...;tagN
 ;;
@@ -128,11 +128,6 @@
 ;; LIMITATIONS
 ;; ===========
 ;;
-;; * In order to work well, `tumme' require that all your images have
-;; unique names.  The reason is the way thumbnail file names are
-;; generated.  I will probably not fix this problem as my images all
-;; have unique names.
-;;
 ;; * Supports all image formats that Emacs and convert supports, but
 ;; the thumbnails are hard-coded to JPEG format.
 ;;
@@ -489,10 +484,41 @@
 ;; * To be included in Emacs 22.
 ;;
 ;;
+;; Version 0.4.11, 2006-MM-DD
+;;
+;; * Changed `tumme-display-thumbs' so that it calls `display-buffer'
+;; after generating the thumbnails and changed
+;; `tumme-display-thumbnail-original-image' to display the image
+;; buffer. These small changes should make it easier for a user to
+;; start using tumme.
+;;
+;; * Added `tumme-show-all-from-dir' to mimic thumbs.el's easy-to-use
+;; `thumbs' command. A new customize option,
+;; `tumme-show-all-from-dir-max-files' was added too.
+;;
+;; * Renamed `tumme-dired' to `tumme-dired-with-window-configuration'
+;; and added code to save the window configuration before messing it
+;; up. The saved window configuration can be restored using the new
+;; command `tumme-restore-window-configuration'.
+;;
+;; * Added `tumme-get-thumbnail-image', created by Chong Yidong. His
+;; own comments: ..., that just takes the original filename and
+;; returns a thumbnail image descriptor.  Then third-party libraries
+;; won't have to muck around with tumme.el's internal functions like
+;; `thumme-thumb-name', `tumme-create-thumb', etc. His code to get
+;; speedbar display tumme thumbnails, might be integrated soon.
+;;
+;; * Changed the default value of `tumme-dir' to "~/.emacs.d/tumme"
+;; and added a new function, `tumme-dir' to handle the creating of
+;; it. Code copied from thumbs.el.
+;;
 ;;
 ;; TODO
 ;; ====
 ;;
+;; * Look into supporting the Thumbnail Managing Standard, maybe as a
+;; configurable option.
+;;
 ;; * Support gallery creation when using per-directory thumbnail
 ;; storage.
 ;;
@@ -506,10 +532,16 @@
 ;; files.
 ;;
 ;; * From thumbs.el: Add an option for clean-up/max-size functionality
-;; for thumbnail directory.
+;;   for thumbnail directory.
 ;;
 ;; * From thumbs.el: Add setroot function.
 ;;
+;; * From thumbs.el: Add image resizing, if useful (tumme's automatic
+;;  "image fit" might be enough)
+;;
+;; * From thumbs.el: Add the "modify" commands (emboss, negate,
+;;   monochrome etc).
+;;
 ;; * Asynchronous creation of thumbnails.
 ;;
 ;; * Add `tumme-display-thumbs-ring' and functions to cycle that.  Find
@@ -524,7 +556,8 @@
 ;; `dired-next-line' and `dired-previous-line' figure out if tumme is
 ;; enabled in the current buffer and, if it is, call
 ;; `tumme-dired-next-line' and `tumme-dired-previous-line',
-;; respectively.
+;; respectively. Update: This is partly done; some bindings have now
+;; been added to dired.
 ;;
 ;; * Enhanced gallery creation with basic CSS-support and pagination
 ;; of tag pages with many pictures.
@@ -548,8 +581,8 @@
   :prefix "tumme-"
   :group 'files)
 
-(defcustom tumme-dir "~/.tumme/"
-  "*Directory where thumbnail images for are stored."
+(defcustom tumme-dir "~/.emacs.d/tumme/"
+  "*Directory where thumbnail images are stored."
   :type 'string
   :group 'tumme)
 
@@ -565,17 +598,17 @@
                  (const :tag "Per-directory" per-directory))
   :group 'tumme)
 
-(defcustom tumme-db-file "~/.tumme/.tumme_db"
+(defcustom tumme-db-file "~/.emacs.d/tumme/.tumme_db"
   "*Database file where file names and their associated tags are stored."
   :type 'string
   :group 'tumme)
 
-(defcustom tumme-temp-image-file "~/.tumme/.tumme_temp"
+(defcustom tumme-temp-image-file "~/.emacs.d/tumme/.tumme_temp"
   "*Name of temporary image file used by various commands."
   :type 'string
   :group 'tumme)
 
-(defcustom tumme-gallery-dir "~/.tumme/.tumme_gallery"
+(defcustom tumme-gallery-dir "~/.emacs.d/tumme/.tumme_gallery"
   "*Directory to store generated gallery html pages.
 This path needs to be \"shared\" to the public so that it can access
 the index.html page that tumme creates."
@@ -667,12 +700,12 @@
 number of (positive) degrees to rotate the image, normally 90 or
 270 \(for 90 degrees right and left), %o which is replaced by the
 original image file name and %t which is replaced by
-`tumme-temp-image-file'"
+`tumme-temp-image-file'."
   :type 'string
   :group 'tumme)
 
 (defcustom tumme-temp-rotate-image-file
-  "~/.tumme/.tumme_rotate_temp"
+  "~/.emacs.d/tumme/.tumme_rotate_temp"
   "*Temporary file for rotate operations."
   :type 'string
   :group 'tumme)
@@ -760,7 +793,7 @@
   :group 'tumme)
 
 (defcustom tumme-display-window-width-correction 1
-  "*Number to be used to correct image display window height.
+  "*Number to be used to correct image display window width.
 Change if the default (1) does not work (i.e. if the image does not
 completely fit)."
   :type 'integer
@@ -768,7 +801,7 @@
 
 (defcustom tumme-display-window-height-correction 0
   "*Number to be used to correct image display window height.
-Use if the default (0) does not work (i.e. if the image does not
+Change if the default (0) does not work (i.e. if the image does not
 completely fit)."
   :type 'integer
   :group 'tumme)
@@ -801,7 +834,7 @@
   :group 'tumme)
 
 (defcustom tumme-display-properties-format "%b: %f (%t): %c"
-  "* Display format for thumbnail properties.
+  "*Display format for thumbnail properties.
 %b is replaced with associated dired buffer name, %f with file name
 \(without path) of original image file, %t with the list of tags and %c
 with the comment."
@@ -821,6 +854,22 @@
   :type 'string
   :group 'tumme)
 
+(defcustom tumme-show-all-from-dir-max-files 50
+  "*Maximum number of files to show using`tumme-show-all-from-dir'.
+before warning the user."
+  :type 'integer
+  :group 'tumme)
+
+(defun tumme-dir ()
+  "Return the current thumbnails directory (from `tumme-dir').
+Create the thumbnails directory if it does not exist."
+  (let ((tumme-dir (file-name-as-directory
+                    (expand-file-name tumme-dir))))
+    (unless (file-directory-p tumme-dir)
+      (make-directory tumme-dir t)
+      (message "Creating thumbnails directory"))
+    tumme-dir))
+
 (defun tumme-insert-image (file type relief margin)
   "Insert image FILE of image TYPE, using RELIEF and MARGIN, at point."
 
@@ -830,6 +879,18 @@
                    :margin ,margin)))
     (insert-image i)))
 
+(defun tumme-get-thumbnail-image (file)
+  "Return the image descriptor for a thumbnail of image file FILE."
+  (unless (string-match (image-file-name-regexp) file)
+    (error "%s is not a valid image file" file))
+  (let ((thumb-file (tumme-thumb-name file)))
+    (unless (and (file-exists-p thumb-file)
+		 (<= (float-time (nth 5 (file-attributes file)))
+		     (float-time (nth 5 (file-attributes thumb-file)))))
+      (tumme-create-thumb file thumb-file))
+    (list 'image :type 'jpeg :file thumb-file
+	  :relief tumme-thumb-relief :margin tumme-thumb-margin)))
+
 (defun tumme-insert-thumbnail (file original-file-name
                                     associated-dired-buffer)
   "Insert thumbnail image FILE.
@@ -867,7 +928,7 @@
                    ;; be used here.
                    (setq md5-hash (md5 (file-name-as-directory
                                         (file-name-directory file))))
-                   (file-name-as-directory (expand-file-name tumme-dir)))
+                   (file-name-as-directory (expand-file-name (tumme-dir))))
                   ((eq 'per-directory tumme-thumbnail-storage)
                    (format "%s.tumme/"
                            (file-name-directory f))))
@@ -969,8 +1030,11 @@
           (tumme-display-image-mode)))
     buf))
 
+(defvar tumme-saved-window-configuration nil
+  "Saved window configuration.")
+
 ;;;###autoload
-(defun tumme-dired (dir &optional arg)
+(defun tumme-dired-with-window-configuration (dir &optional arg)
   "Open directory DIR and create a default window configuration.
 
 Convenience command that:
@@ -979,11 +1043,21 @@
  - Splits windows in most useful (?) way
  - Set `truncate-lines' to t
 
-If called with prefix argument ARG, skip splitting of windows."
+After the command has finished, you would typically mark some
+image files in dired and type
+\\[tumme-display-thumbs] (`tumme-display-thumbs').
+
+If called with prefix argument ARG, skip splitting of windows.
+
+The current window configuration is saved and can be restored by
+calling `tumme-restore-window-configuration'."
   (interactive "DDirectory: \nP")
   (let ((buf (tumme-create-thumbnail-buffer))
         (buf2 (tumme-create-display-image-buffer)))
+    (setq tumme-saved-window-configuration
+          (current-window-configuration))
     (dired dir)
+    (delete-other-windows)
     (when (not arg)
       (split-window-horizontally)
       (setq truncate-lines t)
@@ -995,6 +1069,16 @@
         (switch-to-buffer buf2)
         (other-window -2)))))
 
+(defun tumme-restore-window-configuration ()
+  "Restore window configuration.
+Restore any changes to the window configuration made by calling
+`tumme-dired-with-window-configuration'."
+  (interactive)
+  (if tumme-saved-window-configuration
+      (set-window-configuration tumme-saved-window-configuration)
+    (message "No saved window configuration")))
+
+;;;###autoload
 (defun tumme-display-thumbs (&optional arg append)
   "Display thumbnails of all marked files, in `tumme-thumbnail-buffer'.
 If a thumbnail image does not exist for a file, it is created on the
@@ -1038,7 +1122,31 @@
             ((eq 'none tumme-line-up-method)
              nil)
             (t
-             (tumme-line-up-dynamic))))))
+             (tumme-line-up-dynamic))))
+    (pop-to-buffer tumme-thumbnail-buffer)))
+
+(defun tumme-show-all-from-dir (dir)
+  "Make a preview buffer for all images in DIR and display it.
+If the number of files in DIR matching `image-file-name-regexp'
+exceeds `tumme-show-all-from-dir-max-files', a warning will be
+displayed."
+  (interactive "DDir: ")
+  (dired dir)
+  (dired-mark-files-regexp (image-file-name-regexp))
+  (let ((files (dired-get-marked-files)))
+    (if (or (<= (length files) tumme-show-all-from-dir-max-files)
+            (and (> (length files) tumme-show-all-from-dir-max-files)
+                 (y-or-n-p
+                  (format
+                   "Directory contains more than %d image files.  Proceed? "
+                   tumme-show-all-from-dir-max-files))))
+        (progn
+          (tumme-display-thumbs)
+          (pop-to-buffer tumme-thumbnail-buffer))
+      (message "Cancelled."))))
+
+;;;###autoload
+(defalias 'tumme 'tumme-show-all-from-dir)
 
 (defun tumme-write-tag (files tag)
   "For all FILES, writes TAG to the image database."
@@ -1125,6 +1233,7 @@
       (kill-buffer buf)
       (split-string tags ";"))))
 
+;;;###autoload
 (defun tumme-tag-files (arg)
   "Tag marked file(s) in dired.  With prefix ARG, tag file at point."
   (interactive "P")
@@ -1143,6 +1252,7 @@
   (tumme-update-property
    'tags (tumme-list-tags (tumme-original-file-name))))
 
+;;;###autoload
 (defun tumme-tag-remove (arg)
   "Remove tag for selected file(s).
 With prefix argument ARG, remove tag from file at point."
@@ -1310,7 +1420,7 @@
 (defun tumme-format-properties-string (buf file props comment)
   "Format display properties.
 BUF is the associated dired buffer, FILE is the original image file
-name, PROPS is a list of tags and COMMENT is the images files's
+name, PROPS is a list of tags and COMMENT is the image files's
 comment."
   (format-spec
    tumme-display-properties-format
@@ -1406,6 +1516,7 @@
           (select-window window))
       (message "Associated dired buffer not visible"))))
 
+;;;###autoload
 (defun tumme-jump-thumbnail-buffer ()
   "Jump to thumbnail buffer."
   (interactive)
@@ -1804,11 +1915,13 @@
     (if (looking-at " ")
         (delete-char 1))))
 
+;;;###autoload
 (defun tumme-display-thumbs-append ()
   "Append thumbnails to `tumme-thumbnail-buffer'."
   (interactive)
   (tumme-display-thumbs nil t))
 
+;;;###autoload
 (defun tumme-display-thumb ()
   "Shorthard for `tumme-display-thumbs' with prefix argument."
   (interactive)
@@ -1845,7 +1958,7 @@
 
 (defun tumme-line-up-dynamic ()
   "Line up thumbnails images dynamically.
-Calculate how many thumbnails that fits."
+Calculate how many thumbnails fit."
   (interactive)
   (let* ((char-width (frame-char-width))
         (width (tumme-window-width-pixels (tumme-thumbnail-window)))
@@ -1858,7 +1971,7 @@
 
 (defun tumme-line-up-interactive ()
   "Line up thumbnails interactively.
-Ask user how many thumbnails that should be displayed per row."
+Ask user how many thumbnails should be displayed per row."
   (interactive)
   (let ((tumme-thumbs-per-row
          (string-to-number (read-string "How many thumbs per row: "))))
@@ -1879,6 +1992,7 @@
                                tumme-external-viewer
                                file))))))
 
+;;;###autoload
 (defun tumme-dired-display-external ()
   "Display file at point using an external viewer."
   (interactive)
@@ -1984,8 +2098,10 @@
           (message "No thumbnail at point")
         (if (not file)
             (message "No original file name found")
-          (tumme-display-image file arg))))))
+          (tumme-display-image file arg)
+          (display-buffer tumme-display-image-buffer))))))
 
+;;;###autoload
 (defun tumme-display-dired-image (&optional arg)
   "Display current image file.
 See documentation for `tumme-display-image' for more information.
@@ -2151,21 +2267,17 @@
 
 (defun tumme-copy-with-exif-file-name ()
   "Copy file with unique name to main image directory.
-Copy current or all marked files in dired to a new file in your main
-image directory, using a file name generated by
-`tumme-get-exif-file-name'.  This might or might not be useful for
-other people, but I use it each time I fetch images from my digital
-camera, for copying the images into my main image directory.
+Copy current or all marked files in dired to a new file in your
+main image directory, using a file name generated by
+`tumme-get-exif-file-name'.  A typical usage for this if when
+copying images from a digital camera into the image directory.
 
-Typically I open up the folder where I store my incoming digital
-images, with file names like dscn0319.jpg, dscn0320.jpg etc., mark the
-files I want to copy into my main image directory, and execute this
+ Typically, you would open up the folder with the incoming
+digital images, mark the files to be copied, and execute this
 function.  The result is a couple of new files in
-`tumme-main-image-directory' called 2005_05_08_12_52_00_dscn0319.jpg,
-2005_05_08_14_27_45_dscn0320.jpg etc.
-
-When the images are safely in my main image directory I start to
-browse and tag them using rest of the functionality in `tumme'."
+`tumme-main-image-directory' called
+2005_05_08_12_52_00_dscn0319.jpg,
+2005_05_08_14_27_45_dscn0320.jpg etc."
   (interactive)
   (let (new-name
         (files (dired-get-marked-files)))
@@ -2187,7 +2299,7 @@
   (tumme-display-thumbnail-original-image))
 
 (defun tumme-display-previous-thumbnail-original ()
-  "Move to previous thumbnail and display  image."
+  "Move to previous thumbnail and display image."
 
   (interactive)
   (tumme-backward-char)
@@ -2236,6 +2348,7 @@
      prop
      value)))
 
+;;;###autoload
 (defun tumme-dired-comment-files ()
   "Add comment to current or marked files in dired."
   (interactive)
@@ -2256,8 +2369,9 @@
   (tumme-display-thumb-properties))
 
 (defun tumme-read-comment (&optional file)
-  "Read comment, optionally using old comment from FILE as initial value."
-
+  "Read comment for an image.
+Read comment for an image, optionally using old comment from FILE
+as initial value."
   (let ((comment
          (read-string
           "Comment: "
@@ -2286,8 +2400,14 @@
       (kill-buffer buf)
       comment)))
 
+;;;###autoload
 (defun tumme-mark-tagged-files ()
-  "Use regexp to mark files with matching tag."
+  "Use regexp to mark files with matching tag.
+A `tag' is a keyword, a piece of meta data, associated with an
+image file and stored in tumme's database file.  This command
+lets you input a regexp and this will be matched against all tags
+on all image files in the database file.  The files that have a
+matching tags will be marked in the dired buffer."
   (interactive)
   (let ((tag (read-string "Mark tagged files (regexp): "))
         (hits 0)
@@ -2506,7 +2626,7 @@
     ;; Make sure gallery root exist
     (if (file-exists-p tumme-gallery-dir)
         (if (not (file-directory-p tumme-gallery-dir))
-            (error "Tumme-gallery-dir is not a directory"))
+            (error "Variable tumme-gallery-dir is not a directory"))
       (make-directory tumme-gallery-dir))
     ;; Open index file
     (setq index-buf (find-file
@@ -2555,7 +2675,7 @@
               ;; Insert thumbnail with link to full image
               (insert
                (format "<a href=\"%s/%s\"><img src=\"%s/%s\"%s></a>\n"
-                       tumme-gallery-image-root-url file
+                       tumme-gallery-image-root-url (file-name-nondirectory file)
                        tumme-gallery-thumb-image-root-url
                        (file-name-nondirectory (tumme-thumb-name file)) file))
               ;; Insert comment, if any
@@ -2597,38 +2717,53 @@
       (error nil))
     (kill-buffer buffer)))
 
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;; TEST-SECTION ;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-
-(defvar tumme-dir-max-size 12300000)
+;; (defvar tumme-dir-max-size 12300000)
 
-(defun tumme-test ()
-  "Clean `tumme-dir' from old thumbnail files.
-\"Oldness\" measured using last access time.  If the total size of all
-thumbnail files in `tumme-dir' is larger than 'tumme-dir-max-size',
-old files are deleted until the max size is reached."
-  (let* ((files
-          (sort
-           (mapcar
-            (lambda (f)
-              (let ((fattribs (file-attributes f)))
-                ;; Get last access time and file size
-                `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f)))
-            (directory-files tumme-dir t ".+\.thumb\..+$"))
-           ;; Sort function. Compare time between two files.
-           '(lambda (l1 l2)
-              (time-less-p (car l1) (car l2)))))
-         (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files))))
-    (while (> dirsize tumme-dir-max-size)
-      (y-or-n-p
-       (format "Size of thumbnail directory: %d, delete old file %s? "
-               dirsize (cadr (cdar files))))
-      (delete-file (cadr (cdar files)))
-      (setq dirsize (- dirsize (car (cdar files))))
-      (setq files (cdr files)))))
+;; (defun tumme-test-clean-old-files ()
+;;   "Clean `tumme-dir' from old thumbnail files.
+;; \"Oldness\" measured using last access time.  If the total size of all
+;; thumbnail files in `tumme-dir' is larger than 'tumme-dir-max-size',
+;; old files are deleted until the max size is reached."
+;;   (let* ((files
+;;           (sort
+;;            (mapcar
+;;             (lambda (f)
+;;               (let ((fattribs (file-attributes f)))
+;;                 ;; Get last access time and file size
+;;                 `(,(nth 4 fattribs) ,(nth 7 fattribs) ,f)))
+;;             (directory-files (tumme-dir) t ".+\.thumb\..+$"))
+;;            ;; Sort function. Compare time between two files.
+;;            '(lambda (l1 l2)
+;;               (time-less-p (car l1) (car l2)))))
+;;          (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) files))))
+;;     (while (> dirsize tumme-dir-max-size)
+;;       (y-or-n-p
+;;        (format "Size of thumbnail directory: %d, delete old file %s? "
+;;                dirsize (cadr (cdar files))))
+;;       (delete-file (cadr (cdar files)))
+;;       (setq dirsize (- dirsize (car (cdar files))))
+;;       (setq files (cdr files)))))
+
+;;;;;;;;;;;;;;;;;;;;;;,
+
+;; (defun dired-speedbar-buttons (dired-buffer)
+;;   (when (and (boundp 'tumme-use-speedbar)
+;; 	     tumme-use-speedbar)
+;;     (let ((filename (with-current-buffer dired-buffer
+;; 		      (dired-get-filename))))
+;;       (when (and (not (string-equal filename (buffer-string)))
+;; 		 (string-match (image-file-name-regexp) filename))
+;; 	(erase-buffer)
+;; 	(insert (propertize
+;; 		 filename
+;; 		 'display
+;; 		 (tumme-get-thumbnail-image filename)))))))
+
+;; (setq tumme-use-speedbar t)
 
 (provide 'tumme)
 
--- a/lisp/type-break.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/type-break.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; type-break.el --- encourage rests from typing at appropriate intervals
 
 ;; Copyright (C) 1994, 1995, 1997, 2000, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman
 ;; Maintainer: Noah Friedman <friedman@splode.com>
--- a/lisp/uniquify.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/uniquify.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; uniquify.el --- unique buffer names dependent on file name
 
 ;; Copyright (C) 1989, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Dick King <king@reasoning.com>
 ;; Maintainer: FSF
--- a/lisp/userlock.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/userlock.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; userlock.el --- handle file access contention between multiple users
 
 ;; Copyright (C) 1985, 1986, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/vc-arch.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vc-arch.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; vc-arch.el --- VC backend for the Arch version-control system
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
--- a/lisp/vc-cvs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vc-cvs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vc-cvs.el --- non-resident support for CVS version-control
 
 ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Andre Spiegel <spiegel@gnu.org>
--- a/lisp/vc-hooks.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vc-hooks.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vc-hooks.el --- resident support for version-control
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
--- a/lisp/vc-mcvs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vc-mcvs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
--- a/lisp/vc-rcs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vc-rcs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vc-rcs.el --- support for RCS version-control
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
--- a/lisp/vc-sccs.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vc-sccs.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vc-sccs.el --- support for SCCS version-control
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
--- a/lisp/vc-svn.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vc-svn.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; vc-svn.el --- non-resident support for Subversion version-control
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
@@ -114,7 +114,7 @@
 					   (file-name-directory file)))
     (with-temp-buffer
       (cd (file-name-directory file))
-      (let ((status 
+      (let ((status
              (condition-case nil
                  ;; Ignore all errors.
                  (vc-svn-command t t file "status" "-v")
@@ -176,6 +176,23 @@
 	  ((eq svn-state 'needs-patch) "(patch)")
 	  ((eq svn-state 'needs-merge) "(merge)"))))
 
+(defun vc-svn-previous-version (file rev)
+  (let ((newrev (1- (string-to-number rev))))
+    (when (< 0 newrev)
+      (number-to-string newrev))))
+
+(defun vc-svn-next-version (file rev)
+  (let ((newrev (1+ (string-to-number rev))))
+    ;; The "workfile version" is an uneasy conceptual fit under Subversion;
+    ;; we use it as the upper bound until a better idea comes along.  If the
+    ;; workfile version W coincides with the tree's latest revision R, then
+    ;; this check prevents a "no such revision: R+1" error.  Otherwise, it
+    ;; inhibits showing of W+1 through R, which could be considered anywhere
+    ;; from gracious to impolite.
+    (unless (< (string-to-number (vc-file-getprop file 'vc-workfile-version))
+               newrev)
+      (number-to-string newrev))))
+
 
 ;;;
 ;;; State-changing functions
@@ -353,7 +370,11 @@
     (vc-svn-command
      buffer
      (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
-     file "log")))
+     file "log"
+     ;; By default Subversion only shows the log upto the working version,
+     ;; whereas we also want the log of the subsequent commits.  At least
+     ;; that's what the vc-cvs.el code does.
+     "-rHEAD:0")))
 
 (defun vc-svn-diff (file &optional oldvers newvers buffer)
   "Get a difference report using SVN between two versions of FILE."
--- a/lisp/vc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vc.el --- drive a version-control system from within Emacs
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
@@ -2800,9 +2800,6 @@
 	  (vc-mode-line new)
 	  (set-buffer-modified-p nil)))))
 
-;; Only defined in very recent Emacsen
-(defvar small-temporary-file-directory nil)
-
 ;;;###autoload
 (defun vc-update-change-log (&rest args)
   "Find change log file and add entries from recent version control logs.
--- a/lisp/vcursor.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vcursor.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vcursor.el --- manipulate an alternative ("virtual") cursor
 
 ;; Copyright (C) 1994, 1996, 1998, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:   Peter Stephenson <pws@ibmth.df.unipi.it>
 ;; Maintainer: FSF
--- a/lisp/version.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/version.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/view.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/view.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; view.el --- peruse file or buffer without editing
 
 ;; Copyright (C) 1985, 1989, 1994, 1995, 1997, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: Inge Frick <inge@nada.kth.se>
--- a/lisp/vms-patch.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vms-patch.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vms-patch.el --- override parts of files.el for VMS
 
 ;; Copyright (C) 1986, 1992, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: vms
--- a/lisp/vmsproc.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vmsproc.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs
 
-;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Mukesh Prasad
 ;; Maintainer: FSF
--- a/lisp/vt-control.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vt-control.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; vt-control.el --- Common VTxxx control functions
 
 ;; Copyright (C) 1993, 1994, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
--- a/lisp/vt100-led.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/vt100-led.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; vt100-led.el --- functions for LED control on VT-100 terminals & clones
 
-;; Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
--- a/lisp/w32-fns.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/w32-fns.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; w32-fns.el --- Lisp routines for Windows NT
 
 ;; Copyright (C) 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
--- a/lisp/w32-vars.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/w32-vars.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; w32-vars.el --- MS-Windows specific user options
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jason Rumney <jasonr@gnu.org>
 ;; Keywords: internal
--- a/lisp/wdired.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/wdired.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; wdired.el --- Rename files editing their names in dired buffers
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Filename: wdired.el
 ;; Author: Juan León Lahoz García <juanleon1@gmail.com>
@@ -30,10 +30,10 @@
 ;; renaming files.
 ;;
 ;; Have you ever wished to use C-x r t (string-rectangle), M-%
-;; (query-replace), M-c (capitalize-word), etc. to change the name of
+;; (query-replace), M-c (capitalize-word), etc... to change the name of
 ;; the files in a "dired" buffer? Now you can do this.  All the power
 ;; of Emacs commands are available to renaming files!
-;; 
+;;
 ;; This package provides a function that makes the filenames of a a
 ;; dired buffer editable, by changing the buffer mode (which inhibits
 ;; all of the commands of dired mode). Here you can edit the names of
@@ -102,20 +102,17 @@
 ;;; Code:
 
 (defvar dired-backup-overwrite) ; Only in Emacs 20.x this is a custom var
-(eval-when-compile
-  (set (make-local-variable 'byte-compile-dynamic) t))
 
-(eval-and-compile
-  (require 'dired)
-  (autoload 'dired-do-create-files-regexp "dired-aux")
-  (autoload 'dired-call-process "dired-aux"))
+(require 'dired)
+(autoload 'dired-do-create-files-regexp "dired-aux")
+(autoload 'dired-call-process "dired-aux")
 
 (defgroup wdired nil
   "Mode to rename files by editing their names in dired buffers."
   :group 'dired)
 
 (defcustom wdired-use-interactive-rename nil
-  "*If non-nil, WDired requires confirmation before actually renaming files.
+  "If non-nil, WDired requires confirmation before actually renaming files.
 If nil, WDired doesn't require confirmation to change the file names,
 and the variable `wdired-confirm-overwrite' controls whether it is ok
 to overwrite files without asking."
@@ -123,14 +120,14 @@
   :group 'wdired)
 
 (defcustom wdired-confirm-overwrite t
-  "*If nil the renames can overwrite files without asking. 
+  "If nil the renames can overwrite files without asking.
 This variable has no effect at all if `wdired-use-interactive-rename'
 is not nil."
   :type 'boolean
   :group 'wdired)
 
 (defcustom wdired-use-dired-vertical-movement nil
-  "*If t, the \"up\" and \"down\" movement works as in Dired mode.
+  "If t, the \"up\" and \"down\" movement works as in Dired mode.
 That is, always move the point to the beginning of the filename at line.
 
 If `sometimes, only move to the beginning of filename if the point is
@@ -144,14 +141,14 @@
   :group 'wdired)
 
 (defcustom wdired-allow-to-redirect-links t
-  "*If non-nil, the target of the symbolic links are editable.
+  "If non-nil, the target of the symbolic links are editable.
 In systems without symbolic links support, this variable has no effect
 at all."
   :type 'boolean
   :group 'wdired)
 
 (defcustom wdired-allow-to-change-permissions nil
-  "*If non-nil, the permissions bits of the files are editable.
+  "If non-nil, the permissions bits of the files are editable.
 
 If t, to change a single bit, put the cursor over it and press the
 space bar, or left click over it.  You can also hit the letter you want
@@ -197,13 +194,11 @@
 		  :help "Abort changes and return to dired mode"))
     (define-key map [menu-bar wdired wdired-finish-edit]
       '("Commit Changes" . wdired-finish-edit))
-    ;; FIXME: Use the new remap trick.
-    (substitute-key-definition 'upcase-word 'wdired-upcase-word
-			       map global-map)
-    (substitute-key-definition 'capitalize-word 'wdired-capitalize-word
-			       map global-map)
-    (substitute-key-definition 'downcase-word 'wdired-downcase-word
-			       map global-map)
+
+    (define-key map [remap upcase-word] 'wdired-upcase-word)
+    (define-key map [remap capitalize-word] 'wdired-capitalize-word)
+    (define-key map [remap downcase-word] 'wdired-downcase-word)
+
     map))
 
 (defvar wdired-mode-hook nil
@@ -314,21 +309,20 @@
 non-nil means don't include directory.  Optional arg OLD with value
 non-nil means return old filename."
   ;; FIXME: Use dired-get-filename's new properties.
-  (let (beg end file)
-    (save-excursion
-      (setq end (progn (end-of-line) (point)))
-      (beginning-of-line)
-      (setq beg (next-single-property-change (point) 'old-name nil end))
-      (unless (eq beg end)
-	(if old
-	    (setq file (get-text-property beg 'old-name))
-	  (setq end (next-single-property-change (1+ beg) 'end-name))
-	  (setq file (buffer-substring-no-properties (+ 2 beg) end)))
-	(and file (setq file (wdired-normalize-filename file))))
-      (if (or no-dir old)
-	  file
-	(and file (> (length file) 0)
-             (concat (dired-current-directory) file))))))
+  (let* ((end (line-end-position))
+         (beg (next-single-property-change
+               (line-beginning-position) 'old-name nil end)))
+    (unless (eq beg end)
+      (let ((file
+             (if old
+                 (get-text-property beg 'old-name)
+               (wdired-normalize-filename
+                (buffer-substring-no-properties
+                 (+ 2 beg) (next-single-property-change (1+ beg) 'end-name))))))
+        (if (or no-dir old)
+            file
+          (and file (> (length file) 0)
+               (concat (dired-current-directory) file)))))))
 
 
 (defun wdired-change-to-dired-mode ()
@@ -344,7 +338,7 @@
   (setq mode-name "Dired")
   (dired-advertise)
   (remove-hook 'kill-buffer-hook 'wdired-check-kill-buffer t)
-  (setq revert-buffer-function 'dired-revert))
+  (set (make-local-variable 'revert-buffer-function) 'dired-revert))
 
 
 (defun wdired-abort-changes ()
@@ -412,7 +406,7 @@
 	(forward-line -1)))
     (if changes
         (revert-buffer) ;The "revert" is necessary to re-sort the buffer
-      (let ((buffer-read-only nil))
+      (let ((inhibit-read-only t))
 	(remove-text-properties (point-min) (point-max)
 				'(old-name nil end-name nil old-link nil
 					   end-link nil end-perm nil
@@ -425,9 +419,9 @@
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil))
 
-;; Renames a file, searching it in a modified dired buffer, in order
+;; Rename a file, searching it in a modified dired buffer, in order
 ;; to be able to use `dired-do-create-files-regexp' and get its
-;; "benefits"
+;; "benefits".
 (defun wdired-search-and-rename (filename-ori filename-new)
   (save-excursion
     (goto-char (point-max))
@@ -528,21 +522,18 @@
 (defun wdired-get-previous-link (&optional old move)
   "Return the next symlink target.
 If OLD, return the old target.  If MOVE, move point before it."
-  (let (beg end target)
-    (setq beg (previous-single-property-change (point) 'old-link nil))
-    (if beg
-	(progn
-	  (if old
-	      (setq target (get-text-property (1- beg) 'old-link))
-	    (setq end (next-single-property-change beg 'end-link))
-	    (setq target (buffer-substring-no-properties (1+ beg) end)))
-	  (if move (goto-char (1- beg)))))
-    (and target (wdired-normalize-filename target))))
-
-
+  (let ((beg (previous-single-property-change (point) 'old-link nil)))
+    (when beg
+      (let ((target
+             (if old
+                 (get-text-property (1- beg) 'old-link)
+               (buffer-substring-no-properties
+                (1+ beg) (next-single-property-change beg 'end-link)))))
+        (if move (goto-char (1- beg)))
+        (and target (wdired-normalize-filename target))))))
 
 ;; Perform the changes in the target of the changed links.
-(defun wdired-do-symlink-changes()
+(defun wdired-do-symlink-changes ()
   (let ((changes nil)
 	(errors 0)
 	link-to-ori link-to-new link-from)
@@ -550,36 +541,34 @@
     (while (setq link-to-new (wdired-get-previous-link))
       (setq link-to-ori (wdired-get-previous-link t t))
       (setq link-from (wdired-get-filename nil t))
-      (if (not (equal link-to-new link-to-ori))
-          (progn
-            (setq changes t)
-            (if (equal link-to-new "") ;empty filename!
-                (setq link-to-new "/dev/null"))
-	    (condition-case err
-		(progn 
-		  (delete-file link-from)
-		  (make-symbolic-link
-		   (substitute-in-file-name link-to-new) link-from))
-		  (error
-		   (setq errors (1+ errors))
-		   (dired-log (concat "Link `" link-from "' to `"
-				      link-to-new "' failed:\n%s\n")
-			      err))))))
+      (unless (equal link-to-new link-to-ori)
+        (setq changes t)
+        (if (equal link-to-new "") ;empty filename!
+            (setq link-to-new "/dev/null"))
+        (condition-case err
+            (progn
+              (delete-file link-from)
+              (make-symbolic-link
+               (substitute-in-file-name link-to-new) link-from))
+          (error
+           (setq errors (1+ errors))
+           (dired-log (concat "Link `" link-from "' to `"
+                              link-to-new "' failed:\n%s\n")
+                      err)))))
     (cons changes errors)))
 
 ;; Perform a "case command" skipping read-only words.
 (defun wdired-xcase-word (command arg)
   (if (< arg 0)
       (funcall command arg)
-    (progn
-      (while (> arg 0)
-	(condition-case err
-	    (progn
-	      (funcall command 1)
-	      (setq arg (1- arg)))
-	  (error
-	   (if (not (forward-word 1))
-	       (setq arg 0))))))))
+    (while (> arg 0)
+      (condition-case err
+          (progn
+            (funcall command 1)
+            (setq arg (1- arg)))
+        (error
+         (if (not (forward-word 1))
+             (setq arg 0)))))))
 
 (defun wdired-downcase-word (arg)
   "WDired version of `downcase-word'.
@@ -603,25 +592,25 @@
 ;; The following code deals with changing the access bits (or
 ;; permissions) of the files.
 
-(defvar wdired-perm-mode-map nil)
-(unless wdired-perm-mode-map
-  (setq wdired-perm-mode-map (copy-keymap wdired-mode-map))
-  (define-key wdired-perm-mode-map " " 'wdired-toggle-bit)
-  (define-key wdired-perm-mode-map "r" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map "w" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map "x" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map "-" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map "S" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map "s" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map "T" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map "t" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map "s" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map "l" 'wdired-set-bit)
-  (define-key wdired-perm-mode-map [down-mouse-1] 'wdired-mouse-toggle-bit))
+(defvar wdired-perm-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map " " 'wdired-toggle-bit)
+    (define-key map "r" 'wdired-set-bit)
+    (define-key map "w" 'wdired-set-bit)
+    (define-key map "x" 'wdired-set-bit)
+    (define-key map "-" 'wdired-set-bit)
+    (define-key map "S" 'wdired-set-bit)
+    (define-key map "s" 'wdired-set-bit)
+    (define-key map "T" 'wdired-set-bit)
+    (define-key map "t" 'wdired-set-bit)
+    (define-key map "s" 'wdired-set-bit)
+    (define-key map "l" 'wdired-set-bit)
+    (define-key map [down-mouse-1] 'wdired-mouse-toggle-bit)
+    map))
 
 ;; Put a local-map to the permission bits of the files, and store the
 ;; original name and permissions as a property
-(defun wdired-preprocess-perms()
+(defun wdired-preprocess-perms ()
   (let ((inhibit-read-only t)
 	filename)
     (set (make-local-variable 'wdired-col-perm) nil)
@@ -638,7 +627,7 @@
 		  (put-text-property (match-beginning 0) (match-end 0)
 				     'read-only nil)
 		(put-text-property (1+ (match-beginning 0)) (match-end 0)
-				   'local-map wdired-perm-mode-map))
+				   'keymap wdired-perm-mode-map))
 	      (put-text-property (match-end 0) (1+ (match-end 0)) 'end-perm t)
 	      (put-text-property (match-beginning 0) (1+ (match-beginning 0))
 				 'old-perm (match-string-no-properties 0))))
@@ -663,25 +652,24 @@
       (let ((new-bit (char-to-string last-command-char))
             (inhibit-read-only t)
 	    (pos-prop (- (point) (- (current-column) wdired-col-perm))))
-        (put-text-property 0 1 'local-map wdired-perm-mode-map new-bit)
+        (put-text-property 0 1 'keymap wdired-perm-mode-map new-bit)
         (put-text-property 0 1 'read-only t new-bit)
         (insert new-bit)
         (delete-char 1)
 	(put-text-property pos-prop (1- pos-prop) 'perm-changed t))
     (forward-char 1)))
 
-(defun wdired-toggle-bit()
+(defun wdired-toggle-bit ()
   "Toggle the permission bit at point."
   (interactive)
   (let ((inhibit-read-only t)
-	(new-bit "-")
+	(new-bit (cond
+                  ((not (eq (char-after (point)) ?-)) "-")
+                  ((= (% (- (current-column) wdired-col-perm) 3) 0) "r")
+                  ((= (% (- (current-column) wdired-col-perm) 3) 1) "w")
+                  (t "x")))
 	(pos-prop (- (point) (- (current-column) wdired-col-perm))))
-    (if (eq (char-after (point)) ?-)
-	(setq new-bit	
-	      (if (= (% (- (current-column) wdired-col-perm) 3) 0) "r"
-		(if (= (% (- (current-column) wdired-col-perm) 3) 1) "w"
-		  "x"))))
-    (put-text-property 0 1 'local-map wdired-perm-mode-map new-bit)
+    (put-text-property 0 1 'keymap wdired-perm-mode-map new-bit)
     (put-text-property 0 1 'read-only t new-bit)
     (insert new-bit)
     (delete-char 1)
@@ -697,23 +685,28 @@
 ;; Allowed chars for 2000 bit are Ssl in position 6
 ;; Allowed chars for 1000 bit are Tt  in position 9
 (defun wdired-perms-to-number (perms)
-  (let ((nperm 0777))
-    (if (= (elt perms 1) ?-) (setq nperm (- nperm 400)))
-    (if (= (elt perms 2) ?-) (setq nperm (- nperm 200)))
-    (let ((p-bit (elt perms 3)))
-      (if (memq p-bit '(?- ?S)) (setq nperm (- nperm 100)))
-      (if (memq p-bit '(?s ?S)) (setq nperm (+ nperm 4000))))
-    (if (= (elt perms 4) ?-) (setq nperm (- nperm 40)))
-    (if (= (elt perms 5) ?-) (setq nperm (- nperm 20)))
-    (let ((p-bit (elt perms 6)))
-      (if (memq p-bit '(?- ?S ?l)) (setq nperm (- nperm 10)))
-      (if (memq p-bit '(?s ?S ?l)) (setq nperm (+ nperm 2000))))
-    (if (= (elt perms 7) ?-) (setq nperm (- nperm 4)))
-    (if (= (elt perms 8) ?-) (setq nperm (- nperm 2)))
-    (let ((p-bit (elt perms 9)))
-      (if (memq p-bit '(?- ?T)) (setq nperm (- nperm 1)))
-      (if (memq p-bit '(?t ?T)) (setq nperm (+ nperm 1000))))
-    nperm))
+  (+
+   (if (= (elt perms 1) ?-) 0 400)
+   (if (= (elt perms 2) ?-) 0 200)
+   (case (elt perms 3)
+     (?- 0)
+     (?S 4000)
+     (?s 4100)
+     (t 100))
+   (if (= (elt perms 4) ?-) 0 40)
+   (if (= (elt perms 5) ?-) 0 20)
+   (case (elt perms 6)
+     (?- 0)
+     (?S 2000)
+     (?s 2010)
+     (t 10))
+   (if (= (elt perms 7) ?-) 0 4)
+   (if (= (elt perms 8) ?-) 0 2)
+   (case (elt perms 9)
+     (?- 0)
+     (?T 1000)
+     (?t 1001)
+     (t 1))))
 
 ;; Perform the changes in the permissions of the files that have
 ;; changed.
@@ -729,28 +722,31 @@
       (setq perms-ori (get-text-property (point) 'old-perm))
       (setq perms-new (buffer-substring-no-properties
 		       (point) (next-single-property-change (point) 'end-perm)))
-      (if (not (equal perms-ori perms-new))
-	  (progn
-	    (setq changes t)
-	    (setq filename (wdired-get-filename nil t))
-	    (if (= (length perms-new) 10)
-		(progn
-		  (setq perm-tmp
-			(int-to-string (wdired-perms-to-number perms-new)))
-		  (if (not (equal 0 (dired-call-process dired-chmod-program
-				     t perm-tmp filename)))
-		      (progn
-			(setq errors (1+ errors))
-			(dired-log (concat dired-chmod-program " " perm-tmp
-					   " `" filename "' failed\n\n")))))
-	    (setq errors (1+ errors))
-	    (dired-log (concat "Cannot parse permission `" perms-new
-			       "' for file `" filename "'\n\n")))))
+      (unless (equal perms-ori perms-new)
+        (setq changes t)
+        (setq filename (wdired-get-filename nil t))
+        (if (= (length perms-new) 10)
+            (progn
+              (setq perm-tmp
+                    (int-to-string (wdired-perms-to-number perms-new)))
+              (unless (equal 0 (dired-call-process dired-chmod-program
+                                                   t perm-tmp filename))
+                (setq errors (1+ errors))
+                (dired-log (concat dired-chmod-program " " perm-tmp
+                                   " `" filename "' failed\n\n"))))
+          (setq errors (1+ errors))
+          (dired-log (concat "Cannot parse permission `" perms-new
+                             "' for file `" filename "'\n\n"))))
       (goto-char (next-single-property-change (1+ (point)) prop-wanted
 					      nil (point-max))))
     (cons changes errors)))
 
 (provide 'wdired)
 
+;; Local Variables:
+;; coding: latin-1
+;; byte-compile-dynamic: t
+;; End:
+
 ;; arch-tag: bc00902e-526f-4305-bc7f-8862a559184f
 ;;; wdired.el ends here
--- a/lisp/whitespace.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/whitespace.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; whitespace.el --- warn about and clean bogus whitespaces in the file
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
 ;; Keywords: convenience
--- a/lisp/wid-browse.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/wid-browse.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; wid-browse.el --- functions for browsing widgets
 ;;
-;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: extensions
--- a/lisp/wid-edit.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/wid-edit.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t;-*-
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
--- a/lisp/widget.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/widget.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; widget.el --- a library of user interface components
 ;;
 ;; Copyright (C) 1996, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, extensions, faces, hypermedia
--- a/lisp/windmove.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/windmove.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; windmove.el --- directional window-selection routines
 ;;
 ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 ;;
 ;; Author: Hovav Shacham (hovav@cs.stanford.edu)
 ;; Created: 17 October 1998
--- a/lisp/window.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/window.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; window.el --- GNU Emacs window commands aside from those written in C
 
 ;; Copyright (C) 1985, 1989, 1992, 1993, 1994, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
--- a/lisp/winner.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/winner.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,11 +1,11 @@
 ;;; winner.el --- Restore old window configurations
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation. Inc.
+;;   2005, 2006 Free Software Foundation. Inc.
 
 ;; Author: Ivar Rummelhoff <ivarru@math.uio.no>
 ;; Created: 27 Feb 1997
-;; Time-stamp: <2002-02-20 22:06:58 ivarru>
+;; Time-stamp: <2006-02-06 15:13:57 ttn>
 ;; Keywords: convenience frames
 
 ;; This file is part of GNU Emacs.
--- a/lisp/woman.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/woman.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 ;;; woman.el --- browse UN*X manual pages `wo (without) man'
 
-;; Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
 ;; Maintainer: FSF
--- a/lisp/x-dnd.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/x-dnd.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 ;;; x-dnd.el --- drag and drop support for X.
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
 ;; Maintainer: FSF
--- a/lisp/xml.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/xml.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; xml.el --- XML parser
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Mark A. Hershberger <mah@everybody.org>
--- a/lisp/xt-mouse.el	Mon Feb 06 18:44:57 2006 +0000
+++ b/lisp/xt-mouse.el	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 ;;; xt-mouse.el --- support the mouse when emacs run in an xterm
 
 ;; Copyright (C) 1994, 2000, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: mouse, terminals
--- a/lispref/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,3 +1,36 @@
+2006-02-10  Kim F. Storm  <storm@cua.dk>
+
+	* eval.texi (Function Indirection): Add NOERROR to indirect-function.
+
+2006-02-08  Juanma Barranquero  <lekktu@gmail.com>
+
+	* modes.texi (%-Constructs): Remove obsolete info about
+	`global-mode-string'.
+
+2006-02-07  Richard M. Stallman  <rms@gnu.org>
+
+	* commands.texi (Prefix Command Arguments): Minor cleanup.
+
+	* display.texi: "Graphical display", not window system.
+
+	* functions.texi (What Is a Function): Fix xref.
+
+	* keymaps.texi (Key Lookup): Clarify wrt commands vs other functions.
+	(Changing Key Bindings): Clarify when remapping is better than
+	substitute-key-definition.
+
+2006-02-02  Richard M. Stallman  <rms@gnu.org>
+
+	* minibuf.texi (Basic Completion): Completion alists are risky.
+
+	* keymaps.texi (Active Keymaps): Clarifications.
+	(Searching Keymaps): New node.
+	(Keymaps): Update menu.
+
+	* frames.texi (Layout Parameters): Minor clarification.
+	(Drag and Drop): New node.
+	(Frames): Update menu.
+
 2006-01-29  Chong Yidong  <cyd@stupidchicken.com>
 
 	* display.texi (Other Display Specs, Image Descriptors): Image
@@ -21,6 +54,15 @@
 	* markers.texi (Overview of Markers): Count insertion type
 	as one of a marker's attributes.
 
+	* keymaps.texi (Controlling Active Maps): New node, split out of
+	Active Keymaps.
+	(Keymaps): Menu updated.
+	(Active Keymaps): Give pseudocode to explain how the active
+	maps are searched.  current-active-maps and key-binding moved here.
+	(Functions for Key Lookup): current-active-maps and key-binding moved.
+	Clarifications.
+	(Searching the Keymaps): New subnode.
+
 	* elisp.texi (Top): Menu clarification.
 
 	* display.texi (Other Display Specs): Delete duplicate entry for
@@ -4213,7 +4255,7 @@
 ;; End:
 
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      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.
 
--- a/lispref/Makefile.in	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/Makefile.in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 # Makefile for the GNU Emacs Lisp Reference Manual.
 
 # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
-#   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
--- a/lispref/abbrevs.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/abbrevs.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/abbrevs
 @node Abbrevs, Processes, Syntax Tables, Top
--- a/lispref/advice.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/advice.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1998, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/advising
 @node Advising Functions, Debugging, Byte Compilation, Top
--- a/lispref/anti.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/anti.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c Copyright (C) 1999, 2002, 2003, 2004, 2005,
+@c   2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 @c This node must have no pointers.
--- a/lispref/backups.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/backups.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/backups
 @node Backups and Auto-Saving, Buffers, Files, Top
--- a/lispref/buffers.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/buffers.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/buffers
 @node Buffers, Windows, Backups and Auto-Saving, Top
--- a/lispref/commands.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/commands.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/commands
 @node Command Loop, Keymaps, Minibuffers, Top
@@ -2780,7 +2780,7 @@
 commands.
 
   Normally, commands specify which representation to use for the prefix
-argument, either numeric or raw, in the @code{interactive} declaration.
+argument, either numeric or raw, in the @code{interactive} specification.
 (@xref{Using Interactive}.)  Alternatively, functions may look at the
 value of the prefix argument directly in the variable
 @code{current-prefix-arg}, but this is less clean.
--- a/lispref/compile.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/compile.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/compile
 @node Byte Compilation, Advising Functions, Loading, Top
--- a/lispref/control.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/control.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/control
 @node Control Structures, Variables, Evaluation, Top
--- a/lispref/customize.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/customize.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/customize
 @node Customization, Loading, Macros, Top
--- a/lispref/debugging.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/debugging.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/debugging
 @node Debugging, Read and Print, Advising Functions, Top
--- a/lispref/display.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/display.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/display
 @node Display, System Interface, Processes, Top
@@ -126,7 +126,7 @@
 which is also called @dfn{continuing} the line.  (The display table can
 specify alternative indicators; see @ref{Display Tables}.)
 
-  On a window system display, the @samp{$} and @samp{\} indicators are
+  On a graphical display, the @samp{$} and @samp{\} indicators are
 replaced with arrow images displayed in the window fringes
 (@pxref{Fringes}).
 
@@ -1651,13 +1651,13 @@
 However, if the variable @code{default-line-spacing} is
 non-@code{nil}, it overrides the frame's @code{line-spacing}
 parameter.  An integer value specifies the number of pixels put below
-lines on window systems.  A floating point number specifies the
+lines on graphical displays.  A floating point number specifies the
 spacing relative to the frame's default line height.
 
 @vindex line-spacing
   You can specify the line spacing for all lines in a buffer via the
 buffer-local @code{line-spacing} variable.  An integer value specifies
-the number of pixels put below lines on window systems.  A floating
+the number of pixels put below lines on graphical displays.  A floating
 point number specifies the spacing relative to the default frame line
 height.  This overrides line spacings specified for the frame.
 
@@ -4603,9 +4603,9 @@
 @tindex indicate-empty-lines
 @cindex fringes, and empty line indication
 When this is non-@code{nil}, Emacs displays a special glyph in the
-fringe of each empty line at the end of the buffer, on terminals that
-support it (window systems).  @xref{Fringes}.
-This variable is automatically buffer-local in every buffer.
+fringe of each empty line at the end of the buffer, on graphical
+displays.  @xref{Fringes}.  This variable is automatically
+buffer-local in every buffer.
 @end defopt
 
 @defvar indicate-buffer-boundaries
@@ -4854,7 +4854,7 @@
 @item @var{string}
 Send the characters in @var{string} to the terminal to output
 this glyph.  This alternative is available on character terminals,
-but not under a window system.
+but not on graphical displays.
 
 @item @var{integer}
 Define this glyph code as an alias for glyph code @var{integer}.  You
@@ -4896,7 +4896,7 @@
 @defopt visible-bell
 This variable determines whether Emacs should flash the screen to
 represent a bell.  Non-@code{nil} means yes, @code{nil} means no.  This
-is effective on a window system, and on a character-only terminal
+is effective on graphical displays, and on text-only terminals
 provided the terminal's Termcap entry defines the visible bell
 capability (@samp{vb}).
 @end defopt
--- a/lispref/edebug.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/edebug.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @comment -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 @c This file can also be used by an independent Edebug User
--- a/lispref/elisp.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/elisp.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -30,8 +30,8 @@
 This is edition @value{VERSION} of the GNU Emacs Lisp
 Reference Manual, corresponding to Emacs version @value{EMACSVER}.
 
-Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
-              2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+  2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
--- a/lispref/errors.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/errors.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/errors
 @node Standard Errors, Standard Buffer-Local Variables, GNU Emacs Internals, Top
--- a/lispref/eval.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/eval.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/eval
 @node Evaluation, Control Structures, Symbols, Top
@@ -314,16 +314,20 @@
 perform symbol function indirection explicitly.
 
 @c Emacs 19 feature
-@defun indirect-function function
+@defun indirect-function function &optional noerror
 @anchor{Definition of indirect-function}
 This function returns the meaning of @var{function} as a function.  If
 @var{function} is a symbol, then it finds @var{function}'s function
 definition and starts over with that value.  If @var{function} is not a
 symbol, then it returns @var{function} itself.
 
-This function signals a @code{void-function} error if the final
-symbol is unbound and a @code{cyclic-function-indirection} error if
-there is a loop in the chain of symbols.
+This function signals a @code{void-function} error if the final symbol
+is unbound and optional argument @var{noerror} is @code{nil} or
+omitted.  Otherwise, if @var{noerror} is non-@code{nil}, it returns
+@code{nil} if the final symbol is unbound.
+
+It signals a @code{cyclic-function-indirection} error if there is a
+loop in the chain of symbols.
 
 Here is how you could define @code{indirect-function} in Lisp:
 
--- a/lispref/files.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/files.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/files
 @node Files, Backups and Auto-Saving, Documentation, Top
--- a/lispref/frames.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/frames.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/frames
 @node Frames, Positions, Windows, Top
--- a/lispref/functions.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/functions.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/functions
 @node Functions, Macros, Variables, Top
@@ -99,7 +99,7 @@
 they are not functions.  A symbol is a command if its function
 definition is a command; such symbols can be invoked with @kbd{M-x}.
 The symbol is a function as well if the definition is a function.
-@xref{Command Overview}.
+@xref{Interactive Call}.
 
 @item keystroke command
 @cindex keystroke command
--- a/lispref/hash.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/hash.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c Copyright (C) 1999, 2002, 2003, 2004, 2005,
+@c   2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/hash
 @node Hash Tables, Symbols, Sequences Arrays Vectors, Top
--- a/lispref/help.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/help.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/help
 @node Documentation, Files, Modes, Top
--- a/lispref/hooks.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/hooks.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1998, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/hooks
 @node Standard Hooks, Index, Standard Keymaps, Top
--- a/lispref/internals.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/internals.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1998, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/internals
 @node GNU Emacs Internals, Standard Errors, Tips, Top
--- a/lispref/intro.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/intro.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/intro
 
--- a/lispref/keymaps.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/keymaps.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/keymaps
 @node Keymaps, Modes, Command Loop, Top
@@ -933,8 +933,10 @@
 @item
 @cindex @code{lambda} in keymap
 If the @sc{car} of @var{list} is @code{lambda}, then the list is a
-lambda expression.  This is presumed to be a command, and is treated as
-such (see above).
+lambda expression.  This is presumed to be a function, and is treated
+as such (see above).  In order to execute properly as a key binding,
+this function must be a command---it must have an @code{interactive}
+specification.  @xref{Defining Commands}.
 
 @item
 If the @sc{car} of @var{list} is a keymap and the @sc{cdr} is an event
@@ -1282,9 +1284,9 @@
 
   The function @code{substitute-key-definition} scans a keymap for
 keys that have a certain binding and rebinds them with a different
-binding.  Another feature you can use for similar effects, but which
-is often cleaner, is to add a binding that remaps a command
-(@pxref{Remapping Commands}).
+binding.  Another feature which is cleaner and can often produce the
+same results to remap one command into another (@pxref{Remapping
+Commands}).
 
 @defun substitute-key-definition olddef newdef keymap &optional oldmap
 @cindex replace bindings
--- a/lispref/lists.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/lists.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/lists
 @node Lists, Sequences Arrays Vectors, Strings and Characters, Top
--- a/lispref/loading.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/loading.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/loading
 @node Loading, Byte Compilation, Customization, Top
--- a/lispref/locals.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/locals.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/locals
 @node Standard Buffer-Local Variables, Standard Keymaps, Standard Errors, Top
--- a/lispref/macros.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/macros.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/macros
 @node Macros, Customization, Functions, Top
--- a/lispref/makefile.w32-in	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/makefile.w32-in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
--- a/lispref/maps.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/maps.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/maps
 @node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top
--- a/lispref/markers.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/markers.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/markers
 @node Markers, Text, Positions, Top
--- a/lispref/minibuf.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/minibuf.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
-@c   2003, 2004, 2005 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/minibuf
 @node Minibuffers, Command Loop, Read and Print, Top
--- a/lispref/modes.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/modes.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002,
-@c   2003, 2004, 2005 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/modes
 @node Modes, Documentation, Keymaps, Top
@@ -2012,8 +2012,7 @@
 The value of @code{mode-name}.
 
 @item %M
-The value of @code{global-mode-string}.  Currently, only
-@code{display-time} modifies the value of @code{global-mode-string}.
+The value of @code{global-mode-string}.
 @end table
 
 @node Properties in Mode
--- a/lispref/nonascii.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/nonascii.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1998, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/characters
 @node Non-ASCII Characters, Searching and Matching, Text, Top
--- a/lispref/numbers.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/numbers.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/numbers
 @node Numbers, Strings and Characters, Lisp Data Types, Top
--- a/lispref/objects.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/objects.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/objects
 @node Lisp Data Types, Numbers, Introduction, Top
--- a/lispref/os.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/os.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/os
 @node System Interface, Antinews, Display, Top
--- a/lispref/positions.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/positions.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/positions
 @node Positions, Markers, Frames, Top
--- a/lispref/processes.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/processes.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/processes
 @node Processes, Display, Abbrevs, Top
--- a/lispref/searching.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/searching.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/searching
 @node Searching and Matching, Syntax Tables, Non-ASCII Characters, Top
--- a/lispref/sequences.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/sequences.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/sequences
 @node Sequences Arrays Vectors, Hash Tables, Lists, Top
--- a/lispref/streams.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/streams.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004,
-@c   2005 Free Software Foundation, Inc.
+@c   2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/streams
 @node Read and Print, Minibuffers, Debugging, Top
--- a/lispref/strings.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/strings.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/strings
 @node Strings and Characters, Lists, Numbers, Top
--- a/lispref/symbols.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/symbols.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/symbols
 @node Symbols, Evaluation, Hash Tables, Top
--- a/lispref/syntax.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/syntax.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/syntax
 @node Syntax Tables, Abbrevs, Searching and Matching, Top
--- a/lispref/text.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/text.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/text
 @node Text, Non-ASCII Characters, Markers, Top
--- a/lispref/tindex.pl	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/tindex.pl	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002, 2003, 2004, 2005,
+#   2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/lispref/tips.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/tips.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/tips
 @node Tips, GNU Emacs Internals, GPL, Top
--- a/lispref/variables.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/variables.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2002,
-@c   2003, 2004, 2005 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/variables
 @node Variables, Functions, Control Structures, Top
--- a/lispref/vol1.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/vol1.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 \input texinfo  @c -*-texinfo-*-
--- a/lispref/vol2.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/vol2.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 
--- a/lispref/windows.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/lispref/windows.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005 Free Software Foundation, Inc.
+@c   2004, 2005, 2006 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/windows
 @node Windows, Frames, Buffers, Top
--- a/mac/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,3 +1,8 @@
+2006-02-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* makefile.MPW (shortlisp, SOME_MACHINE_LISP): Sync with
+	src/Makefile.in.
+
 2005-12-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* makefile.MPW (macselect.c.x): Depend on keymap.h.
@@ -805,7 +810,8 @@
 ;; coding: iso-2022-7bit-unix
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 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.
 
--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings	Sun Feb 12 00:15:44 2006 +0000
@@ -2,4 +2,4 @@
 
 CFBundleName = "Emacs";
 CFBundleShortVersionString = "22.0.50";
-CFBundleGetInfoString = "22.0.50, Copyright (C) 2005 Free Software Foundation, Inc.";
+CFBundleGetInfoString = "22.0.50, Copyright (C) 2006 Free Software Foundation, Inc.";
--- a/mac/INSTALL	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/INSTALL	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 * BUILDING EMACS ON MAC OS Classic AND MAC OS X     -*- outline -*-
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
--- a/mac/README	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/README	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 Emacs for Mac OS Classic and Mac OS X
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
--- a/mac/cw6-mcp.xml	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/cw6-mcp.xml	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 <!--
-Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/alloca.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/alloca.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/config.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/config.h	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
 
 /* GNU Emacs site configuration template file.  -*- C -*-
    Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/defs-cw6.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/defs-cw6.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/dirent.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/dirent.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Replacement dirent.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/epaths.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/epaths.h	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
 
 /* Handcrafted epaths.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/grp.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/grp.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Replacement grp.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/m-mac.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/m-mac.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Handcrafted m-mac.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/pwd.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/pwd.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Replacement pwd.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/s-mac.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/s-mac.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Handcrafted s-mac.h file for building GNU Emacs on Mac OS 9.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/sys/file.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/sys/file.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Replacement sys/file.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/sys/ioctl.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/sys/ioctl.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Replacement sys/ioctl.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/sys/param.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/sys/param.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Replacement sys/param.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/sys/stat.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/sys/stat.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Replacement sys/stat.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/sys/time.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/sys/time.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Replacement sys/time.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/sys/types.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/sys/types.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Replacement sys/types.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/termio.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/termio.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Replacement termio.h file for building GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/utime.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/utime.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Replacement utime.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/inc/utsname.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/inc/utsname.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Replacement utsname.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/make-package	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/make-package	Sun Feb 12 00:15:44 2006 +0000
@@ -18,7 +18,7 @@
 ####     files inside /usr.  This will replace the default version of
 ####     emacs included with Mac OS X.
 
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/mac/makefile.MPW	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/makefile.MPW	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 #    Make file for building GNU Emacs on the Macintosh.
 #    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-#       2005 Free Software Foundation, Inc.
+#       2005, 2006 Free Software Foundation, Inc.
 #
 #    Author: Andrew Choi <akochoi@users.sourceforge.net>
 #
@@ -1039,6 +1039,7 @@
 	{Lisp}help.elc ¶
 	{Lisp}indent.elc ¶
 	{Lisp}isearch.elc ¶
+	{Lisp}rfn-eshadow.elc ¶
 	{Lisp}loadup.el ¶
 	{Lisp}loaddefs.el ¶
 	{Lisp}bindings.elc ¶
@@ -1113,9 +1114,13 @@
   {Lisp}ls-lisp.elc {Lisp}dos-fns.elc ¶
   {Lisp}w32-fns.elc {Lisp}dos-w32.elc ¶
   {Lisp}disp-table.elc {Lisp}dos-vars.elc ¶
-  {Lisp}tooltip.elc ¶
+  {Lisp}tooltip.elc {Lisp}image.elc ¶
+  {Lisp}dnd.elc {Lisp}mwheel.elc ¶
+  {Lisp}tool-bar.elc ¶
+  {Lisp}x-dnd.elc ¶
   {Lisp}international:ccl.elc ¶
-  {Lisp}international:codepage.elc
+  {Lisp}international:codepage.elc ¶
+  {Lisp}international:fontset.elc
 
 Doc Ä {DocTarget}DOC
 
--- a/mac/src/Emacs.r	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/src/Emacs.r	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Resource definitions for GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -222,7 +222,7 @@
 	50,		/* Non-final release # */
 	0,		/* Region code */
 	"22.0.50",	/* Short version number */
-	"22.0.50, Copyright \0xa9 2005 "
+	"22.0.50, Copyright \0xa9 2006 "
 	"Free Software Foundation, Inc." /* Long version number */
 };
 
--- a/mac/src/EmacsMPW.r	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/src/EmacsMPW.r	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
    under MPW.
 
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/mac/src/chdir.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/mac/src/chdir.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Implementation of chdir on the Mac for use with make-docfile.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/man/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,3 +1,154 @@
+2006-02-11  Mathias Dahl  <mathias.dahl@gmail.com>
+
+	* dired.texi (Tumme): More tumme documentation.
+
+2006-02-11  Alan Mackenzie  <acm@muc.de>
+
+	* programs.texi ("Hungry Delete"): Correct the appellation of the
+	backspace and delete keys to @kbd{DEL} and @kbd{DELETE}.
+
+2006-02-11  Mathias Dahl  <mathias.dahl@gmail.com>
+
+	* dired.texi (Tumme): Fixed small bug.
+
+2006-02-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macos.texi (Mac International): Rename "fontset-mac" to
+	"fontset-standard".
+
+2006-02-09  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (Gnus Versions): Add history beyond start of Oort.
+
+2006-02-09  Mathias Dahl  <mathias.dah@gmail.com>
+
+	* dired.texi (Tumme): Basic documentation for Tumme added.
+
+2006-02-08  Romain Francoise  <romain@orebokech.com>
+
+	* faq.texi (Top): Remove paragraph about the FAQ being a
+	transitional document, etc.
+	(Searching for/replacing newlines): New node.
+	(Yanking text in isearch): New node.
+	(Inserting text at the beginning of each line): Rename and make
+	more general, mention `M-;' in Message mode.
+
+2006-02-07  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* mule.texi (International):
+	* programs.texi (Basic Indent): Fix typos.
+
+	* faq.texi (Meta key does not work in xterm)
+	(Emacs does not display 8-bit characters)
+	(Inputting eight-bit characters):
+	* custom.texi (Minor Modes):
+	* display.texi (Text Display):
+	* commands.texi (Text Characters): Update xrefs.
+
+2006-02-07  Richard M. Stallman  <rms@gnu.org>
+
+	* emacs.texi (Top): Update subnode menu.
+	Update info on old Emacs papers.
+	(Intro): "Graphical display", not window system.
+
+	* xresources.texi (GTK styles): Minor clarifications.
+
+	* trouble.texi: "Graphical display", not window system.
+	(Stuck Recursive): Minor clarification.
+
+	* text.texi: Minor clarifications.
+	(Sentences): Explain why two-space convention is better.
+	Explain sentence-end-without-period here.
+	(Fill Commands): Not here.
+	(Refill): Node moved down.
+	(Filling): Update menu.
+	(Table Creation, Cell Justification, Column Commands): Clarify.
+
+	* sending.texi: Minor clarifications.
+
+	* search.texi (Regexp Backslash): Clarification.
+
+	* rmail.texi: Minor cleanups.
+	(Rmail): Delete digression about `rmail-mode'.
+	(Rmail Inbox): Delete false advice wrt rmail-primary-inbox-list.
+	(Rmail Files): Mention C-u M-x rmail.
+	(Rmail Reply): Mention References.
+	(Rmail Display): Mention rmail-nonignored-headers.
+
+	* programs.texi: Minor cleanups.
+	(Comment Commands): Mention momentary Transient Mark mode.
+	(Matching): Be more specific about customizing show-paren-mode.
+	(Info Lookup): Don't list the modes that support C-h S.
+	Just say what it does in an unsupported mode.
+	(Man Page): Delete excessive info on customizing woman.
+	(Motion in C): Don't mention c-for/backward-into-nomenclature.
+
+	* abbrevs.texi: Minor clarifications.
+	(Dabbrev Customization): Talk about "dynamic abbrev expansion",
+	not "dynamic abbrevs" as if they were a kind of abbrev.
+
+	* picture.texi (Picture): Minor cleanup.
+
+	* mule.texi (Communication Coding): Say "other applications".
+	(Fontsets): Not specific to X.  Add xref to X Resources.
+	(Unibyte Mode): Renamed from Single-Byte Character Support.
+	"Graphical display", not window system.
+	(International): Update menu.
+
+	* maintaining.texi (Format of ChangeLog):
+	New node, split out from ChangeLog.
+	(ChangeLog): Clarifications in the remaining text.
+	(Create Tags Table, Etags Regexps, Select Tags Table): Cleanups.
+	(Find Tag): Add @w.
+	(Tags Search): Explain tag table order here.  Simplify grep ref.
+	(List Tags): tags-tag-face is a variable, not a face.
+	(Emerge): Cleanups.
+
+	* kmacro.texi (Keyboard Macro Counter): Rewrite for clarity.
+	(Keyboard Macros): Avoid "the user".
+
+	* killing.texi: "Graphical display", not window system.
+
+	* help.texi (Help Echo): "Graphical display", not window system.
+
+	* glossary.texi: Say "you", not "the user".  Say "graphical display".
+
+	* frames.texi: Minor cleanups.  "Graphical display", not window system.
+
+	* files.texi (Visiting): Make drag-and-drop not X-specific.
+
+	* custom.texi: Minor cleanups.  "Graphical display", not window system.
+
+	* cmdargs.texi: Minor cleanups.
+
+	* building.texi (Compilation): Move and split kill-compilation para.
+	Add para about multiple compilers.
+	(Compilation Mode): Commands also available in grep mode and others.
+	Mention C-u C-x ` more tutorially.  Clarify C-x `.
+	(Compilation Shell): Clarify.  Put Bash example first.
+	(Grep Searching): Minor cleanups; add @w.
+	(Debuggers): Minor cleanups.
+	(Starting GUD): Make GDB xgraphical mode issue clearer.
+	(Debugger Operation): Lots of clarifications including
+	GDB tooltip side-effect issue.
+	(Commands of GUD): Clarify.
+	(GUD Customization): Add bashdb-mode-hook.
+	(GDB Graphical Interface): Rewrite for clarity.
+	(GDB User Interface Layout): Rewrite for clarity.
+	(Stack Buffer, Watch Expressions): Likewise.
+	(Other GDB User Interface Buffers): Cleanups.
+	(Lisp Libraries, External Lisp): Cleanup.
+
+	* basic.texi (Position Info): "Graphical displays", rather than
+	window systems.
+
+	* anti.texi: Minor cleanup.
+
+2006-02-06  Romain Francoise  <romain@orebokech.com>
+
+	* faq.texi (VM): VM now at version 7.19.
+	Set myself as maintainer of this file.
+
 2006-02-04  Michael Olson  <mwolson@gnu.org>
 
 	* erc.texi (History): Note that ERC is now included with Emacs.
--- a/man/abbrevs.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/abbrevs.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -10,7 +10,7 @@
   A defined @dfn{abbrev} is a word which @dfn{expands}, if you insert
 it, into some different text.  Abbrevs are defined by the user to expand
 in specific ways.  For example, you might define @samp{foo} as an abbrev
-expanding to @samp{find outer otter}.  Then you would be able to insert
+expanding to @samp{find outer otter}.  Then you could insert
 @samp{find outer otter } into the buffer by typing @kbd{f o o
 @key{SPC}}.
 
@@ -20,9 +20,9 @@
 words in the buffer that start with those letters.  @xref{Dynamic
 Abbrevs}.
 
-``Hippie'' expansion generalizes abbreviation expansion.  @xref{Hippie
-Expand, , Hippie Expansion, autotype, Features for Automatic
-Typing}.
+  ``Hippie'' expansion generalizes abbreviation expansion.
+@xref{Hippie Expand, , Hippie Expansion, autotype, Features for
+Automatic Typing}.
 
 @menu
 * Abbrev Concepts::   Fundamentals of defined abbrevs.
@@ -57,16 +57,16 @@
 on when the variable is non-@code{nil}.  The variable @code{abbrev-mode}
 automatically becomes local to the current buffer when it is set.
 
-  Abbrev definitions can be @dfn{mode-specific}---active only in one major
+  Abbrevs can have @dfn{mode-specific} definitions, active only in one major
 mode.  Abbrevs can also have @dfn{global} definitions that are active in
 all major modes.  The same abbrev can have a global definition and various
 mode-specific definitions for different major modes.  A mode-specific
 definition for the current major mode overrides a global definition.
 
-  Abbrevs can be defined interactively during the editing session.  Lists
-of abbrev definitions can also be saved in files and reloaded in later
-sessions.  Some users keep extensive lists of abbrevs that they load in
-every session.
+  Yu can define abbrevs interactively during the editing session.  You
+can also save lists of abbrev definitions in files for use in later
+sessions.  Some users keep extensive lists of abbrevs that they load
+in every session.
 
 @node Defining Abbrevs
 @section Defining Abbrevs
@@ -88,8 +88,7 @@
 @item M-x define-mode-abbrev @key{RET} @var{abbrev} @key{RET} @var{exp} @key{RET}
 Define @var{abbrev} as a mode-specific abbrev expanding into @var{exp}.
 @item M-x kill-all-abbrevs
-This command discards all abbrev definitions currently in effect,
-leaving a blank slate.
+Discard all abbrev definitions, leaving a blank slate.
 @end table
 
 @kindex C-x a g
@@ -118,13 +117,13 @@
 @findex inverse-add-global-abbrev
 @kindex C-x a i l
 @findex inverse-add-mode-abbrev
-  If the text already in the buffer is the abbrev, rather than its
-expansion, use command @kbd{C-x a i g}
-(@code{inverse-add-global-abbrev}) instead of @kbd{C-x a g}, or use
-@kbd{C-x a i l} (@code{inverse-add-mode-abbrev}) instead of @kbd{C-x a
-l}.  These commands are called ``inverse'' because they invert the
-meaning of the two text strings they use (one from the buffer and one
-read with the minibuffer).
+  If the abbrev text itself is already in the buffer, you can use the
+commands @kbd{C-x a i g} (@code{inverse-add-global-abbrev}) and
+@kbd{C-x a i l} (@code{inverse-add-mode-abbrev}) to define it as an
+abbrev by specify the expansion in the minibuffer.  These commands are
+called ``inverse'' because they invert the meaning of the two text
+strings they use (one from the buffer and one read with the
+minibuffer).
 
 @findex define-mode-abbrev
 @findex define-global-abbrev
@@ -137,14 +136,12 @@
 When the abbrev has a prior definition, the abbrev definition commands
 ask for confirmation before replacing it.
 
-  To remove an abbrev definition, give a negative argument to the abbrev
-definition command: @kbd{C-u - C-x a g} or @kbd{C-u - C-x a l}.  The
-former removes a global definition, while the latter removes a
-mode-specific definition.
-
 @findex kill-all-abbrevs
-  @kbd{M-x kill-all-abbrevs} removes all the abbrev definitions there
-are, both global and local.
+  To remove an abbrev definition, give a negative argument to the
+abbrev definition command: @kbd{C-u - C-x a g} or @kbd{C-u - C-x a l}.
+The former removes a global definition, while the latter removes a
+mode-specific definition.  @kbd{M-x kill-all-abbrevs} removes all
+abbrev definitions, both global and local.
 
 @node Expanding Abbrevs
 @section Controlling Abbrev Expansion
@@ -179,9 +176,9 @@
 
 @kindex M-'
 @findex abbrev-prefix-mark
-  You may wish to expand an abbrev with a prefix attached; for example,
-if @samp{cnst} expands into @samp{construction}, you might want to use
-it to enter @samp{reconstruction}.  It does not work to type
+  You may wish to expand an abbrev and attach a prefix to the expansion;
+for example, if @samp{cnst} expands into @samp{construction}, you might want
+to use it to enter @samp{reconstruction}.  It does not work to type
 @kbd{recnst}, because that is not necessarily a defined abbrev.  What
 you can do is use the command @kbd{M-'} (@code{abbrev-prefix-mark}) in
 between the prefix @samp{re} and the abbrev @samp{cnst}.  First, insert
@@ -195,7 +192,7 @@
   If you actually want the text of the abbrev in the buffer, rather than
 its expansion, you can accomplish this by inserting the following
 punctuation with @kbd{C-q}.  Thus, @kbd{foo C-q ,} leaves @samp{foo,} in
-the buffer.
+the buffer, not expanding it.
 
 @findex unexpand-abbrev
   If you expand an abbrev by mistake, you can undo the expansion and
@@ -234,6 +231,7 @@
   The output from @kbd{M-x list-abbrevs} looks like this:
 
 @example
+@var{various other tables@dots{}}
 (lisp-mode-abbrev-table)
 "dk"	       0    "define-key"
 (global-abbrev-table)
@@ -322,16 +320,16 @@
 similar to the previous commands but work on text in an Emacs buffer.
 @kbd{M-x insert-abbrevs} inserts text into the current buffer after point,
 describing all current abbrev definitions; @kbd{M-x define-abbrevs} parses
-the entire current buffer and defines abbrevs accordingly.@refill
+the entire current buffer and defines abbrevs accordingly.
 
 @node Dynamic Abbrevs
 @section Dynamic Abbrev Expansion
 
-  The abbrev facility described above operates automatically as you insert
-text, but all abbrevs must be defined explicitly.  By contrast,
-@dfn{dynamic abbrevs} allow the meanings of abbrevs to be determined
-automatically from the contents of the buffer, but dynamic abbrev expansion
-happens only when you request it explicitly.
+  The abbrev facility described above operates automatically as you
+insert text, but all abbrevs must be defined explicitly.  By contrast,
+@dfn{dynamic abbrevs} allow the meanings of abbreviations to be
+determined automatically from the contents of the buffer, but dynamic
+abbrev expansion happens only when you request it explicitly.
 
 @kindex M-/
 @kindex C-M-/
@@ -357,7 +355,7 @@
 searches for an alternative expansion by looking farther back.  After
 scanning all the text before point, it searches the text after point.
 The variable @code{dabbrev-limit}, if non-@code{nil}, specifies how far
-in the buffer to search for an expansion.
+away in the buffer to search for an expansion.
 
 @vindex dabbrev-check-all-buffers
   After scanning the current buffer, @kbd{M-/} normally searches other
@@ -372,21 +370,20 @@
 
   A negative argument to @kbd{M-/}, as in @kbd{C-u - M-/}, says to
 search first for expansions after point, then other buffers, and
-consider expansions before point only as a last resort.
-
-  If you repeat the @kbd{M-/} to look for another expansion, do not
-specify an argument.  This tries all the expansions after point and
-then the expansions before point.
+consider expansions before point only as a last resort.  If you repeat
+the @kbd{M-/} to look for another expansion, do not specify an
+argument.  Repeating @kbd{M-/} cycles through all the expansions after
+point and then the expansions before point.
 
   After you have expanded a dynamic abbrev, you can copy additional
 words that follow the expansion in its original context.  Simply type
-@kbd{@key{SPC} M-/} for each word you want to copy.  The spacing and
-punctuation between words is copied along with the words.
+@kbd{@key{SPC} M-/} for each additional word you want to copy.  The
+spacing and punctuation between words is copied along with the words.
 
   The command @kbd{C-M-/} (@code{dabbrev-completion}) performs
-completion of a dynamic abbreviation.  Instead of trying the possible
-expansions one by one, it finds all of them, then inserts the text that
-they have in common.  If they have nothing in common, @kbd{C-M-/}
+completion of a dynamic abbrev.  Instead of trying the possible
+expansions one by one, it finds all of them, then inserts the text
+that they have in common.  If they have nothing in common, @kbd{C-M-/}
 displays a list of completions, from which you can select a choice in
 the usual manner.  @xref{Completion}.
 
@@ -411,24 +408,25 @@
 for expansions.
 
 @vindex dabbrev-case-replace
-  Normally, dynamic abbrev expansion preserves the case pattern @emph{of
-the abbrev you have typed}, by converting the expansion to that case
-pattern.
+  Normally, dynamic abbrev expansion preserves the case pattern
+@emph{of the dynamic abbrev you are expanding}, by converting the
+expansion to that case pattern.
 
 @vindex dabbrev-case-fold-search
-  The variable @code{dabbrev-case-replace} controls whether to preserve
-the case pattern of the abbrev.  If it is @code{t}, the abbrev's case
-pattern is preserved in most cases; if it is @code{nil}, the expansion is
-always copied verbatim.  If the value of @code{dabbrev-case-replace} is
-@code{case-replace}, which is true by default, then the variable
-@code{case-replace} controls whether to copy the expansion verbatim.
+  The variable @code{dabbrev-case-replace} controls whether to
+preserve the case pattern of the dynamic abbrev.  If it is @code{t},
+the dynamic abbrev's case pattern is preserved in most cases; if it is
+@code{nil}, the expansion is always copied verbatim.  If the value of
+@code{dabbrev-case-replace} is @code{case-replace}, which is true by
+default, then the variable @code{case-replace} controls whether to
+copy the expansion verbatim.
 
   However, if the expansion contains a complex mixed case pattern, and
-the abbrev matches this pattern as far as it goes, then the expansion is
-always copied verbatim, regardless of those variables.  Thus, for
-example, if the buffer contains @code{variableWithSillyCasePattern}, and
-you type @kbd{v a M-/}, it copies the expansion verbatim including its
-case pattern.
+the dynamic abbrev matches this pattern as far as it goes, then the
+expansion is always copied verbatim, regardless of those variables.
+Thus, for example, if the buffer contains
+@code{variableWithSillyCasePattern}, and you type @kbd{v a M-/}, it
+copies the expansion verbatim including its case pattern.
 
 @vindex dabbrev-abbrev-char-regexp
   The variable @code{dabbrev-abbrev-char-regexp}, if non-@code{nil},
@@ -436,16 +434,16 @@
 purposes.  The regular expression must match just one character, never
 two or more.  The same regular expression also determines which
 characters are part of an expansion.  The value @code{nil} has a special
-meaning: abbreviations are made of word characters, but expansions are
+meaning: dynamic abbrevs are made of word characters, but expansions are
 made of word and symbol characters.
 
 @vindex dabbrev-abbrev-skip-leading-regexp
   In shell scripts and makefiles, a variable name is sometimes prefixed
 with @samp{$} and sometimes not.  Major modes for this kind of text can
-customize dynamic abbreviation to handle optional prefixes by setting
+customize dynamic abbrev expansion to handle optional prefixes by setting
 the variable @code{dabbrev-abbrev-skip-leading-regexp}.  Its value
 should be a regular expression that matches the optional prefix that
-dynamic abbreviation should ignore.
+dynamic abbrev expression should ignore.
 
 @ignore
    arch-tag: 638e0079-9540-48ec-9166-414083e16445
--- a/man/anti.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/anti.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -107,7 +107,7 @@
 
 @item
 The apropos commands will not accept a list of words to match, in
-order to encourage users to be more specific.  Also, the user option
+order to encourage you to be more specific.  Also, the user option
 @code{apropos-sort-by-scores} has been removed.
 
 @item
--- a/man/basic.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/basic.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -618,9 +618,9 @@
 (if it supports the character).
 
 @item
-If you are running Emacs on a window system, the font name and glyph
-code for the character.  If you are running Emacs on a terminal, the
-code(s) sent to the terminal.
+If you are running Emacs on a graphical display, the font name and
+glyph code for the character.  If you are running Emacs on a text-only
+terminal, the code(s) sent to the terminal.
 
 @item
 The character's text properties (@pxref{Text Properties,,,
--- a/man/building.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/building.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -90,23 +90,12 @@
 the buffer, it remains fixed while more compilation output is added at
 the end of the buffer.
 
-@cindex compilation buffer, keeping current position at the end
+@cindex compilation buffer, keeping point at end
 @vindex compilation-scroll-output
   If you set the variable @code{compilation-scroll-output} to a
 non-@code{nil} value, then the compilation buffer always scrolls to
 follow output as it comes in.
 
-@findex kill-compilation
-  When the compiler process terminates, for whatever reason, the mode
-line of the @samp{*compilation*} buffer changes to say @samp{exit}
-(followed by the exit code, @samp{[0]} for a normal exit), or
-@samp{signal} (if a signal terminated the process), instead of
-@samp{run}.  Starting a new compilation also kills any running
-compilation, as only one can exist at any time.  However, @kbd{M-x
-compile} asks for confirmation before actually killing a compilation
-that is running.  You can also kill the compilation process with
-@kbd{M-x kill-compilation}.
-
 @findex recompile
   To rerun the last compilation with the same command, type @kbd{M-x
 recompile}.  This automatically reuses the compilation command from
@@ -115,6 +104,25 @@
 directory, which is the directory in which the previous compilation
 was started.
 
+  When the compiler process terminates, for whatever reason, the mode
+line of the @samp{*compilation*} buffer changes to say @samp{exit}
+(followed by the exit code, @samp{[0]} for a normal exit), or
+@samp{signal} (if a signal terminated the process), instead of
+@samp{run}.
+
+@findex kill-compilation
+  Starting a new compilation also kills any compilation
+running in @samp{*compilation*}, as the buffer can only handle one
+compilation at any time.  However, @kbd{M-x compile} asks for
+confirmation before actually killing a compilation that is running.
+You can also kill the compilation process with @kbd{M-x
+kill-compilation}.
+
+  If you want to run two compilations at once, you should start the
+first one, then rename the @samp{*compilation*} buffer (perhaps using
+@code{rename-uniquely}; @pxref{Misc Buffer}), and start the other
+compilation.  That will create a new @samp{*compilation*} buffer.
+
   Emacs does not expect a compiler process to launch asynchronous
 subprocesses; if it does, and they keep running after the main
 compiler process has terminated, Emacs may kill them or their output
@@ -146,21 +154,23 @@
 @node Compilation Mode
 @section Compilation Mode
 
-@findex compile-goto-error
 @cindex Compilation mode
 @cindex mode, Compilation
-  The @samp{*compilation*} buffer uses a special major mode, Compilation
-mode, whose main feature is to provide a convenient way to look at the
-source line where the error happened.
+  The @samp{*compilation*} buffer uses a special major mode,
+Compilation mode, whose main feature is to provide a convenient way to
+visit the source line corresponding to an error message.  These
+commands are also available in other special buffers that list
+locations in files, including those made by @kbd{M-x grep} and
+@kbd{M-x occur}.
 
 @table @kbd
 @item M-g M-n
 @itemx M-g n
 @itemx C-x `
-Visit the locus of the next compiler error message or @code{grep} match.
+Visit the locus of the next error message or match.
 @item M-g M-p
 @itemx M-g p
-Visit the locus of the previous compiler error message or @code{grep} match.
+Visit the locus of the previous error message or match.
 @item @key{RET}
 Visit the locus of the error message that point is on.
 This command is used in the compilation buffer.
@@ -183,16 +193,17 @@
 compilation buffer produce automatic source display.
 @end table
 
-@kindex M-g M-n
-@kindex M-g n
-@kindex C-x `
-@findex next-error
+@findex compile-goto-error
   You can visit the source for any particular error message by moving
 point in the @samp{*compilation*} buffer to that error message and
 typing @key{RET} (@code{compile-goto-error}).  Alternatively, you can
 click @kbd{Mouse-2} on the error message; you need not switch to the
 @samp{*compilation*} buffer first.
 
+@kindex M-g M-n
+@kindex M-g n
+@kindex C-x `
+@findex next-error
 @vindex next-error-highlight
   To parse the compiler error messages sequentially, type @kbd{C-x `}
 (@code{next-error}).  The character following the @kbd{C-x} is the
@@ -203,27 +214,30 @@
 highlights the relevant source line.  You can change the behavior of
 this highlighting with the variable @code{next-error-highlight}.
 
-  The first time @kbd{C-x `} is used after the start of a compilation,
-it moves to the first error's location.  Subsequent uses of @kbd{C-x `}
-advance down to subsequent errors.  If you visit a specific error
-message with @key{RET} or @kbd{Mouse-2}, subsequent @kbd{C-x `}
-commands advance from there.  When @kbd{C-x `} gets to the end of the
+  The first time @w{@kbd{C-x `}} is used after the start of a compilation,
+it moves to the first error's location.  Subsequent uses of @kbd{C-x
+`} advance down to subsequent errors.  If you visit a specific error
+message with @key{RET} or @kbd{Mouse-2}, subsequent @w{@kbd{C-x `}}
+commands advance from there.  When @w{@kbd{C-x `}} gets to the end of the
 buffer and finds no more error messages to visit, it fails and signals
-an Emacs error.
+an Emacs error.  @w{@kbd{C-u C-x `}} starts scanning from the beginning of
+the compilation buffer, and goes to the first error's location.
 
 @vindex compilation-skip-threshold
-  By default, @kbd{C-x `} skips less important messages.  The variable
+  By default, @w{@kbd{C-x `}} skips less important messages.  The variable
 @code{compilation-skip-threshold} controls this.  If its value is 2,
-@kbd{C-x `} skips anything less than error, 1 skips anything less
-than warning, and 0 doesn't skip any messages.
+@w{@kbd{C-x `}} skips anything less than error, 1 skips anything less
+than warning, and 0 doesn't skip any messages.  The default is 1.
 
-When the left fringe is displayed, an arrow points to the
-current message in the compilation buffer. The variable
+  When the window has a left fringe, an arrow in the fringe points to
+the current message in the compilation buffer. The variable
 @code{compilation-context-lines} controls the number of lines of
-leading context in the window before the current message.  If it is
-@code{nil} and the left fringe is displayed, the window doesn't
-scroll.  If there is no left fringe, no arrow is displayed and a value
-of @code{nil} means display the message at the top of the window.
+leading context to display before the current message.  Going to an
+error message location scrolls the @samp{*compilation*} buffer to put
+the message that far down from the top.  The value @code{nil} is
+special: if there's a left fringe, the window doesn't scroll at all
+if the message is already visible.  If there is no left fringe,
+@code{nil} means display the message at the top of the window.
 
   If you're not in the compilation buffer when you run
 @code{next-error}, Emacs will look for a buffer that contains error
@@ -233,9 +247,6 @@
 buffers.  @code{next-error} signals an error if it can't find any such
 buffer.
 
-  @kbd{C-u C-x `} starts scanning from the beginning of the compilation
-buffer.  This is one way to process the same set of errors again.
-
 @vindex compilation-error-regexp-alist
 @vindex grep-regexp-alist
   To parse messages from the compiler, Compilation mode uses the
@@ -280,23 +291,16 @@
 @node Compilation Shell
 @section Subshells for Compilation
 
-  Emacs uses a shell to run the compilation command, but specifies
-the option for a noninteractive shell.  This means, in particular, that
+  Emacs uses a shell to run the compilation command, but specifies the
+option for a noninteractive shell.  This means, in particular, that
 the shell should start with no prompt.  If you find your usual shell
 prompt making an unsightly appearance in the @samp{*compilation*}
 buffer, it means you have made a mistake in your shell's init file by
 setting the prompt unconditionally.  (This init file's name may be
-@file{.bashrc}, @file{.profile}, @file{.cshrc}, @file{.shrc}, or various
-other things, depending on the shell you use.)  The shell init file
-should set the prompt only if there already is a prompt.  In csh, here
-is how to do it:
-
-@example
-if ($?prompt) set prompt = @dots{}
-@end example
-
-@noindent
-And here's how to do it in bash:
+@file{.bashrc}, @file{.profile}, @file{.cshrc}, @file{.shrc}, or
+various other things, depending on the shell you use.)  The shell init
+file should set the prompt only if there already is a prompt.  Here's
+how to do it in bash:
 
 @example
 if [ "$@{PS1+set@}" = set ]
@@ -304,6 +308,13 @@
 fi
 @end example
 
+@noindent
+And here's how to do it in csh:
+
+@example
+if ($?prompt) set prompt = @dots{}
+@end example
+
   There may well be other things that your shell's init file
 ought to do only for an interactive shell.  You can use the same
 method to conditionalize them.
@@ -335,18 +346,18 @@
 @end table
 
 @findex grep
-  To run @code{grep}, type @kbd{M-x grep}, then enter a command line that
-specifies how to run @code{grep}.  Use the same arguments you would give
-@code{grep} when running it normally: a @code{grep}-style regexp
-(usually in single-quotes to quote the shell's special characters)
-followed by file names, which may use wildcards.  If you specify a
-prefix argument for @kbd{M-x grep}, it figures out the tag
+  To run @code{grep}, type @kbd{M-x grep}, then enter a command line
+that specifies how to run @code{grep}.  Use the same arguments you
+would give @code{grep} when running it normally: a @code{grep}-style
+regexp (usually in single-quotes to quote the shell's special
+characters) followed by file names, which may use wildcards.  If you
+specify a prefix argument for @kbd{M-x grep}, it detects the tag
 (@pxref{Tags}) around point, and puts that into the default
 @code{grep} command.
 
   The output from @code{grep} goes in the @samp{*grep*} buffer.  You
-can find the corresponding lines in the original files using @kbd{C-x
-`}, @key{RET}, and so forth, just like compilation errors.
+can find the corresponding lines in the original files using @w{@kbd{C-x
+`}}, @key{RET}, and so forth, just like compilation errors.
 
   Some grep programs accept a @samp{--color} option to output special
 markers around matches for the purpose of highlighting.  You can make
@@ -403,12 +414,11 @@
 @c Do you believe in GUD?
 The GUD (Grand Unified Debugger) library provides an interface to
 various symbolic debuggers from within Emacs.  We recommend the
-debugger GDB, which is free software, but you can also run DBX, SDB or
-XDB if you have them.  GUD can also serve as an interface to Perl's
-debugging mode, the Python debugger PDB, the bash debugger, and to
-JDB, the Java Debugger.  @xref{Debugging,, The Lisp Debugger, elisp,
-the Emacs Lisp Reference Manual}, for information on debugging Emacs
-Lisp programs.
+debugger GDB, which is free software, but GUD can also run DBX, SDB or
+XDB.  GUD can also serve as an interface to Perl's debugging mode, the
+Python debugger PDB, the Bash debugger, and to JDB, the Java Debugger.
+@xref{Debugging,, The Lisp Debugger, elisp, the Emacs Lisp Reference
+Manual}, for information on debugging Emacs Lisp programs.
 
 @menu
 * Starting GUD::	How to start a debugger subprocess.
@@ -429,24 +439,27 @@
 @table @kbd
 @item M-x gdb @key{RET} @var{file} @key{RET}
 @findex gdb
-Run GDB as a subprocess of Emacs.  By default, this operates in
-graphical mode; @xref{GDB Graphical Interface}.  Graphical mode
-does not support any other debuggers.
+Run GDB as a subprocess of Emacs.  By default, this uses an IDE-like
+graphical interface; see @ref{GDB Graphical Interface}.  Only GDB
+works with the graphical interface.
 
 @item M-x dbx @key{RET} @var{file} @key{RET}
 @findex dbx
-Similar, but run DBX instead of GDB.
+Run DBX as a subprocess of Emacs.  Since Emacs does not implement a
+graphical interface for DBX, communication with DBX works by typing
+commands in the GUD interaction buffer.  The same is true for all
+the other supported debuggers.
 
 @item M-x xdb @key{RET} @var{file} @key{RET}
 @findex xdb
 @vindex gud-xdb-directories
-Similar, but run XDB instead of GDB.  Use the variable
+Similar, but run XDB.  Use the variable
 @code{gud-xdb-directories} to specify directories to search for source
 files.
 
 @item M-x sdb @key{RET} @var{file} @key{RET}
 @findex sdb
-Similar, but run SDB instead of GDB.
+Similar, but run SDB.
 
   Some versions of SDB do not mention source file names in their
 messages.  When you use them, you need to have a valid tags table
@@ -484,27 +497,25 @@
 @subsection Debugger Operation
 
 @cindex fringes, and current execution line in GUD
-  When you run a debugger with GUD, the debugger uses an Emacs buffer
-for its ordinary input and output.  This is called the GUD buffer.  The
-debugger displays the source files of the program by visiting them in
-Emacs buffers.  An arrow (@samp{=>}) in one of these buffers indicates
-the current execution line.@footnote{Under a window system, the arrow
-appears in the left fringe of the Emacs window.}  Moving point in this
-buffer does not move the arrow.
+  When you run a debugger with GUD using the textual interface, the
+debugger uses an Emacs buffer for its ordinary input and output.  This
+is called the GUD buffer.  Input and output from the program you are
+debugging also use this buffer.
+
+  The debugger displays the source files of the program by visiting
+them in Emacs buffers.  An arrow in the left fringe indicates the
+current execution line.@footnote{On a text-only terminal, the arrow
+appears as @samp{=>} and overlays the first two text columns.}  Moving
+point in this buffer does not move the arrow.  The arrow is not part
+of the file's text; it appears only on the screen.
 
   You can start editing these source files at any time in the buffers
-that display them.  The arrow is not part of the file's
-text; it appears only on the screen.  If you do modify a source file,
-keep in mind that inserting or deleting lines will throw off the arrow's
-positioning; GUD has no way of figuring out which line corresponded
-before your changes to the line number in a debugger message.  Also,
-you'll typically have to recompile and restart the program for your
-changes to be reflected in the debugger's tables.
-
-  If you wish, you can control your debugger process entirely through the
-debugger buffer, which uses a variant of Shell mode.  All the usual
-commands for your debugger are available, and you can use the Shell mode
-history commands to repeat them.  @xref{Shell Mode}.
+that display them.  If you do modify a source file, keep in mind that
+inserting or deleting lines will throw off the arrow's positioning;
+GUD has no way of figuring out which line corresponded before your
+changes to the line number in a debugger message.  Also, you'll
+typically have to recompile and restart the program for your changes
+to be reflected in the debugger's tables.
 
 @cindex tooltips with GUD
 @vindex tooltip-gud-modes
@@ -521,23 +532,30 @@
 @code{gud-tooltip-echo-area} is non-@code{nil} then the variable's
 value is displayed in the echo area.
 
-With GDB in text command mode (@pxref{GDB Graphical Interface}),
-it is possible that use of GUD tooltips can cause a function to be
-called with harmful side-effects.  In this case, Emacs disables
-them.
+  GUD tooltips are disabled when you use GDB in text command mode
+(@pxref{GDB Graphical Interface}), because displaying an expression's
+value in GDB can sometimes expand a macro and result in a side effect
+that interferes with the program's operation.  The GDB graphical
+interface supports GUD tooltips and assures they will not cause side
+effects.
 
 @node Commands of GUD
 @subsection Commands of GUD
 
   The GUD interaction buffer uses a variant of Shell mode, so the
-commands of Shell mode are available (@pxref{Shell Mode}).  GUD mode
-also provides commands for setting and clearing breakpoints, for
-selecting stack frames, and for stepping through the program.  These
-commands are available both in the GUD buffer and globally, but with
-different key bindings.  It also has its own tool bar from which you
-can invoke the more common commands by clicking on the appropriate
-icon.  This is particularly useful for repetitive commands like
-gud-next and gud-step and allows the user to hide the GUD buffer.
+Emacs commands of Shell mode are available (@pxref{Shell Mode}).  All
+the usual commands for your debugger are available, and you can use
+the Shell mode history commands to repeat them.  If you wish, you can
+control your debugger process entirely through this buffer.
+
+  GUD mode also provides commands for setting and clearing
+breakpoints, for selecting stack frames, and for stepping through the
+program.  These commands are available both in the GUD buffer and
+globally, but with different key bindings.  It also has its own tool
+bar from which you can invoke the more common commands by clicking on
+the appropriate icon.  This is particularly useful for repetitive
+commands like @code{gud-next} and @code{gud-step}, and allows you to
+keep the GUD buffer hidden.
 
   The breakpoint commands are normally used in source file buffers,
 because that is the easiest way to specify where to set or clear the
@@ -550,7 +568,7 @@
 @end table
 
 @kindex C-x C-a @r{(GUD)}
-  Here are the other special commands provided by GUD.  The keys
+  Here are the other special commands provided by GUD@.  The keys
 starting with @kbd{C-c} are available only in the GUD interaction
 buffer.  The key bindings that start with @kbd{C-x C-a} are available in
 the GUD interaction buffer and also in source files.
@@ -606,9 +624,9 @@
 @kindex C-c C-t @r{(GUD)}
 @itemx C-x C-a C-t
 @findex gud-tbreak
-Set a temporary breakpoint on the current source line, if any.
-If you use this command in the GUD interaction buffer,
-it applies to the line where the program last stopped.
+Set a temporary breakpoint on the current source line, if any
+(@code{gud-tbreak}).  If you use this command in the GUD interaction
+buffer, it applies to the line where the program last stopped.
 @end table
 
   The above commands are common to all supported debuggers.  If you are
@@ -620,14 +638,14 @@
 @itemx C-x C-a <
 @findex gud-up
 Select the next enclosing stack frame (@code{gud-up}).  This is
-equivalent to the @samp{up} command.
+equivalent to the GDB command @samp{up}.
 
 @item C-c >
 @kindex C-c > @r{(GUD)}
 @itemx C-x C-a >
 @findex gud-down
 Select the next inner stack frame (@code{gud-down}).  This is
-equivalent to the @samp{down} command.
+equivalent to the GDB command @samp{down}.
 @end table
 
   If you are using GDB, these additional key bindings are available:
@@ -643,29 +661,28 @@
 @kindex C-c C-u @r{(GUD)}
 @itemx C-x C-a C-u
 @findex gud-until
-Continue execution to the current line. The program will run until
-it hits a breakpoint, terminates, gets a signal that the debugger is
-checking for, or reaches the line on which the cursor currently sits
-(@code{gud-until}).
+Continue execution to the current line (@code{gud-until}).  The
+program will run until it hits a breakpoint, terminates, gets a signal
+that the debugger is checking for, or reaches the line on which the
+cursor currently sits.
 
 @item @key{TAB}
 @kindex TAB @r{(GUD)}
 @findex gud-gdb-complete-command
 With GDB, complete a symbol name (@code{gud-gdb-complete-command}).
-This key is available only in the GUD interaction buffer, and requires
-GDB versions 4.13 and later.
+This key is available only in the GUD interaction buffer.
 
 @item C-c C-f
 @kindex C-c C-f @r{(GUD)}
 @itemx C-x C-a C-f
 @findex gud-finish
-Run the program until the selected stack frame returns (or until it
-stops for some other reason).
+Run the program until the selected stack frame returns or 
+stops for some other reason (@code{gud-finish}).
 
 @item C-x C-a C-j
 @kindex C-x C-a C-j @r{(GUD)}
 @findex gud-jump
-Only useful in a source buffer, (@code{gud-jump}) transfers the
+Only useful in a source buffer, @code{gud-jump} transfers the
 program's execution point to the current line.  In other words, the
 next line that the program executes will be the one where you gave the
 command.  If the new execution line is in a different function from
@@ -691,11 +708,13 @@
 @vindex perldb-mode-hook
 @vindex pdb-mode-hook
 @vindex jdb-mode-hook
+@vindex bashdb-mode-hook
   On startup, GUD runs one of the following hooks: @code{gdb-mode-hook},
 if you are using GDB; @code{dbx-mode-hook}, if you are using DBX;
 @code{sdb-mode-hook}, if you are using SDB; @code{xdb-mode-hook}, if you
 are using XDB; @code{perldb-mode-hook}, for Perl debugging mode;
-@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB.  You can
+@code{pdb-mode-hook}, for PDB; @code{jdb-mode-hook}, for JDB;
+@code{bashdb-mode-hook}, for the Bash debugger.  You can
 use these hooks to define custom key bindings for the debugger
 interaction buffer.  @xref{Hooks}.
 
@@ -750,37 +769,37 @@
 @node GDB Graphical Interface
 @subsection GDB Graphical Interface
 
-@findex gdb-mouse-set-clear-breakpoint
-@findex gdb-mouse-toggle-breakpoint
   By default, the command @code{gdb} starts GDB using a graphical
-interface where you view and control the program's data using Emacs
-windows.  You can still interact with GDB through the GUD buffer, but
-the point of this mode is that you can do it through menus and clicks,
-without needing to know GDB commands.  For example, you can click
-@kbd{Mouse-1} in the fringe or display margin of a source buffer to
-set a breakpoint there and, on a graphical display, a red bullet will
-appear.  If a breakpoint already exists on that line, this action will
-remove it.  You can also enable or disable a breakpoint by clicking
-@kbd{Mouse-3} on the bullet.  If you drag the debugger arrow in the
-fringe with @kbd{Mouse-1}, execution will continue to the line where
-you release the button, provided it is still in the same frame
-(@code{gdb-mouse-until}).  Alternatively, you can click @kbd{Mouse-2}
-at some point in the fringe of this buffer and execution will advance
-to there.
+interface, using Emacs windows for display program state information.
+In effect, this makes Emacs into an IDE (interactive development
+environment).  With it, you do not need to use textual GDB commands;
+you can control the debugging session with the mouse.
 
-This mode requires that GDB think that the screen size is unlimited,
-and sets the height and width accordingly.  For correct operation it
-is important that you don't change these values during the session.
+@c @findex gdb-mouse-set-clear-breakpoint
+@c @findex gdb-mouse-toggle-breakpoint
+  For example, you can click @kbd{Mouse-1} in the fringe or display
+margin of a source buffer to set a breakpoint there and, on a
+graphical display, a red bullet will appear on that line.  If a
+breakpoint already exists on that line, the same click will remove it.
+You can also enable or disable a breakpoint by clicking @kbd{Mouse-3}
+on the bullet.  If you drag the debugger arrow in the fringe with
+@kbd{Mouse-1} (@code{gdb-mouse-until}), execution will continue to the
+line where you release the button, provided it is still in the same
+frame.  Alternatively, you can click @kbd{Mouse-2} at some point in
+the fringe of this buffer and execution will advance to there.
+
+  This mode requires telling GDB that its ``screen size'' is
+unlimited, so it sets the height and width accordingly.  For correct
+operation you must not change these values during the GDB session.
 
 @vindex gud-gdb-command-name
 @findex gdba
-  You can also run GDB in text command mode, which creates a buffer
-for input and output to GDB.  To do this, set
-@code{gud-gdb-command-name} to @code{"gdb --fullname"} or edit the
-startup command in the minibuffer to say that.  You need to do use
-text command mode to run multiple debugging sessions within one Emacs
-session.  If you have customized @code{gud-gdb-command-name} in that
-way, then you can use @kbd{M-x gdba} to invoke GDB in graphical mode.
+  You can also run GDB in text command mode, like other debuggers.  To
+do this, set @code{gud-gdb-command-name} to @code{"gdb --fullname"} or
+edit the startup command in the minibuffer to say that.  You need to
+do use text command mode to run multiple debugging sessions within one
+Emacs session.  If you have customized @code{gud-gdb-command-name} in
+that way, you can use @kbd{M-x gdba} to invoke GDB in graphical mode.
 
 @menu
 * GDB User Interface Layout::   Control the number of displayed buffers.
@@ -795,19 +814,16 @@
 @subsubsection GDB User Interface Layout
 @cindex GDB User Interface layout
 
-@findex gdb-many-windows
 @vindex gdb-many-windows
+  If the variable @code{gdb-many-windows} is @code{nil} (the default
+value) then @kbd{M-x gdb} normally displays only the GUD buffer.
+However, if the variable @code{gdb-show-main} is also non-@code{nil},
+it starts with two windows: one displaying the GUD buffer, and the
+other showing the source for the @code{main} function of the program
+you are debugging.
 
-If the variable @code{gdb-many-windows} is @code{nil} (the default
-value) then gdb just pops up the GUD buffer unless the variable
-@code{gdb-show-main} is non-@code{nil}.  In this case it starts with
-two windows: one displaying the GUD buffer and the other with the
-source file with the main routine of the inferior.
-
-If @code{gdb-many-windows} is non-@code{nil}, regardless of the value of
-@code{gdb-show-main}, the layout below will appear unless
-@code{gdb-use-inferior-io-buffer} is @code{nil}.  In this case the
-source buffer occupies the full width of the frame.
+  If @code{gdb-many-windows} is non-@code{nil}, then @kbd{M-x gdb}
+displays the following frame layout:
 
 @example
 +--------------------------------+--------------------------------+
@@ -825,121 +841,131 @@
 +--------------------------------+--------------------------------+
 @end example
 
-To toggle this layout, do @kbd{M-x gdb-many-windows}.
+  However, if @code{gdb-use-inferior-io-buffer} is @code{nil}, the I/O
+buffer does not appear and the source buffer occupies the full width
+of the frame.
 
 @findex gdb-restore-windows
-If you change the window layout, for example, while editing and
-re-compiling your program, then you can restore it with the command
-@code{gdb-restore-windows}.
+  If you change the window layout, for example, while editing and
+re-compiling your program, then you can restore this standard window
+layout with the command @code{gdb-restore-windows}.
 
-You may also choose which additional buffers you want to display,
-either in the same frame or a different one.  Select them from
-@samp{GUD->GDB-windows} or @samp{GUD->GDB-Frames} sub-menu
-respectively.  If the menu-bar is unavailable, type @code{M-x
+@findex gdb-many-windows
+  To switch between this standard layout and a simple layout
+containing just the GUD buffer and a source file, type @kbd{M-x
+gdb-many-windows}.
+
+  You may also specify additional GUD-related buffers to display,
+either in the same frame or a different one.  Select the buffers you
+want with the @samp{GUD->GDB-windows} and @samp{GUD->GDB-Frames}
+sub-menus.  If the menu-bar is unavailable, type @code{M-x
 gdb-display-@var{buffertype}-buffer} or @code{M-x
 gdb-frame-@var{buffertype}-buffer} respectively, where
-@var{buffertype} is the relevant buffer type e.g breakpoints.
-Most of these buffers are read-only and be killed by simply
-pressing @kbd{q} in them.
+@var{buffertype} is the relevant buffer type, such as
+@samp{breakpoints}.  Most of these buffers are read-only, and typing
+@kbd{q} in them kills them.
 
-When you finish debugging then kill the GUD buffer with @kbd{C-x k},
+  When you finish debugging, kill the GUD buffer with @kbd{C-x k},
 which will also kill all the buffers associated with the session.
 However you need not do this if, after editing and re-compiling your
 source code within Emacs, you wish continue debugging.  When you
 restart execution, GDB will automatically find your new executable.
 Keeping the GUD buffer has the advantage of keeping the shell history
-as well as GDB's breakpoints.  You need to check, however, that the
-breakpoints in the recently edited code are still where you want them.
+as well as GDB's breakpoints.  You do need to check that the
+breakpoints in recently edited source files are still in the right
+places.
 
 @node Breakpoints Buffer
 @subsubsection Breakpoints Buffer
 
-The breakpoints buffer shows the existing breakpoints and watchpoints
-(@pxref{Breakpoints,,, gdb, The GNU debugger}).  It has three special
-commands:
+  The breakpoints buffer shows the existing breakpoints and
+watchpoints (@pxref{Breakpoints,,, gdb, The GNU debugger}).  It has
+these special commands, which mostly apply to the @dfn{current
+breakpoint}, the breakpoint which point is on.
 
 @table @kbd
 @item @key{SPC}
 @kindex SPC @r{(GDB breakpoints buffer)}
 @findex gdb-toggle-breakpoint
-Enable/disable the breakpoint at the current line
-(@code{gdb-toggle-breakpoint}).  On a graphical display, this changes
-the color of a bullet in the margin of the source buffer at the
-relevant line.  This is red when the breakpoint is enabled and grey
-when it is disabled.  Text-only terminals correspondingly display
-a @samp{B} or @samp{b}.
+Enable/disable the current breakpoint (@code{gdb-toggle-breakpoint}).
+On a graphical display, this changes the color of a bullet in the
+margin of the source buffer at the relevant line.  This is red when
+the breakpoint is enabled and grey when it is disabled.  Text-only
+terminals correspondingly display a @samp{B} or @samp{b}.
 
 @item D
 @kindex D @r{(GDB breakpoints buffer)}
 @findex gdb-delete-breakpoint
-Delete the breakpoint at the current line (@code{gdb-delete-breakpoint}).
+Delete the current breakpoint (@code{gdb-delete-breakpoint}).
 
 @item @key{RET}
 @kindex RET @r{(GDB breakpoints buffer)}
 @findex gdb-goto-breakpoint
-Display the file in the source buffer at the breakpoint specified at
-the current line (@code{gdb-goto-breakpoint}).  Alternatively, click
-@kbd{Mouse-2} on the breakpoint that you wish to visit.
+Visit the source line for the current breakpoint
+(@code{gdb-goto-breakpoint}).
+
+@item Mouse-2
+@kindex Mouse-2 @r{(GDB breakpoints buffer)}
+Visit the source line for the breakpoint you click on.
 @end table
 
 @node Stack Buffer
 @subsubsection Stack Buffer
 
-The stack buffer displays a @dfn{call stack}, with one line for each
+  The stack buffer displays a @dfn{call stack}, with one line for each
 of the nested subroutine calls (@dfn{stack frames}) now active in the
 program.  @xref{Backtrace,, Backtraces, gdb, The GNU debugger}.
 
 @findex gdb-frames-select
-The selected frame number is displayed in reverse contrast.  Move
-point to any frame in the stack and type @key{RET} to select it
-(@code{gdb-frames-select}) and display the associated source in the
-source buffer.  Alternatively, click @kbd{Mouse-2} on a frame to
-select it.  If the locals buffer is displayed then its contents update
-to display the variables that are local to the new frame.
+  The selected frame number is displayed in reverse contrast.  To
+select a frame in GDB, move point in the stack buffer to that stack
+frame and type @key{RET} (@code{gdb-frames-select}), or click
+@kbd{Mouse-2} on a stack frame.  If the locals buffer is visible,
+selecting a stack frame updates it to display the local variables of
+the new frame.
 
 @node Watch Expressions
 @subsubsection Watch Expressions
 @cindex Watching expressions in GDB
 
 @findex gud-watch
-If you want to see how a variable changes each time your program stops
-then place the cursor over the variable name and click on the watch
-icon in the tool bar (@code{gud-watch}).
+  If you want to see how a variable changes each time your program
+stops, move point into the variable name and click on the watch icon
+in the tool bar (@code{gud-watch}).
 
-Each watch expression is displayed in the speedbar.  Complex data
+  Each watch expression is displayed in the speedbar.  Complex data
 types, such as arrays, structures and unions are represented in a tree
 format.  Leaves and simple data types show the name of the expression
 and its value, and display the type as a tooltip.  Higher levels show
 the name, type and address value for pointers and just the name and
 type otherwise.
 
-To expand or contract a complex data type, click @kbd{Mouse-2}
+  To expand or contract a complex data type, click @kbd{Mouse-2}
 on the tag to the left of the expression.
 
 @findex gdb-var-delete
-With the cursor over the root expression of a complex data type, type
-@kbd{D} to delete it from the speedbar
-(@code{gdb-var-delete}).
+  To delete a complex watch expression, move point to the root
+expression in the speedbar and type @kbd{D} (@code{gdb-var-delete}).
 
 @kindex RET @r{(GDB speedbar)}
 @findex gdb-edit-value
-With the cursor over a simple data type or an element of a complex
-data type which holds a value, type @key{RET} or click @kbd{Mouse-2} to edit
-its value.  A prompt for a new value appears in the mini-buffer
-(@code{gdb-edit-value}).
+  To edit a variable with a simple data type, or a simple element of a
+complex data type, move point there in the speedbar and type @key{RET}
+(@code{gdb-edit-value}).  Or you can click @kbd{Mouse-2} on a value to
+edit it.  Either way, this reads the new value using the minibuffer.
 
 @vindex gdb-show-changed-values
-If you set the variable @code{gdb-show-changed-values} to
-non-@code{nil} (the default value), Emacs will use
-font-lock-warning-face to display values that have recently changed in
-the speedbar.
+  If you set the variable @code{gdb-show-changed-values} to
+non-@code{nil} (the default value), Emacs uses
+@code{font-lock-warning-face} to highlight values that have recently
+changed.
 
 @vindex gdb-use-colon-colon-notation
-If you set the variable @code{gdb-use-colon-colon-notation} to a
-non-@code{nil} value then, in C, Emacs will use the
-@var{function}::@var{variable} format to display variables in the
-speedbar.  Since this does not work for variables defined in compound
-statements, the default value is @code{nil}.
+  If the variable @code{gdb-use-colon-colon-notation} is
+non-@code{nil}, Emacs uses the @samp{@var{function}::@var{variable}}
+format to display variables in the speedbar.  Since this does not work
+for variables defined in compound statements, the default value is
+@code{nil}.
 
 @node Other GDB User Interface Buffers
 @subsubsection Other Buffers
@@ -949,8 +975,9 @@
 @vindex gdb-use-inferior-io-buffer
 If the variable @code{gdb-use-inferior-io-buffer} is non-@code{nil},
 the executable program that is being debugged takes its input and
-displays its output here, otherwise it uses the GUD buffer.  To toggle
-the use of this buffer, do @kbd{M-x gdb-use-inferior-io-buffer}.
+displays its output here.  Otherwise it uses the GUD buffer for that.
+To toggle the use of this buffer, do @kbd{M-x
+gdb-use-inferior-io-buffer}.
 
 Some of the commands from shell mode are available here.  @xref{Shell
 Mode}.
@@ -972,15 +999,15 @@
 (@pxref{Registers,,, gdb, The GNU debugger}).  Press @key{RET} or
 click @kbd{Mouse-2} on a register if you want to change its value.
 With GDB 6.4 or later, recently changed register values display with
-font-lock-warning-face.  With earlier versions of GDB, you can press
-@key{SPC} to toggle the display of floating point registers
+@code{font-lock-warning-face}.  With earlier versions of GDB, you can
+press @key{SPC} to toggle the display of floating point registers
 (@code{toggle-gdb-all-registers}).
 
 @item Assembler Buffer
 The assembler buffer displays the current frame as machine code.  An
-overlay arrow points to the current instruction and you can set and
-remove breakpoints as with the source buffer.  Breakpoint icons also
-appear in the fringe or margin.
+arrow points to the current instruction, and you can set and remove
+breakpoints as in a source buffer.  Breakpoint icons also appear in
+the fringe or margin.
 
 @item Threads Buffer
 @findex gdb-threads-select
@@ -990,15 +1017,15 @@
 list and press @key{RET} to select it (@code{gdb-threads-select}) and
 display the associated source in the source buffer.  Alternatively,
 click @kbd{Mouse-2} on a thread to select it.  If the locals buffer is
-displayed then its contents update to display the variables that are
-local to the new thread.
+visible, its contents update to display the variables that are local
+in the new thread.
 
 @item Memory Buffer
-The memory buffer allows the user to examine sections of program
-memory (@pxref{Memory, Memory, Examining memory, gdb, The GNU
-debugger}).  Click @kbd{Mouse-1} on the appropriate part of the header
-line to change the starting address or number of data items that the
-buffer displays.  Click @kbd{Mouse-3} on the header line to select the
+The memory buffer lets you examine sections of program memory
+(@pxref{Memory, Memory, Examining memory, gdb, The GNU debugger}).
+Click @kbd{Mouse-1} on the appropriate part of the header line to
+change the starting address or number of data items that the buffer
+displays.  Click @kbd{Mouse-3} on the header line to select the
 display format or unit size for these data items.
 
 @end table
@@ -1045,6 +1072,14 @@
 conventionally end in @file{.el}.  This ending tells Emacs to edit them in
 Emacs-Lisp mode (@pxref{Executing Lisp}).
 
+@cindex byte code
+  Emacs Lisp code can be compiled into byte-code, which loads faster,
+takes up less space, and executes faster.  @xref{Byte Compilation,,
+Byte Compilation, elisp, the Emacs Lisp Reference Manual}.  By
+convention, the compiled code for a library goes in a separate file
+whose name ends in @samp{.elc}.  Thus, the compiled code for
+@file{foo.el} goes in @file{foo.elc}.
+
 @findex load-file
   To execute a file of Emacs Lisp code, use @kbd{M-x load-file}.  This
 command reads a file name using the minibuffer and then executes the
@@ -1055,9 +1090,9 @@
 @findex load
 @findex load-library
   Once a file of Lisp code is installed in the Emacs Lisp library
-directories, users can load it using @kbd{M-x load-library}.  Programs can
-load it by calling @code{load-library}, or with @code{load}, a more primitive
-function that is similar but accepts some additional arguments.
+directories, users can load it using @kbd{M-x load-library}.  Programs
+can load it by calling @code{load}, a more primitive function that is
+similar but accepts some additional arguments.
 
   @kbd{M-x load-library} differs from @kbd{M-x load-file} in that it
 searches a sequence of directories and tries three file names in each
@@ -1068,9 +1103,11 @@
 compiled file, since it will load and run faster.
 
   If @code{load-library} finds that @file{@var{lib}.el} is newer than
-@file{@var{lib}.elc} file, it issues a warning, because it's likely that
-somebody made changes to the @file{.el} file and forgot to recompile
-it.
+@file{@var{lib}.elc} file, it issues a warning, because it's likely
+that somebody made changes to the @file{.el} file and forgot to
+recompile it.  Nonetheless, it loads @file{@var{lib}.elc}.  This is
+because people often leave unfinished edits the source file, and don't
+recompile it until they think it is ready to use.
 
   Because the argument to @code{load-library} is usually not in itself
 a valid file name, file name completion is not available.  Indeed, when
@@ -1080,7 +1117,7 @@
 @vindex load-path
   The sequence of directories searched by @kbd{M-x load-library} is
 specified by the variable @code{load-path}, a list of strings that are
-directory names.  The default value of the list contains the directory where
+directory names.  The default value of the list contains the directories where
 the Lisp code for Emacs itself is stored.  If you have libraries of
 your own, put them in a single directory and add that directory
 to @code{load-path}.  @code{nil} in this list stands for the current default
@@ -1096,15 +1133,6 @@
 the library; this replaces the autoload definitions with the real ones
 from the library.
 
-@cindex byte code
-  Emacs Lisp code can be compiled into byte-code which loads faster,
-takes up less space when loaded, and executes faster.  @xref{Byte
-Compilation,, Byte Compilation, elisp, the Emacs Lisp Reference Manual}.
-By convention, the compiled code for a library goes in a separate file
-whose name consists of the library source file with @samp{c} appended.
-Thus, the compiled code for @file{foo.el} goes in @file{foo.elc}.
-That's why @code{load-library} searches for @samp{.elc} files first.
-
 @vindex load-dangerous-libraries
 @cindex Lisp files byte-compiled by XEmacs
   By default, Emacs refuses to load compiled Lisp files which were
@@ -1217,7 +1245,7 @@
 of lists to print in the result of the evaluation commands before
 abbreviating them.  @code{eval-expression-debug-on-error} controls
 whether evaluation errors invoke the debugger when these commands are
-used.
+used; its default is @code{t}.
 
 @node Lisp Interaction
 @section Lisp Interaction Buffers
@@ -1279,9 +1307,9 @@
 
 @findex lisp-mode
   For the source files of programs to run in external Lisps, use Lisp
-mode.  This mode can be selected with @kbd{M-x lisp-mode}, and is used
-automatically for files whose names end in @file{.l}, @file{.lsp}, or
-@file{.lisp}, as most Lisp systems usually expect.
+mode.  You can switch to this mode with @kbd{M-x lisp-mode}, and it is
+used automatically for files whose names end in @file{.l},
+@file{.lsp}, or @file{.lisp}.
 
 @kindex C-M-x @r{(Lisp mode)}
 @findex lisp-eval-defun
@@ -1292,12 +1320,13 @@
 the Lisp process.  (Emacs can send input to any inferior process regardless
 of what buffer is current.)
 
-  Contrast the meanings of @kbd{C-M-x} in Lisp mode (for editing programs
-to be run in another Lisp system) and Emacs-Lisp mode (for editing Lisp
-programs to be run in Emacs): in both modes it has the effect of installing
-the function definition that point is in, but the way of doing so is
-different according to where the relevant Lisp environment is found.
-@xref{Executing Lisp}.
+  Contrast the meanings of @kbd{C-M-x} in Lisp mode (for editing
+programs to be run in another Lisp system) and Emacs-Lisp mode (for
+editing Lisp programs to be run in Emacs; see @pxref{Lisp Eval}): in
+both modes it has the effect of installing the function definition
+that point is in, but the way of doing so is different according to
+where the relevant Lisp environment is found.
+
 
 @ignore
    arch-tag: 9c3c2f71-b332-4144-8500-3ff9945a50ed
--- a/man/cmdargs.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/cmdargs.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -477,7 +477,7 @@
 @file{~/.sh_history} if you use ksh, and to @file{~/.history}
 otherwise.
 @item HOME
-The location of the user's files in the directory tree; used for
+The location of your files in the directory tree; used for
 expansion of file names starting with a tilde (@file{~}).  On MS-DOS,
 it defaults to the directory from which Emacs was started, with
 @samp{/bin} removed from the end if it was present.  On Windows, the
@@ -525,11 +525,11 @@
 @item LOGNAME
 The user's login name.  See also @env{USER}.
 @item MAIL
-The name of the user's system mail inbox.
+The name of your system mail inbox.
 @item MH
 Name of setup file for the mh system.  (The default is @file{~/.mh_profile}.)
 @item NAME
-The real-world name of the user.
+Your real-world name.
 @item NNTPSERVER
 The name of the news server.  Used by the mh and Gnus packages.
 @item ORGANIZATION
@@ -987,7 +987,7 @@
 @samp{-rv} option or with the X resource @samp{reverseVideo}.
 
   The @samp{-fg}, @samp{-bg}, and @samp{-rv} options function on
-text-only terminals as well as on window systems.
+text-only terminals as well as on graphical displays.
 
 @node Window Size X
 @appendixsec Options for Window Size and Position
@@ -1165,7 +1165,7 @@
 @appendixsec Icons
 @cindex icons (X Window System)
 
-  Most window managers allow the user to ``iconify'' a frame, removing
+  Most window managers allow you to ``iconify'' a frame, removing
 it from sight, and leaving a small, distinctive ``icon'' window in its
 place.  Clicking on the icon window makes the frame itself appear again.
 If you have many clients running at once, you can avoid cluttering up
--- a/man/commands.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/commands.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -268,7 +268,7 @@
 
   If you disable multibyte characters, then you can use only one
 alphabet of non-@acronym{ASCII} characters, but they all fit in one byte.  They
-use codes 0200 through 0377.  @xref{Single-Byte Character Support}.
+use codes 0200 through 0377.  @xref{Unibyte Mode}.
 
 @ifnottex
 @lowersections
--- a/man/custom.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/custom.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -117,14 +117,14 @@
 
   Font-Lock mode automatically highlights certain textual units found in
 programs, such as comments, strings, and function names being defined.
-This requires a window system that can display multiple fonts.
+This requires a graphical display that can show multiple fonts.
 @xref{Faces}.
 
   ISO Accents mode makes the characters @samp{`}, @samp{'}, @samp{"},
 @samp{^}, @samp{/} and @samp{~} combine with the following letter, to
 produce an accented letter in the ISO Latin-1 character set.  The
 newer and more general feature of input methods more or less
-supersedes ISO Accents mode.  @xref{Single-Byte Character Support}.
+supersedes ISO Accents mode.  @xref{Unibyte Mode}.
 
   Outline minor mode provides the same facilities as the major mode
 called Outline mode; but since it is a minor mode instead, you can
@@ -201,7 +201,7 @@
 @file{~/.emacs} file (@pxref{Init File}).
 
   The appearance of the example buffers in this section is typically
-different under a window system, since faces are then used to indicate
+different under a graphical display, since faces are then used to indicate
 buttons, links and editable fields.
 
 @menu
@@ -2030,7 +2030,7 @@
 
   When Emacs is started, it normally loads a Lisp program from the
 file @file{.emacs} or @file{.emacs.el} in your home directory
-(see @ref{General Variables, HOME} if you don't know where that is).
+(see @ref{General Variables, HOME}, if you don't know where that is).
 We call this file your @dfn{init file} because it specifies how to
 initialize Emacs for you.  You can use the command line switch
 @samp{-q} to prevent loading your init file, and @samp{-u} (or
@@ -2456,7 +2456,7 @@
 editor customizations even if you are running as the super user.
 
   More precisely, Emacs first determines which user's init file to use.
-It gets the user name from the environment variables @env{LOGNAME} and
+It gets your user name from the environment variables @env{LOGNAME} and
 @env{USER}; if neither of those exists, it uses effective user-ID.
 If that user name matches the real user-ID, then Emacs uses @env{HOME};
 otherwise, it looks up the home directory corresponding to that user
--- a/man/dired.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/dired.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -40,6 +40,8 @@
 * Updating: Dired Updating.   Discarding lines for files of no interest.
 * Find: Dired and Find.	      Using `find' to choose the files for Dired.
 * Wdired::                    Operating on files by editing the Dired buffer.
+* Tumme::                     Image file and thumbnail viewing and 
+                              manipulation from the Dired buffer.
 * Misc: Misc Dired Features.  Various other features.
 @end menu
 
@@ -1140,6 +1142,78 @@
 world-writable.  These changes also take effect when you type @kbd{C-c
 C-c}.
 
+@node Tumme
+@section Thumbnail and image file viewing and manipulation
+
+@cindex tumme mode
+  Tumme provides for simple viewing of thumbnails of image files.  It
+provides viewing of the original file, sized or in full size, inside
+Emacs or in an external viewer.
+
+  Tumme aims to be both easy to use for a beginner but also powerful
+and useful to an experienced user.
+
+  The quickest way to try out Tumme is to use the command
+@code{tumme}.  It will prompt for a directory where there are images
+files.  All images in that directory will get thumbnail files created
+for them, and the thumbnails will be displayed in the ``thumbnail
+buffer''.
+
+  Because thumbnails are created on the fly and before they can be
+displayed, the above command might take a long time, especially the
+first time, if the directory contains many image files.  If the number
+of image files is higher than
+@code{tumme-show-all-from-dir-max-files}, the command will be aborted.
+To work around this you can instead mark the files you want to look
+at, using @kbd{m} as usual in Dired, and then type @kbd{C-t d}
+(@code{tumme-display-thumbs}).
+
+  Regardless of which command you chose to display the thumbnails, a
+new buffer will open up, displaying thumbnail images of the files that
+were marked in dired.  The new buffer will be the active one.
+
+  With point in the thumbnail buffer, type @kbd{RET}
+(@code{tumme-display-thumbnail-original-image}) to display a sized
+version of it in another window.  The image will be sized to fit the
+window.  Use the arrow keys to move around in the buffer.  For easy
+browing, type @kbd{SPC} (@code{tumme-display-next-thumbnail-original})
+to advance and display the next image.  Typing @kbd{DEL}
+(@code{tumme-display-previous-thumbnail-original}) backs up to the
+previous thumbnail and displays that instead.
+
+  If you want to see the image in its original size, either provide a
+prefix argument (@kbd{C-u}) before pressing @kbd{RET}, or type
+@kbd{C-return} (@code{tumme-thumbnail-display-external}) to display
+the image in an external viewer.  To use the latter,
+@code{tumme-external-viewer} must be configured.
+
+  If you find in image that you want to delete, type @kbd{d}
+(@code{tumme-flag-thumb-original-file}) and the file will be flagged
+for deletion in the dired buffer.  If you just want visually to delete
+the thumbnail image from the thumbnail buffer, type @kbd{C-d}
+(@code{tumme-delete-char}).
+
+  More advanced features include commands for using ``tags'' (another
+name for ``keyword'' or ``label'') to tag image files and to search
+for image files with a certain tag.
+
+  The tags put on image files are stored in a database file and can be
+used for marking image files.  For example, you can let Tumme mark all
+files in the current directory tagged with the tag `flowers'.  To tag
+image files, mark them in the dired buffer and type @kbd{C-t t}
+(@code{tumme-tag-files}).  To mark files having a certain tag, type
+@kbd{C-t f} (@code{tumme-mark-tagged-files}).
+
+  After marking image files with a certain tag, they can be viewed as
+explained earlier, by typing @key{C-t d}.
+
+  Tumme also provide simple image manipulation commands, like rotating
+thumbnails and original image files.  In the thumbnail buffer, type
+@kbd{L} to rotate the original image 90 degrees anti clockwise, and
+@kbd{R} to rotate it 90 degrees clockwise.
+
+
+
 @node Misc Dired Features
 @section Other Dired Features
 
--- a/man/display.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/display.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -985,7 +985,7 @@
 in multibyte buffers, but if they do, they are displayed as Latin-1
 graphics.  In unibyte mode, if you enable European display they are
 displayed using their graphics (assuming your terminal supports them),
-otherwise as escape sequences.  @xref{Single-Byte Character Support}.
+otherwise as escape sequences.  @xref{Unibyte Mode}.
 
 @vindex nobreak-char-display
 @cindex no-break space, display
--- a/man/emacs.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/emacs.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -469,7 +469,7 @@
                               that cover the whole spectrum of characters.
 * Defining Fontsets::       Defining a new fontset.
 * Undisplayable Characters::When characters don't display.
-* Single-Byte Character Support:: You can pick one European character set
+* Unibyte Mode::            You can pick one European character set
                               to use without multibyte characters.
 * Charsets::                How Emacs groups its internal character codes.
 
@@ -612,9 +612,7 @@
 Maintaining Programs
 
 * Change Log::	        Maintaining a change history for your program.
-@ignore
-* Authors::             Maintaining the Emacs @file{AUTHORS} file.
-@end ignore
+* Format of ChangeLog:: What the change log file looks like.
 * Tags::	        Go direct to any function in your program in one
 			  command.  Tags remembers which file it is in.
 * Emerge::	        A convenient way of merging two versions of a program.
@@ -956,12 +954,11 @@
 editors, all sharing common principles of organization.  For information on
 the underlying philosophy of Emacs and the lessons learned from its
 development, write for a copy of AI memo 519a, @cite{Emacs, the Extensible,
-Customizable Self-Documenting Display Editor}, to Publications Department,
-Artificial Intelligence Lab, 545 Tech Square, Cambridge, MA 02139, USA@.  At
-last report they charge $2.25 per copy.  Another useful publication is LCS
-TM-165, @cite{A Cookbook for an Emacs}, by Craig Finseth, available from
-Publications Department, Laboratory for Computer Science, 545 Tech Square,
-Cambridge, MA 02139, USA@.  The price today is $3.
+Customizable Self-Documenting Display Editor}, is available from
+@url{ftp://publications.ai.mit.edu/ai-publications/pdf/AIM-519A.pdf}.
+Another useful publication is LCS TM-165, @cite{A Cookbook for an
+Emacs}, by Craig Finseth, is available from the MIT libraries in some
+fashion.
 
 This edition of the manual is intended for use with GNU Emacs
 installed on GNU and Unix systems.  GNU Emacs can also be used on VMS,
@@ -1152,11 +1149,12 @@
 Emacs Lisp Intro, Preface, eintr, An Introduction to Programming in
 Emacs Lisp}, if you want to learn Emacs Lisp programming.
 
-   When running on a graphics terminal, Emacs provides its own menus
+   When running on a graphical display, Emacs provides its own menus
 and convenient handling of mouse buttons.  But Emacs provides many of
-the benefits of a window system even on a text-only terminal.  For
-instance, you can look at or edit several files at once, move text
-between files, and edit files while running shell commands.
+the benefits of a graphical display even on a text-only terminal.  For
+instance, it can highlight parts of a file, display and edit several
+files at once, move text between files, and edit files while running
+shell commands.
 
 @include screen.texi
 @include commands.texi
--- a/man/faq.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/faq.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -9,6 +9,10 @@
 @c This is used in many places
 @set VER 22.1
 
+@c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
+@c Feel free to install changes without prior permission (but I'd
+@c appreciate a notice if you do).
+
 @copying
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 Copyright 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner@*
@@ -55,12 +59,9 @@
 
 This is the GNU Emacs FAQ, last updated on @today{}.
 
-The FAQ is maintained as a Texinfo document, allowing us to create HTML,
-Info, and TeX documents from a single source file, and is slowly but
-surely being improved.  Please bear with us as we improve on this
-format.  This FAQ is maintained as a part of GNU Emacs.  If you find
-any errors, or have any suggestions, please use @kbd{M-x report-emacs-bug}
-to report them.
+This FAQ is maintained as a part of GNU Emacs.  If you find any errors,
+or have any suggestions, please use @kbd{M-x report-emacs-bug} to report
+them.
 
 @menu
 * FAQ notation::
@@ -1173,6 +1174,8 @@
 * Highlighting a region::
 * Controlling case sensitivity::
 * Wrapping words automatically::
+* Searching for/replacing newlines::
+* Yanking text in isearch::
 * Spell-checkers::
 * Checking TeX and *roff documents::
 * Changing load-path::
@@ -1191,7 +1194,7 @@
 * Valid X resources::
 * Evaluating Emacs Lisp code::
 * Changing the length of a Tab::
-* Inserting > at the beginning of each line::
+* Inserting text at the beginning of each line::
 * Underlining paragraphs::
 * Repeating a command as many times as possible::
 * Forcing the cursor to remain in the same column::
@@ -1530,7 +1533,7 @@
 in your @file{.emacs} file.  (Also see @ref{Turning on syntax
 highlighting}.)
 
-@node Controlling case sensitivity, Wrapping words automatically, Highlighting a region, Common requests
+@node Controlling case sensitivity, Searching for/replacing newlines, Highlighting a region, Common requests
 @section How do I control Emacs's case-sensitivity when searching/replacing?
 @cindex @code{case-fold-search}
 @cindex Case sensitivity of searches
@@ -1562,7 +1565,23 @@
            (setq case-fold-search nil)))
 @end lisp
 
-@node Wrapping words automatically, Spell-checkers, Controlling case sensitivity, Common requests
+@node Searching for/replacing newlines, Yanking text in isearch, Controlling case sensitivity, Common requests
+@section How do I input a newline character in isearch or query-replace?
+@cindex Searching for newlines
+@cindex Replacing newlines
+
+Use @kbd{C-q C-j}.  For more information, see @inforef{Special Isearch,
+Special Input for Incremental Search, emacs}.
+
+
+@node Yanking text in isearch, Wrapping words automatically, Searching for/replacing newlines, Common requests
+@section How do I copy text from the kill ring into the search string?
+@cindex Yanking text into the search string
+@cindex isearch yanking
+
+Use @kbd{M-y}.  @inforef{Isearch Yank, Isearch Yanking, emacs}.
+
+@node Wrapping words automatically, Spell-checkers, Yanking text in isearch, Common requests
 @section How do I make Emacs wrap words for me?
 @cindex Wrapping word automatically
 @cindex Wrapping lines
@@ -2098,7 +2117,7 @@
 
 @end itemize
 
-@node Changing the length of a Tab, Inserting > at the beginning of each line, Evaluating Emacs Lisp code, Common requests
+@node Changing the length of a Tab, Inserting text at the beginning of each line, Evaluating Emacs Lisp code, Common requests
 @section How do I change Emacs's idea of the @key{TAB} character's length?
 @cindex Tab length
 @cindex Length of tab character
@@ -2117,8 +2136,9 @@
 @key{TAB} characters.  The latter controls what characters are inserted
 when you press the @key{TAB} character in certain modes.
 
-@node Inserting > at the beginning of each line, Underlining paragraphs, Changing the length of a Tab, Common requests
-@section How do I insert @samp{>} at the beginning of every line?
+@node Inserting text at the beginning of each line, Underlining paragraphs, Changing the length of a Tab, Common requests
+@section How do I insert <some text> at the beginning of every line?
+@cindex Prefixing a region with some text
 @cindex Prefix character, inserting in mail/news replies
 @cindex Replies to mail/news, inserting a prefix character
 @cindex @code{mail-yank-prefix}
@@ -2126,7 +2146,7 @@
 @cindex News replies, inserting a prefix character
 
 To do this to an entire buffer, type @kbd{M-< M-x replace-regexp
-@key{RET} ^ @key{RET} > @key{RET}}.
+@key{RET} ^ @key{RET} your text @key{RET}}.
 
 To do this to a region, use @code{string-insert-rectangle}.
 Set the mark (@kbd{C-@key{SPC}}) at the beginning of the first line you
@@ -2135,13 +2155,12 @@
 buffer, type @kbd{C-x h M-x string-insert-rectangle @key{RET}}.
 
 If you are trying to prefix a yanked mail message with @samp{>}, you
-might want to set the variable @code{mail-yank-prefix}.  Better yet, use
-the Supercite package (@pxref{Supercite}), which provides flexible
-citation for yanked mail and news messages; it is included in Emacs
-since version 19.20.  @xref{Changing the included text prefix}, for
-additional information.
-
-@node Underlining paragraphs, Repeating a command as many times as possible, Inserting > at the beginning of each line, Common requests
+might want to set the variable @code{mail-yank-prefix}.  In Message
+buffers, you can even use @kbd{M-;} to cite yanked messages (@kbd{M-;}
+runs the function @code{comment-region}, it is a general-purpose
+mechanism to comment regions).
+
+@node Underlining paragraphs, Repeating a command as many times as possible, Inserting text at the beginning of each line, Common requests
 @section How do I insert @samp{_^H} before each character in a region to get an underlined paragraph?
 @cindex Underlining a region of text
 @cindex @code{underline-region}
@@ -3754,7 +3773,7 @@
 @email{kyle_jones@@wonderworks.com, Kyle Jones}
 
 @item Latest version
-7.15
+7.19
 
 @item Distribution
 @uref{ftp://ftp.wonderworks.com/pub/vm/vm.tar.gz}
@@ -4675,8 +4694,7 @@
 @cindex @key{Meta} key and @code{xterm}
 @cindex Xterm and @key{Meta} key
 
-@inforef{Single-Byte Character Support, Single-Byte Character Set
-Support, emacs}.
+@inforef{Unibyte Mode, Single-Byte Character Set Support, emacs}.
 
 If the advice in the Emacs manual fails, try all of these methods before
 asking for further help:
@@ -4776,10 +4794,10 @@
 @code{minibuffer-complete-word} in the minibuffer, as follows:
 
 @lisp
-(define-key minibuffer-local-filename-completion-map (kbd "SPC") 
+(define-key minibuffer-local-filename-completion-map (kbd "SPC")
   'minibuffer-complete-word)
 
-(define-key minibuffer-local-must-match-filename-map (kbd "SPC") 
+(define-key minibuffer-local-must-match-filename-map (kbd "SPC")
   'minibuffer-complete-word)
 @end lisp
 
@@ -4800,7 +4818,7 @@
 @cindex Displaying eight-bit characters
 @cindex Eight-bit characters, displaying
 
-@inforef{Single-Byte Character Support, Single-byte Character Set
+@inforef{Unibyte Mode, Single-byte Character Set
 Support, emacs}.  On a Unix, when Emacs runs on a text-only terminal
 display or is invoked with @samp{emacs -nw}, you typically need to use
 @code{set-terminal-coding-system} to tell Emacs what the terminal can
@@ -4817,7 +4835,7 @@
 @cindex Input, 8-bit characters
 
 Various methods are available for input of eight-bit characters.  See
-@inforef{Single-Byte Character Support, Single-byte Character Set
+@inforef{Unibyte Mode, Single-byte Character Set
 Support, emacs}.  For more sophisticated methods, @inforef{Input
 Methods, Input Methods, emacs}.
 
--- a/man/files.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/files.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -242,12 +242,11 @@
 Motif toolkits; on MS-Windows, the GUI version does that by default.
 For information on how to customize this, see @ref{Dialog Boxes}.
 
-  Secondly, Emacs supports the ``drag and drop'' protocol on the X
-window system.  Dropping a file into an ordinary Emacs window visits
-the file using that window.  However, dropping a file into a window
-displaying a Dired buffer moves or copies the file into the displayed
-directory.  For details, see @ref{Drag and Drop}, @ref{Misc Dired
-Features}.
+  Secondly, Emacs supports ``drag and drop''; dropping a file into an
+ordinary Emacs window visits the file using that window.  However,
+dropping a file into a window displaying a Dired buffer moves or
+copies the file into the displayed directory.  For details, see
+@ref{Drag and Drop}, and @ref{Misc Dired Features}.
 
 @cindex creating files
   What if you want to create a new file?  Just visit it.  Emacs displays
--- a/man/frames.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/frames.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -510,8 +510,10 @@
 @kindex C-z @r{(X windows)}
 @findex iconify-or-deiconify-frame
 Iconify the selected Emacs frame (@code{iconify-or-deiconify-frame}).
-The normal meaning of @kbd{C-z}, to suspend Emacs, is not useful under a
-window system, so it has a different binding in that case.
+The normal meaning of @kbd{C-z}, to suspend Emacs, is not useful under
+a graphical display that allows multiple applications to operate
+simultaneously in their own windies, so Emacs gives @kbd{C-z} a
+different binding in that case.
 
 If you type this command on an Emacs frame's icon, it deiconifies the frame.
 
@@ -967,8 +969,8 @@
 @cindex mouse avoidance
 
 @vindex mouse-avoidance-mode
-Mouse Avoidance mode keeps the window system mouse pointer away from
-point, to avoid obscuring text.  Whenever it moves the mouse, it also
+Mouse Avoidance mode keeps the mouse pointer away from point, to avoid
+obscuring text you want to edit.  Whenever it moves the mouse, it also
 raises the frame.  To use Mouse Avoidance mode, customize the variable
 @code{mouse-avoidance-mode}.  You can set this to various values to
 move the mouse in several ways:
--- a/man/glossary.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/glossary.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -367,7 +367,7 @@
 
 @item Dribble File
 A dribble file is a file into which Emacs writes all the characters that
-the user types on the keyboard.  Dribble files are used to make a record
+you type on the keyboard.  Dribble files are used to make a record
 for debugging Emacs bugs.  Emacs does not make a dribble file unless you
 tell it to.  @xref{Bugs}.
 
@@ -506,7 +506,7 @@
 but in Emacs a window means something else.
 
 @item Fringe
-On a graphical terminal (q.v.@:), there's a narrow portion of the
+On a graphical display (q.v.@:), there's a narrow portion of the
 frame (q.v.@:) between the text area and the window's border.  Emacs
 displays the fringe using a special face (q.v.@:) called
 @code{fringe}.  @xref{Faces,fringe}.
@@ -557,8 +557,8 @@
 @key{RET} or @key{ESC}.  In Emacs, typing a graphic character inserts
 that character (in ordinary editing modes).  @xref{Inserting Text}.
 
-@item Graphical Terminal
-A graphical terminal is one that can display images and multiple fonts.
+@item Graphical Display
+A graphical display is one that can display images and multiple fonts.
 Usually it also has a window system (q.v.@:).
 
 @item Highlighting
@@ -869,7 +869,7 @@
 @item Narrowing
 Narrowing means creating a restriction (q.v.@:) that limits editing in
 the current buffer to only a part of the text in the buffer.  Text
-outside that part is inaccessible to the user until the boundaries are
+outside that part is inaccessible for editing until the boundaries are
 widened again, but it is still there, and saving the file saves it
 all.  @xref{Narrowing}.
 
@@ -982,7 +982,7 @@
 
 @item Recursive Editing Level
 A recursive editing level is a state in which part of the execution of
-a command involves asking the user to edit some text.  This text may
+a command involves asking you to edit some text.  This text may
 or may not be the same as the text to which the command was applied.
 The mode line indicates recursive editing levels with square brackets
 (@samp{[} and @samp{]}).  @xref{Recursive Edit}.
@@ -1289,8 +1289,10 @@
 (q.v.@:) in Emacs.
 
 @item Window System
-A window system is a graphical terminal (q.v.@:) that can display multiple
-windows for different programs at the same time.
+A window system is software that operates on a graphical display
+(q.v.@:), to subdivide the screen so that multiple applications can
+have their] own windows at the same time.  All modern operating systems
+include a window system.
 
 @item Word Abbrev
 See `abbrev.'
--- a/man/gnus.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/gnus.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -24547,14 +24547,17 @@
 ``Gnus 5.8'' (after 99 releases and a CVS repository) on December 3rd
 1999.
 
-On the 26th of October 2000, Oort Gnus was begun.
+On the 26th of October 2000, Oort Gnus was begun and was released as
+Gnus 5.10 on May 1st 2003 (24 releases).
+
+On the January 4th 2004, No Gnus was begun.
 
 If you happen upon a version of Gnus that has a prefixed name --
 ``(ding) Gnus'', ``September Gnus'', ``Red Gnus'', ``Quassia Gnus'',
-``Pterodactyl Gnus'', ``Oort Gnus'' -- don't panic.  Don't let it know
-that you're frightened.  Back away.  Slowly.  Whatever you do, don't
-run.  Walk away, calmly, until you're out of its reach.  Find a proper
-released version of Gnus and snuggle up to that instead.
+``Pterodactyl Gnus'', ``Oort Gnus'', ``No Gnus'' -- don't panic.
+Don't let it know that you're frightened.  Back away.  Slowly.  Whatever
+you do, don't run.  Walk away, calmly, until you're out of its reach.
+Find a proper released version of Gnus and snuggle up to that instead.
 
 
 @node Other Gnus Versions
--- a/man/help.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/help.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -644,7 +644,7 @@
 @cindex balloon help
   When a region of text is ``active,'' so that you can select it with
 the mouse or a key like @kbd{RET}, it often has associated help text.
-Areas of the mode line are examples.  On most window systems, the help
+Areas of the mode line are examples.  On graphical displays, the help
 text is displayed as a ``tooltip'' (sometimes known as ``balloon
 help''), when you move the mouse over the active text.  @xref{Tooltips}.
 On some systems, it is shown in the echo area.  On text-only
--- a/man/killing.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/killing.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -125,7 +125,7 @@
 should be.
 
   Why do we say ``or it should be''?  When Emacs starts up using a
-window system, it determines automatically which key or keys should be
+graphical display, it determines automatically which key or keys should be
 equivalent to @key{DEL}.  As a result, @key{BACKSPACE} and/or @key{DELETE}
 keys normally do the right things.  But in some unusual cases Emacs
 gets the wrong information from the system.  If these keys don't do
@@ -264,7 +264,7 @@
 @cindex Delete Selection mode
 @cindex mode, Delete Selection
 @findex delete-selection-mode
-  Many window systems follow the convention that insertion while text
+  Many graphical applications follow the convention that insertion while text
 is selected deletes the selected text.  You can make Emacs behave this
 way by enabling Delete Selection mode---with @kbd{M-x
 delete-selection-mode} or using Custom.  Another effect of this mode
--- a/man/kmacro.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/kmacro.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -10,7 +10,7 @@
   In this chapter we describe how to record a sequence of editing
 commands so you can repeat it conveniently later.
 
-  A @dfn{keyboard macro} is a command defined by the user to stand for
+  A @dfn{keyboard macro} is a command defined by an Emacs user to stand for
 another sequence of keys.  For example, if you discover that you are
 about to type @kbd{C-n M-d C-d} forty times, you can speed your work by
 defining a keyboard macro to do @kbd{C-n M-d C-d}, and then executing
@@ -303,54 +303,43 @@
 @findex kmacro-insert-counter
 @kindex C-x C-k C-i
   The command @kbd{C-x C-k C-i} (@code{kmacro-insert-counter}) inserts
-the current value of the keyboard macro counter and increments the
-counter by 1.  You can use a numeric prefix argument to specify a
-different increment.  If you just specify a @kbd{C-u} prefix, the last
-inserted counter value is repeated and the counter is not incremented.
-For example, if you enter the following sequence while defining a macro
+the current value of the current keyboard macro's counter, and
+increments the counter by 1.  You can use a numeric prefix argument to
+specify a different increment.  If you just specify a @kbd{C-u}
+prefix, then the increment is zero, so it repeats the last inserted
+counter value.  For example, if you enter the following sequence while
+defining a macro
 
 @example
 C-x C-k C-i C-x C-k C-i C-u C-x C-k C-i C-x C-k C-i
 @end example
 
 @noindent
-the text @samp{0112} is inserted in the buffer, and for the first and
-second execution of the macro @samp{3445} and @samp{6778} are
-inserted.
+it inserts @samp{0112} in the buffer.  The next two iterations
+of the macro will insert @samp{3445} and @samp{6778}.
 
-  This command usually only makes sense while defining a keyboard macro.
-But its behavior when no keyboard macro is being defined or executed
-is predictable: it inserts and increments the counter of the head of
-the keyboard macro ring.
+  This command usually only makes sense while defining a keyboard
+macro.  But its behavior when no keyboard macro is being defined or
+executed is predictable: it inserts and increments the counter of the
+macro at the head of the keyboard macro ring.
 
 @findex kmacro-set-counter
 @kindex C-x C-k C-c
-  The command @kbd{C-x C-k C-c} (@code{kmacro-set-counter}) prompts
-for the initial value of the keyboard macro counter if you use it
-before you define a keyboard macro.  If you use it before executing a
-keyboard macro, it resets that macro's counter.  If you use it while
-defining a keyboard macro, then the macro counter gets reset to that same
-value on each repetition of the macro.  Rather than having the command
-prompt for a value, you can also specify the value with a numeric
-prefix argument.  If you just specify a @kbd{C-u} prefix, the counter
-is reset to the value it had prior to the current repetition of the
-macro (undoing any increments so far in this repetition).  If you just
-specify a @kbd{C-u} prefix while no macro is being defined or executed,
-then the new value of the counter is essentially unpredictable.
+  The command @kbd{C-x C-k C-c} (@code{kmacro-set-counter}) sets the
+current macro counter to the value of the numeric argument.  If you use
+it inside the macro, it operates on each repetition of the macro.  If
+you specify just @kbd{C-u} as the prefix, while executing the macro,
+that resets the counter to the value it had at the beginning of the
+current repetition of the macro (undoing any increments so far in this
+repetition).
 
 @findex kmacro-add-counter
 @kindex C-x C-k C-a
-  The command @kbd{C-x C-k C-a} (@code{kmacro-add-counter}) prompts
-for a value to add to the macro counter.  You can also specify the
-value with a numeric prefix argument.  If you just specify a @kbd{C-u}
-prefix, the counter is reset to the last value inserted by any
-keyboard macro.  Usually, this will only make sense if that value was
-inserted during the current macro definition or repetition.
-
-  This command normally only makes sense while defining a keyboard macro.
-But its behavior when no keyboard macro is being defined or executed
-is predictable: it affects the counter of the head of the keyboard
-macro ring.
+  The command @kbd{C-x C-k C-a} (@code{kmacro-add-counter}) adds the
+prefix argument to the current macro counter.  With just @kbd{C-u} as
+argument, it resets the counter to the last value inserted by any
+keyboard macro.  (Normally, when you use this, the last insertion
+will be in the same macro and it will be the same counter.)
 
 @findex kmacro-set-format
 @kindex C-x C-k C-f
@@ -364,7 +353,7 @@
 Lisp Reference Manual}).  Do not put the format string inside double
 quotes when you insert it in the minibuffer.
 
-If you use this command while no keyboard macro is being defined or
+  If you use this command while no keyboard macro is being defined or
 executed, the new format affects all subsequent macro definitions.
 Existing macros continue to use the format in effect when they were
 defined.  If you set the format while defining a keyboard macro, this
@@ -375,7 +364,7 @@
 corresponding changes during its definition, have no effect on
 subsequent macros.
 
-The format set by @kbd{C-x C-k C-f} does not affect insertion of
+  The format set by @kbd{C-x C-k C-f} does not affect insertion of
 numbers stored in registers.
 
 @node Keyboard Macro Query
--- a/man/macos.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/macos.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -104,12 +104,12 @@
 @code{mac-roman}, @code{mac-centraleurroman}, and @code{mac-cyrillic}
 are used to represent these Mac encodings.
 
-  The fontset @code{fontset-mac} is created automatically when Emacs
-is run on Mac, and used by default.  It displays as many kinds of
-characters as possible using 12-point Monaco as a base font.  If you
-see some character as a hollow box with this fontset, then it's almost
-impossible to display it only by customizing font settings (@pxref{Mac
-Font Specs}).
+  The fontset @code{fontset-standard} is created automatically when
+Emacs is run on Mac, and used by default.  It displays as many kinds
+of characters as possible using 12-point Monaco as a base font.  If
+you see some character as a hollow box with this fontset, then it's
+almost impossible to display it only by customizing font settings
+(@pxref{Mac Font Specs}).
 
   You can use input methods provided either by LEIM (@pxref{Input
 Methods}) or Mac OS to enter international characters.  To use the
--- a/man/maintaining.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/maintaining.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -14,6 +14,7 @@
 
 @menu
 * Change Log::	        Maintaining a change history for your program.
+* Format of ChangeLog:: What the change log file looks like.
 * Tags::	        Go direct to any function in your program in one
 			  command.  Tags remembers which file it is in.
 * Emerge::	        A convenient way of merging two versions of a program.
@@ -22,6 +23,14 @@
 @node Change Log
 @section Change Logs
 
+  A change log file contains a chronological record of when and why you
+have changed a program, consisting of a sequence of entries describing
+individual changes.  Normally it is kept in a file called
+@file{ChangeLog} in the same directory as the file you are editing, or
+one of its parent directories.  A single @file{ChangeLog} file can
+record changes for all the files in its directory and all its
+subdirectories.
+
 @cindex change log
 @kindex C-x 4 a
 @findex add-change-log-entry-other-window
@@ -32,25 +41,49 @@
 parent---that is useful for making log entries for functions that
 have been deleted in the current version.
 
-  A change log file contains a chronological record of when and why you
-have changed a program, consisting of a sequence of entries describing
-individual changes.  Normally it is kept in a file called
-@file{ChangeLog} in the same directory as the file you are editing, or
-one of its parent directories.  A single @file{ChangeLog} file can
-record changes for all the files in its directory and all its
-subdirectories.
+  @kbd{C-x 4 a} visits the change log file and creates a new entry
+unless the most recent entry is for today's date and your name.  It
+also creates a new item for the current file.  For many languages, it
+can even guess the name of the function or other object that was
+changed.
+
+@vindex add-log-keep-changes-together
+  When the variable @code{add-log-keep-changes-together} is
+non-@code{nil}, @kbd{C-x 4 a} adds to any existing item for the file
+rather than starting a new item.
+
+@vindex add-log-always-start-new-record
+  If @code{add-log-always-start-new-record} is non-@code{nil},
+@kbd{C-x 4 a} always makes a new entry, even if the last entry
+was made by you and on the same date.
 
-  You should put a copyright notice and permission notice at the
-end of the change log file.  Here is an example:
+@vindex change-log-version-info-enabled
+@vindex change-log-version-number-regexp-list
+@cindex file version in change log entries
+  If the value of the variable @code{change-log-version-info-enabled}
+is non-@code{nil}, @kbd{C-x 4 a} adds the file's version number to the
+change log entry.  It finds the version number by searching the first
+ten percent of the file, using regular expressions from the variable
+@code{change-log-version-number-regexp-list}.
 
-@example
-Copyright 1997, 1998 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.
-@end example
+@cindex Change Log mode
+@findex change-log-mode
+  The change log file is visited in Change Log mode.  In this major
+mode, each bunch of grouped items counts as one paragraph, and each
+entry is considered a page.  This facilitates editing the entries.
+@kbd{C-j} and auto-fill indent each new line like the previous line;
+this is convenient for entering the contents of an entry.
 
-@noindent
-Of course, you should substitute the proper years and copyright holder.
+@findex change-log-merge
+  You can use the command @kbd{M-x change-log-merge} to merge other
+log files into a buffer in Change Log Mode, preserving the date
+ordering of entries.
+
+  Version control systems are another way to keep track of changes in your
+program and keep a change log.  @xref{Log Buffer}.
+
+@node Format of ChangeLog
+@section Format of ChangeLog
 
   A change log entry starts with a header line that contains the current
 date, your name, and your email address (taken from the variable
@@ -84,90 +117,17 @@
 change, in different places), group them by leaving no blank line
 between them.
 
-  @kbd{C-x 4 a} visits the change log file and creates a new entry
-unless the most recent entry is for today's date and your name.  It
-also creates a new item for the current file.  For many languages, it
-can even guess the name of the function or other object that was
-changed.
-
-@vindex add-log-keep-changes-together
-  When the variable @code{add-log-keep-changes-together} is
-non-@code{nil}, @kbd{C-x 4 a} adds to any existing item for the file
-rather than starting a new item.
-
-@vindex change-log-version-info-enabled
-@vindex change-log-version-number-regexp-list
-@cindex file version in change log entries
-  If the value of the variable @code{change-log-version-info-enabled}
-is non-@code{nil}, @kbd{C-x 4 a} adds the file's version number to the
-change log entry.  It finds the version number by searching the first
-ten percent of the file, using regular expressions from the variable
-@code{change-log-version-number-regexp-list}.
+  You should put a copyright notice and permission notice at the
+end of the change log file.  Here is an example:
 
-@vindex add-log-always-start-new-record
-  If @code{add-log-always-start-new-record} is non-@code{nil},
-@kbd{C-x 4 a} always makes a new entry, even if the last entry
-was made by you and on the same date.
-
-@cindex Change Log mode
-@findex change-log-mode
-  The change log file is visited in Change Log mode.  In this major
-mode, each bunch of grouped items counts as one paragraph, and each
-entry is considered a page.  This facilitates editing the entries.
-@kbd{C-j} and auto-fill indent each new line like the previous line;
-this is convenient for entering the contents of an entry.
-
-@findex change-log-merge
-  You can use the command @kbd{M-x change-log-merge} to merge other
-log files into a buffer in Change Log Mode, preserving the date
-ordering of entries.
-
-@findex change-log-redate
-@cindex converting change log date style
-  Versions of Emacs before 20.1 used a different format for the time of
-the change log entry:
-
-@smallexample
-Fri May 25 11:23:23 1993 Richard Stallman  <rms@@gnu.org>
-@end smallexample
+@example
+Copyright 1997, 1998 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.
+@end example
 
 @noindent
-The @kbd{M-x change-log-redate} command converts all the old-style
-date entries in the change log file visited in the current buffer to
-the new format, to make the file uniform in style.  This is handy when
-entries are contributed by many different people, some of whom use old
-versions of Emacs.
-
-  Version control systems are another way to keep track of changes in your
-program and keep a change log.  @xref{Log Buffer}.
-
-@ignore
-@c This is commented out because the command is specific
-@c to maintenance of Emacs itself.
-
-@node Authors
-@section @file{AUTHORS} files
-@cindex @file{AUTHORS} file
-
-  Programs which have many contributors usually include a file named
-@file{AUTHORS} in their distribution, which lists the individual
-contributions.  Emacs has a special command for maintaining the
-@file{AUTHORS} file that is part of the Emacs distribution.
-
-@findex authors
-  The @kbd{M-x authors} command prompts for the name of the root of the
-Emacs source directory.  It then scans @file{ChangeLog} files and Lisp
-source files under that directory for information about authors of
-individual packages, and people who made changes in source files, and
-puts the information it gleans into a buffer named @samp{*Authors*}.
-You can then edit the contents of that buffer and merge it with the
-existing @file{AUTHORS} file.
-
-  Do not assume that this command finds all the contributors; don't
-assume that a person not listed in the output was not a contributor.
-If you merged in someone's contribution and did not put his name
-in the change log, he won't show up in @kbd{M-x authors} either.
-@end ignore
+Of course, you should substitute the proper years and copyright holder.
 
 @node Tags
 @section Tags Tables
@@ -425,15 +385,15 @@
 a tag, or records it for the wrong file, then Emacs cannot possibly
 find its definition until you update the tags table.  However, if the
 position recorded in the tags table becomes a little bit wrong (due to
-other editing), the only consequence is a slight delay in finding the
+other editing), the worst consequence is a slight delay in finding the
 tag.  Even if the stored position is very far wrong, Emacs will still
-find the tag, after searching most of the file for it.  Even that
-delay is hardly noticeable with today's computers.
+find the tag, after searching most of the file for it.  That delay is
+hardly noticeable with today's computers.
 
-  So you should update a tags table when you define new tags that you want
-to have listed, or when you move tag definitions from one file to another,
-or when changes become substantial.  Normally there is no need to update
-the tags table after each edit, or even every day.
+   Thus, there is no need to update the tags table after each edit.
+You should update a tags table when you define new tags that you want
+to have listed, or when you move tag definitions from one file to
+another, or when changes become substantial.
 
   One tags table can virtually include another.  Specify the included
 tags file name with the @samp{--include=@var{file}} option when
@@ -480,21 +440,21 @@
 standard input and mark the produced tags as belonging to the file
 @var{file}.
 
-  @samp{etags --help} prints the list of the languages @code{etags}
+  @samp{etags --help} outputs the list of the languages @code{etags}
 knows, and the file name rules for guessing the language.  It also prints
 a list of all the available @code{etags} options, together with a short
 explanation.  If followed by one or more @samp{--language=@var{lang}}
-options, prints detailed information about how tags are generated for
+options, it outputs detailed information about how tags are generated for
 @var{lang}.
 
 @node Etags Regexps
 @subsection Etags Regexps
 
   The @samp{--regex} option provides a general way of recognizing tags
-based on regexp matching.  You can freely intermix it with file names.
+based on regexp matching.  You can freely intermix this option with
+file names, and each one applies to the source files that follow it.
 If you specify multiple @samp{--regex} options, all of them are used
-in parallel, but each one applies only to the source files that follow
-it.  The syntax is:
+in parallel.  The syntax is:
 
 @smallexample
 --regex=[@var{@{language@}}]/@var{tagregexp}/[@var{nameregexp}/]@var{modifiers}
@@ -537,8 +497,8 @@
 @end table
 
   The @samp{-R} option cancels all the regexps defined by preceding
-@samp{--regex} options.  It applies to the file names following it, as
-you can see from the following example:
+@samp{--regex} options.  It too applies to the file names following
+it.  Here's an example:
 
 @smallexample
 etags --regex=/@var{reg1}/i voo.doo --regex=/@var{reg2}/m \
@@ -647,30 +607,25 @@
 
 @vindex tags-file-name
 @findex visit-tags-table
-  Emacs has at any time one @dfn{selected} tags table, and all the commands
-for working with tags tables use the selected one.  To select a tags table,
-type @kbd{M-x visit-tags-table}, which reads the tags table file name as an
-argument.  The name @file{TAGS} in the default directory is used as the
-default file name.
+  Emacs has at any time one @dfn{selected} tags table, and all the
+commands for working with tags tables use the selected one.  To select
+a tags table, type @kbd{M-x visit-tags-table}, which reads the tags
+table file name as an argument, with @file{TAGS} in the default
+directory as the default.
 
-  All this command does is store the file name in the variable
-@code{tags-file-name}.  Emacs does not actually read in the tags table
-contents until you try to use them.  Setting this variable yourself is just
-as good as using @code{visit-tags-table}.  The variable's initial value is
-@code{nil}; that value tells all the commands for working with tags tables
-that they must ask for a tags table file name to use.
+  Emacs does not actually read in the tags table contents until you
+try to use them; all @code{visit-tags-table} does is store the file
+name in the variable @code{tags-file-name}, and setting the variable
+yourself is just as good.  The variable's initial value is @code{nil};
+that value tells all the commands for working with tags tables that
+they must ask for a tags table file name to use.
 
   Using @code{visit-tags-table} when a tags table is already loaded
 gives you a choice: you can add the new tags table to the current list
 of tags tables, or start a new list.  The tags commands use all the tags
 tables in the current list.  If you start a new list, the new tags table
 is used @emph{instead} of others.  If you add the new table to the
-current list, it is used @emph{as well as} the others.  When the tags
-commands scan the list of tags tables, they don't always start at the
-beginning of the list; they start with the first tags table (if any)
-that describes the current file, proceed from there to the end of the
-list, and then scan from the beginning of the list until they have
-covered all the tables in the list.
+current list, it is used @emph{as well as} the others.
 
 @vindex tags-table-list
   You can specify a precise list of tags tables by setting the variable
@@ -749,13 +704,13 @@
 @findex find-tag-other-frame
   Like most commands that can switch buffers, @code{find-tag} has a
 variant that displays the new buffer in another window, and one that
-makes a new frame for it.  The former is @kbd{C-x 4 .}, which invokes
-the command @code{find-tag-other-window}.  The latter is @kbd{C-x 5 .},
+makes a new frame for it.  The former is @w{@kbd{C-x 4 .}}, which invokes
+the command @code{find-tag-other-window}.  The latter is @w{@kbd{C-x 5 .}},
 which invokes @code{find-tag-other-frame}.
 
   To move back to places you've found tags recently, use @kbd{C-u -
 M-.}; more generally, @kbd{M-.} with a negative numeric argument.  This
-command can take you to another buffer.  @kbd{C-x 4 .} with a negative
+command can take you to another buffer.  @w{@kbd{C-x 4 .}} with a negative
 argument finds the previous tag location in another window.
 
 @kindex M-*
@@ -781,9 +736,13 @@
 @cindex search and replace in multiple files
 @cindex multiple-file search and replace
 
-  The commands in this section visit and search all the files listed in the
-selected tags table, one by one.  For these commands, the tags table serves
-only to specify a sequence of files to search.
+  The commands in this section visit and search all the files listed
+in the selected tags table, one by one.  For these commands, the tags
+table serves only to specify a sequence of files to search.  These
+commands scan the list of tags tables starting with the first tags
+table (if any) that describes the current file, proceed from there to
+the end of the list, and then scan from the beginning of the list
+until they have covered all the tables in the list.
 
 @table @kbd
 @item M-x tags-search @key{RET} @var{regexp} @key{RET}
@@ -846,9 +805,7 @@
 
   It may have struck you that @code{tags-search} is a lot like
 @code{grep}.  You can also run @code{grep} itself as an inferior of
-Emacs and have Emacs show you the matching lines one by one.  This works
-much like running a compilation; finding the source locations of the
-@code{grep} matches works like finding the compilation errors.
+Emacs and have Emacs show you the matching lines one by one.
 @xref{Grep Searching}.
 
 @node List Tags
@@ -882,9 +839,9 @@
 
 @vindex tags-tag-face
 @vindex tags-apropos-additional-actions
-You can customize the appearance of the output with the face
-@code{tags-tag-face}.  You can display additional output with @kbd{M-x
-tags-apropos} by customizing the variable
+  You can customize the appearance of the output by setting the
+variable @code{tags-tag-face} to a face.  You can display additional
+output with @kbd{M-x tags-apropos} by customizing the variable
 @code{tags-apropos-additional-actions}---see its documentation for
 details.
 
@@ -896,11 +853,11 @@
 @cindex Emerge
 @cindex merging files
 
-It's not unusual for programmers to get their signals crossed and modify
-the same program in two different directions.  To recover from this
-confusion, you need to merge the two versions.  Emerge makes this
-easier.  See also @ref{Comparing Files}, for commands to compare
-in a more manual fashion, and @ref{Top, Ediff,, ediff, The Ediff Manual}.
+  It's not unusual for programmers to get their signals crossed and
+modify the same program in two different directions.  To recover from
+this confusion, you need to merge the two versions.  Emerge makes this
+easier.  See also @ref{Comparing Files}, for other ways to compare
+files, and @ref{Top, Ediff,, ediff, The Ediff Manual}.
 
 @menu
 * Overview of Emerge::	How to start Emerge.  Basic concepts.
@@ -918,7 +875,7 @@
 @node Overview of Emerge
 @subsection Overview of Emerge
 
-To start Emerge, run one of these four commands:
+  To start Emerge, run one of these four commands:
 
 @table @kbd
 @item M-x emerge-files
--- a/man/mule.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/mule.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -72,8 +72,7 @@
 your keyboard can produce non-@acronym{ASCII} characters, you can select an
 appropriate keyboard coding system (@pxref{Terminal Coding}), and Emacs
 will accept those characters.  Latin-1 characters can also be input by
-using the @kbd{C-x 8} prefix, see @ref{Single-Byte Character Support,
-C-x 8}.
+using the @kbd{C-x 8} prefix, see @ref{Unibyte Mode}.
 
 On X Window systems, your locale should be set to an appropriate value
 to make sure Emacs interprets keyboard input correctly; see
@@ -101,7 +100,7 @@
                               that cover the whole spectrum of characters.
 * Defining Fontsets::       Defining a new fontset.
 * Undisplayable Characters:: When characters don't display.
-* Single-Byte Character Support:: You can pick one European character set
+* Unibyte Mode::            You can pick one European character set
                               to use without multibyte characters.
 * Charsets::                How Emacs groups its internal character codes.
 @end menu
@@ -1000,11 +999,11 @@
 @table @kbd
 @item C-x @key{RET} x @var{coding} @key{RET}
 Use coding system @var{coding} for transferring selections to and from
-other programs through the window system.
+other window-based applications.
 
 @item C-x @key{RET} X @var{coding} @key{RET}
 Use coding system @var{coding} for transferring @emph{one}
-selection---the next one---to or from the window system.
+selection---the next one---to or from another window-based application.
 
 @item C-x @key{RET} p @var{input-coding} @key{RET} @var{output-coding} @key{RET}
 Use coding systems @var{input-coding} and @var{output-coding} for
@@ -1166,34 +1165,39 @@
 @section Fontsets
 @cindex fontsets
 
-  A font for X Windows typically defines shapes for a single alphabet
-or script.  Therefore, displaying the entire range of scripts that
-Emacs supports requires a collection of many fonts.  In Emacs, such a
-collection is called a @dfn{fontset}.  A fontset is defined by a list
-of fonts, each assigned to handle a range of character codes.
+  A font typically defines shapes for a single alphabet or script.
+Therefore, displaying the entire range of scripts that Emacs supports
+requires a collection of many fonts.  In Emacs, such a collection is
+called a @dfn{fontset}.  A fontset is defined by a list of fonts, each
+assigned to handle a range of character codes.
 
-  Each fontset has a name, like a font.  The available X fonts are
-defined by the X server; fontsets, however, are defined within Emacs
-itself.  Once you have defined a fontset, you can use it within Emacs by
-specifying its name, anywhere that you could use a single font.  Of
-course, Emacs fontsets can use only the fonts that the X server
-supports; if certain characters appear on the screen as hollow boxes,
-this means that the fontset in use for them has no font for those
-characters.@footnote{The Emacs installation instructions have information on
-additional font support.}
+  Each fontset has a name, like a font.  However, while fonts are
+stored in the system and the available font names are defined by the
+system, fontsets are defined within Emacs itself.  Once you have
+defined a fontset, you can use it within Emacs by specifying its name,
+anywhere that you could use a single font.  Of course, Emacs fontsets
+can use only the fonts that the system supports; if certain characters
+appear on the screen as hollow boxes, this means that the fontset in
+use for them has no font for those characters.@footnote{The Emacs
+installation instructions have information on additional font
+support.}
 
   Emacs creates two fontsets automatically: the @dfn{standard fontset}
 and the @dfn{startup fontset}.  The standard fontset is most likely to
 have fonts for a wide variety of non-@acronym{ASCII} characters;
 however, this is not the default for Emacs to use.  (By default, Emacs
 tries to find a font that has bold and italic variants.)  You can
-specify use of the standard fontset with the @samp{-fn} option, or
-with the @samp{Font} X resource (@pxref{Font X}).  For example,
+specify use of the standard fontset with the @samp{-fn} option.  For
+example,
 
 @example
 emacs -fn fontset-standard
 @end example
 
+@noindent
+You can also specify a fontset with the @samp{Font} resource (@pxref{X
+Resources}).
+
   A fontset does not necessarily specify a font for every character
 code.  If a fontset specifies no font for a certain character, or if it
 specifies a font that does not exist on your system, then it cannot
@@ -1353,8 +1357,8 @@
 @code{latin1-display} to enable this.  The mnemonic @acronym{ASCII}
 sequences mostly correspond to those of the prefix input methods.
 
-@node Single-Byte Character Support
-@section Single-byte Character Set Support
+@node Unibyte Mode
+@section Unibyte Editing Mode
 
 @cindex European character sets
 @cindex accented characters
@@ -1376,8 +1380,8 @@
 
 @vindex unibyte-display-via-language-environment
   Emacs can also display those characters, provided the terminal or font
-in use supports them.  This works automatically.  Alternatively, if you
-are using a window system, Emacs can also display single-byte characters
+in use supports them.  This works automatically.  Alternatively, on a
+graphical display, Emacs can also display single-byte characters
 through fontsets, in effect by displaying the equivalent multibyte
 characters according to the current language environment.  To request
 this, set the variable @code{unibyte-display-via-language-environment}
--- a/man/picture.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/picture.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -29,7 +29,7 @@
 Picture mode defines various keys starting with the @kbd{C-c} prefix to
 run special picture editing commands.
 
-  One of these keys, @kbd{C-c C-c}, is pretty important.  Often a
+  One of these keys, @kbd{C-c C-c}, is particularly important.  Often a
 picture is part of a larger file that is usually edited in some other
 major mode.  @kbd{M-x edit-picture} records the name of the previous
 major mode so you can use the @kbd{C-c C-c} command
--- a/man/programs.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/programs.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -259,8 +259,8 @@
 order to move it to a different place in the file.  If you use the
 command while point is between defuns, it uses the following defun.
 Successive uses of @kbd{C-M-h}, or using it in Transient Mark mode
-when the mark is active, includes an additional defun in the region
-each time.
+when the mark is active, extends the end of the region to include one
+more defun each time.
 
   In C mode, @kbd{C-M-h} runs the function @code{c-mark-function},
 which is almost the same as @code{mark-defun}; the difference is that
@@ -296,9 +296,9 @@
 @code{imenu-add-menubar-index}.  If you want to have this menu bar
 item available for all buffers in a certain major mode, you can do
 this by adding @code{imenu-add-menubar-index} to its mode hook.  But
-if you have done that, you will have to wait each time you visit a
-file in that mode, while Emacs finds all the definitions in that
-buffer.
+if you have done that, you will have to wait a little while each time
+you visit a file in that mode, while Emacs finds all the definitions
+in that buffer.
 
 @vindex imenu-auto-rescan
   When you change the contents of a buffer, if you add or delete
@@ -374,8 +374,6 @@
 Adjust indentation of current line.
 @item C-j
 Equivalent to @key{RET} followed by @key{TAB} (@code{newline-and-indent}).
-@item @key{LINEFEED}
-This key, if the keyboard has it, is another way to enter @kbd{C-j}.
 @end table
 
 @kindex TAB @r{(programming modes)}
@@ -400,8 +398,8 @@
 @kindex C-j
 @findex newline-and-indent
   When entering lines of new code, use @kbd{C-j}
-(@code{newline-and-indent}), which is equivalent to a @key{RET}
-followed by a @key{TAB}.  @kbd{C-j} at the end of a line creates a
+(@code{newline-and-indent}), which is equivalent to @key{RET}
+followed by @key{TAB}.  @kbd{C-j} at the end of a line creates a
 blank line and then gives it the appropriate indentation.
 
   @key{TAB} indents a line that starts within a parenthetical grouping
@@ -412,7 +410,7 @@
 result of @key{TAB} because you find it unaesthetic for a particular
 line.
 
-  By default, an open-parenthesis, open-brace or other opening
+  In some modes, an open-parenthesis, open-brace or other opening
 delimiter at the left margin is assumed by Emacs (including the
 indentation routines) to be the start of a function.  This speeds up
 indentation commands.  If you will be editing text which contains
@@ -422,7 +420,7 @@
 Paren}, for more information on this.
 
   Normally, lines are indented with tabs and spaces.  If you want Emacs
-to use spaces only, see @ref{Just Spaces}.
+to use spaces only, set @code{indent-tabs-mode} (@pxref{Just Spaces}).
 
 @node Multi-line Indent
 @subsection Indenting Several Lines
@@ -587,8 +585,8 @@
 
 @kindex C-c . @r{(C mode)}
 @findex c-set-style
-  To choose a style for the current buffer, use the command @kbd{C-c
-.}.  Specify a style name as an argument (case is not significant).
+  To choose a style for the current buffer, use the command @w{@kbd{C-c
+.}}.  Specify a style name as an argument (case is not significant).
 This command affects the current buffer only, and it affects only
 future invocations of the indentation commands; it does not reindent
 the code already in the buffer.  To reindent the whole buffer in the
@@ -740,7 +738,7 @@
 the mark at the beginning of the previous balanced expression.  The
 alias @kbd{C-M-@key{SPC}} is equivalent to @kbd{C-M-@@}.  When you
 repeat this command, or use it in Transient Mark mode when the mark is
-active, it extends the region by one sexp each time.
+active, it extends the end of the region by one sexp each time.
 
   In languages that use infix operators, such as C, it is not possible
 to recognize all balanced expressions as such because there can be
@@ -791,9 +789,7 @@
 that doesn't include meaningful parentheses (symbols, strings, etc.).
 
 @kindex C-M-u
-@kindex C-M-d
 @findex backward-up-list
-@findex down-list
   @kbd{C-M-n} and @kbd{C-M-p} try to stay at the same level in the
 parenthesis structure.  To move @emph{up} one (or @var{n}) levels, use
 @kbd{C-M-u} (@code{backward-up-list}).  @kbd{C-M-u} moves backward up
@@ -801,6 +797,8 @@
 repeat count; a negative argument reverses the direction of motion, so
 that the command moves forward and up one or more levels.
 
+@kindex C-M-d
+@findex down-list
   To move @emph{down} in the parenthesis structure, use @kbd{C-M-d}
 (@code{down-list}).  In Lisp mode, where @samp{(} is the only opening
 delimiter, this is nearly the same as searching for a @samp{(}.  An
@@ -852,11 +850,9 @@
 that case, because the cursor appears on top of that character.)  Use
 the command @kbd{M-x show-paren-mode} to enable or disable this mode.
 
-  By default, @code{show-paren-mode} uses colors to highlight the
-parentheses.  However, if your display doesn't support colors, you can
-customize the faces @code{show-paren-match-face} and
-@code{show-paren-mismatch-face} to use other attributes, such as bold or
-underline.  @xref{Face Customization}.
+  Show Paren mode uses the faces @code{show-paren-match} and
+@code{show-paren-mismatch} to highlight parentheses; you can customize
+them to control how highlighting looks.  @xref{Face Customization}.
 
 @node Comments
 @section Manipulating Comments
@@ -911,11 +907,11 @@
 start with (the value of @code{comment-start}; see below).  Point is
 after that string, so you can insert the text of the comment right
 away.  If the major mode has specified a string to terminate comments,
-@kbd{M-;} inserts that too, to keep the syntax valid.
+@kbd{M-;} inserts that after point, to keep the syntax valid.
 
-  If the text of the line extends past the comment column, then the
-comment start string is indented to a suitable boundary (usually, at
-least one space is inserted).
+  If the text of the line extends past the comment column, this
+command indents the comment start string to a suitable boundary
+(usually, at least one space is inserted).
 
   You can also use @kbd{M-;} to align an existing comment.  If a line
 already contains the comment-start string, @kbd{M-;} reindents it to
@@ -943,7 +939,8 @@
 is a comment, it removes comment delimiters from each; otherwise, it
 adds comment delimiters to each.)  If you are not using Transient Mark
 mode, then you should use the commands @code{comment-region} and
-@code{uncomment-region} to do these jobs (@pxref{Multi-Line Comments}).
+@code{uncomment-region} to do these jobs (@pxref{Multi-Line Comments}),
+or else enable Transient Mark mode momentarily (@pxref{Momentary Mark}).
 A prefix argument used in these circumstances specifies how many
 comment delimiters to add or how many to delete.
 
@@ -964,8 +961,8 @@
   (1+ x))           ; This line adds one.
 @end example
 
-  For C-like buffers, you can configure the exact effect of @kbd{M-;}
-more flexibly than for most buffers by setting the user options
+  For C-like modes, you can configure the exact effect of @kbd{M-;}
+more flexibly than for most buffers by setting the variables
 @code{c-indent-comment-alist} and
 @code{c-indent-comments-syntactically-p}.  For example, on a line
 ending in a closing brace, @kbd{M-;} puts the comment one space after
@@ -992,7 +989,7 @@
 @kindex C-c C-c (C mode)
 @findex comment-region
   To turn existing lines into comment lines, use the @kbd{M-x
-comment-region} command (or type @kbd{C-c C-c} in C-like buffers).  It
+comment-region} command (or type @kbd{C-c C-c} in C-like modes).  It
 adds comment delimiters to the lines that start in the region, thus
 commenting them out.  With a negative argument, it does the
 opposite---it deletes comment delimiters from the lines in the region.
@@ -1103,29 +1100,31 @@
 @findex info-lookup-symbol
 @findex info-lookup-file
 @kindex C-h S
-  For C, Lisp, and other languages that have documentation in Info,
-you can use @kbd{C-h S} (@code{info-lookup-symbol}) to view the Info
-documentation for a symbol used in the program.  You specify the
-symbol with the minibuffer; the default is the symbol appearing in the
-buffer at point.  For example, in C mode this looks for the symbol in
-the C Library Manual.
+  For many major modes, that apply to languages that have
+documentation in Info, you can use @kbd{C-h S}
+(@code{info-lookup-symbol}) to view the Info documentation for a
+symbol used in the program.  You specify the symbol with the
+minibuffer; the default is the symbol appearing in the buffer at
+point.  For example, in C mode this looks for the symbol in the C
+Library Manual.  The command only works if the appropriate manual's
+Info files are installed.
 
   The major mode determines where to look for documentation for the
 symbol---which Info files to look in, and which indices to search.
 You can also use @kbd{M-x info-lookup-file} to look for documentation
 for a file name.
 
-  This feature currently supports the modes AWK, Autoconf, Bison, C,
-Emacs Lisp, LaTeX, M4, Makefile, Octave, Perl, Scheme, and Texinfo,
-provided you have installed the relevant Info files, which are
-typically available with the appropriate GNU package.
+  If you use @kbd{C-h S} in a major mode that does not support it,
+it asks you to specify the ``symbol help mode''.  You should enter
+a command such as @code{c-mode} that would select a major
+mode which @kbd{C-h S} does support.
 
 @node Man Page
 @subsection Man Page Lookup
 
 @cindex manual page
   On Unix, the main form of on-line documentation was the @dfn{manual
-page} or @dfn{man page}.  In the GNU operating system, we hope to
+page} or @dfn{man page}.  In the GNU operating system, we aim to
 replace man pages with better-organized manuals that you can browse
 with Info (@pxref{Misc Help}).  This process is not finished, so it is
 still useful to read manual pages.
@@ -1151,8 +1150,8 @@
 when @kbd{M-x manual-entry} prompts for the topic.  For example, to
 read the man page for the C library function @code{chmod} (as opposed
 to a command of the same name), type @kbd{M-x manual-entry @key{RET}
-chmod(2) @key{RET}} (@code{chmod} is a system call, so it is in
-section @samp{2}).
+chmod(2) @key{RET}}.  (@code{chmod} is a system call, so it is in
+section @samp{2}.)
 
 @vindex Man-switches
   If you do not specify a section, the results depend on how the
@@ -1203,42 +1202,6 @@
 pops up a window with possible candidates asking you to choose one of
 them.
 
-@vindex woman-manpath
-  By default, @kbd{M-x woman} looks for manual pages in the
-directories specified in the @code{MANPATH} environment variable.  (If
-@code{MANPATH} is not set, @code{woman} uses a suitable default value,
-which can be customized.)  More precisely, @code{woman} looks for
-subdirectories that match the shell wildcard pattern @file{man*} in each one
-of these directories, and tries to find the manual pages in those
-subdirectories.  When first invoked, @kbd{M-x woman} converts the
-value of @code{MANPATH} to a list of directory names and stores that
-list in the @code{woman-manpath} variable.  Changing the value of this
-variable is another way to control the list of directories used.
-
-@vindex woman-path
-  You can also augment the list of directories searched by
-@code{woman} by setting the value of the @code{woman-path} variable.
-This variable should hold a list of specific directories which
-@code{woman} should search, in addition to those in
-@code{woman-manpath}.  Unlike @code{woman-manpath}, the directories in
-@code{woman-path} are searched for the manual pages, not for
-@file{man*} subdirectories.
-
-@findex woman-find-file
-  Occasionally, you might need to display manual pages that are not in
-any of the directories listed by @code{woman-manpath} and
-@code{woman-path}.  The @kbd{M-x woman-find-file} command prompts for a
-name of a manual page file, with completion, and then formats and
-displays that file like @kbd{M-x woman} does.
-
-@vindex woman-dired-keys
-  The first time you invoke @kbd{M-x woman}, it defines the Dired
-@kbd{W} key to run the @code{woman-find-file} command on the current
-line's file.  You can disable this by setting the variable
-@code{woman-dired-keys} to @code{nil}.  @xref{Dired}.  In addition,
-the Tar-mode @kbd{w} key is define to invoke @code{woman-find-file} on
-the current line's archive member.
-
   For more information about setting up and using @kbd{M-x woman}, see
 @ref{Top, WoMan, Browse UN*X Manual Pages WithOut Man, woman, The WoMan
 Manual}.
@@ -1325,8 +1288,8 @@
 Non-@code{nil} says that @kbd{hs-hide-all} should hide comments too.
 
 @item hs-isearch-open
-Specifies what kind of hidden blocks to open in Isearch mode.
-The value should be one of these four symbols:
+Specifies what kind of hidden blocks incremental search should make
+visible.  The value should be one of these four symbols:
 
 @table @code
 @item code
@@ -1533,24 +1496,6 @@
 Move point to the end of the innermost C statement or sentence; like
 @kbd{M-a} except that it moves in the other direction
 (@code{c-end-of-statement}).
-
-@item M-x c-backward-into-nomenclature
-@findex c-backward-into-nomenclature
-Move point backward to beginning of a C++ nomenclature section or
-word.  With prefix argument @var{n}, move @var{n} times.  If @var{n}
-is negative, move forward.  C++ nomenclature means a symbol name in
-the style of NamingSymbolsWithMixedCaseAndNoUnderlines; each capital
-letter begins a section or word.  Rather than this command, you might
-well prefer the newer ``Subword Mode'', which does the same thing
-better.  @xref{Other C Commands}.
-
-In the GNU project, we recommend using underscores to separate words
-within an identifier in C or C++, rather than using case distinctions.
-
-@item M-x c-forward-into-nomenclature
-@findex c-forward-into-nomenclature
-Move point forward to end of a C++ nomenclature section or word.
-With prefix argument @var{n}, move @var{n} times.
 @end table
 
 @node Electric C
@@ -1607,28 +1552,28 @@
 preprocessor commands.
 
 @table @kbd
-@item C-c C-@key{BS}
-@itemx C-c @key{BS}
+@item C-c C-@key{DEL}
+@itemx C-c @key{DEL}
 @findex c-hungry-backspace
-@kindex C-c C-@key{BS} (C Mode)
-@kindex C-c @key{BS} (C Mode)
+@kindex C-c C-@key{DEL} (C Mode)
+@kindex C-c @key{DEL} (C Mode)
 @code{c-hungry-backspace}---Delete the entire block of whitespace
 preceding point.
 
 @item C-c C-d
-@itemx C-c C-@key{DEL}
-@itemx C-c @key{DEL}
+@itemx C-c C-@key{DELETE}
+@itemx C-c @key{DELETE}
 @findex c-hungry-delete-forward
 @kindex C-c C-d (C Mode)
-@kindex C-c C-@key{DEL} (C Mode)
-@kindex C-c @key{DEL} (C Mode)
+@kindex C-c C-@key{DELETE} (C Mode)
+@kindex C-c @key{DELETE} (C Mode)
 @code{c-hungry-delete-forward}---Delete the entire block of whitespace
 following point.
 @end table
 
   As an alternative to the above commands, you can enable @dfn{hungry
 delete mode}.  When this feature is enabled (indicated by @samp{/h} in
-the mode line after the mode name), a single @key{BS} command deletes
+the mode line after the mode name), a single @key{DEL} command deletes
 all preceding whitespace, not just one space, and a single @kbd{C-c
 C-d} (but @emph{not} @key{DELETE}) deletes all following whitespace.
 
@@ -1661,6 +1606,9 @@
 (e.g. @samp{C/law}).  You can even use @kbd{M-x c-subword-mode} in
 non-CC Mode buffers.
 
+In the GNU project, we recommend using underscores to separate words
+within an identifier in C or C++, rather than using case distinctions.
+
 @item M-x c-context-line-break
 @findex c-context-line-break
 This command inserts a line break and indents the new line in a manner
--- a/man/rmail.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/rmail.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -10,15 +10,11 @@
 @findex rmail-mode
 @vindex rmail-mode-hook
 
-  Rmail is an Emacs subsystem for reading and disposing of mail that you
-receive.  Rmail stores mail messages in files called Rmail files.
-Reading the message in an Rmail file is done in a special major mode,
-Rmail mode, which redefines most letters to run commands for managing
-mail.  The command @code{rmail-mode} is used to switch into Rmail mode,
-and it runs the hook @code{rmail-mode-hook} as usual, but don't run this
-command by hand; it can't do a reasonable job unless the buffer is
-visiting a proper Rmail file.
-
+  Rmail is an Emacs subsystem for reading and disposing of mail that
+you receive.  Rmail stores mail messages in files called Rmail files
+which use a special format.  Reading the message in an Rmail file is
+done in a special major mode, Rmail mode, which redefines most letters
+to run commands for managing mail.
 @menu
 * Basic: Rmail Basics.       Basic concepts of Rmail, and simple use.
 * Scroll: Rmail Scrolling.   Scrolling through a message.
@@ -66,16 +62,16 @@
 @cindex message number
   Within the Rmail file, messages are normally arranged sequentially in
 order of receipt; you can specify other ways to sort them.  Messages are
-assigned consecutive integers as their @dfn{message numbers}.  The
-number of the current message is displayed in Rmail's mode line,
-followed by the total number of messages in the file.  You can move to a
-message by specifying its message number with the @kbd{j} key
+identified by consecutive integers which are their @dfn{message numbers}.
+The number of the current message is displayed in Rmail's mode line,
+followed by the total number of messages in the file.  You can move to
+a message by specifying its message number with the @kbd{j} key
 (@pxref{Rmail Motion}).
 
 @kindex s @r{(Rmail)}
 @findex rmail-expunge-and-save
   Following the usual conventions of Emacs, changes in an Rmail file
-become permanent only when the file is saved.  You can save it with
+become permanent only when you save the file.  You can save it with
 @kbd{s} (@code{rmail-expunge-and-save}), which also expunges deleted
 messages from the file first (@pxref{Rmail Deletion}).  To save the
 file without expunging, use @kbd{C-x C-s}.  Rmail also saves the Rmail
@@ -89,12 +85,12 @@
 and saves the Rmail file, then buries the Rmail buffer as well as its
 summary buffer, if present (@pxref{Rmail Summary}).  But there is no
 need to ``exit'' formally.  If you switch from Rmail to editing in
-other buffers, and never happen to switch back, you have exited.  Just
-make sure to save the Rmail file eventually (like any other file you
-have changed).  @kbd{C-x s} is a good enough way to do this
-(@pxref{Save Commands}).  The Rmail command @kbd{b}, @code{rmail-bury},
-buries the Rmail buffer and its summary buffer without expunging and
-saving the Rmail file.
+other buffers, and never switch back, you have exited.  Just make sure
+to save the Rmail file eventually (like any other file you have
+changed).  @kbd{C-x s} is a suitable way to do this (@pxref{Save
+Commands}).  The Rmail command @kbd{b}, @code{rmail-bury}, buries the
+Rmail buffer and its summary buffer without expunging and saving the
+Rmail file.
 
 @node Rmail Scrolling
 @section Scrolling Within a Message
@@ -102,7 +98,7 @@
   When Rmail displays a message that does not fit on the screen, you
 must scroll through it to read the rest.  You could do this with
 @kbd{C-v}, @kbd{M-v} and @kbd{M-<}, but in Rmail scrolling is so
-frequent that it deserves to be easier to type.
+frequent that it deserves to be easier.
 
 @table @kbd
 @item @key{SPC}
@@ -184,7 +180,7 @@
 undelete it---use the variants @kbd{M-n} and @kbd{M-p}
 (@code{rmail-next-message} and @code{rmail-previous-message}).  A
 numeric argument to any of these commands serves as a repeat
-count.@refill
+count.
 
   In Rmail, you can specify a numeric argument by typing just the
 digits.  You don't need to type @kbd{C-u} first.
@@ -315,14 +311,13 @@
 files which are inboxes for your primary Rmail file.  If you don't set
 this variable explicitly, it is initialized from the @env{MAIL}
 environment variable, or, as a last resort, set to @code{nil}, which
-means to use the default inbox.  The default inbox is
-@file{/var/mail/@var{username}}, @file{/usr/spool/mail/@var{username}},
-or @file{/usr/mail/@var{username}}, depending on your operating system.
+means to use the default inbox.  The default inbox file depends on
+your operating system; often it is @file{/var/mail/@var{username}},
+@file{/usr/spool/mail/@var{username}}, or
+@file{/usr/mail/@var{username}}.
 
-  To see what the default is on your system, use @kbd{C-h v
-rmail-primary-inbox-list @key{RET}}.  You can specify the inbox file(s) for
-any Rmail file with the command @code{set-rmail-inbox-list}; see
-@ref{Rmail Files}.
+  You can specify the inbox file(s) for any Rmail file with the
+command @code{set-rmail-inbox-list}; see @ref{Rmail Files}.
 
   There are two reasons for having separate Rmail files and inboxes.
 
@@ -346,18 +341,18 @@
 then, we have recognized that the usual inbox format on Unix and GNU
 systems is adequate for the job, and we plan to change Rmail to use that
 as its internal format.  However, the Rmail file will still be separate
-from the inbox file, even on systems where their format is the same.
+from the inbox file, even when their format is the same.
 
 @vindex rmail-preserve-inbox
-  When getting new mail, Rmail first copies the new mail from the inbox
-file to the Rmail file; then it saves the Rmail file; then it truncates
-the inbox file.  This way, a system crash may cause duplication of mail
-between the inbox and the Rmail file, but cannot lose mail.  If
-@code{rmail-preserve-inbox} is non-@code{nil}, then Rmail will copy new
-mail from the inbox file to the Rmail file without truncating the inbox
-file.  You may wish to set this, for example, on a portable computer you
-use to check your mail via POP while traveling, so that your mail will
-remain on the server and you can save it later on your workstation.
+  When getting new mail, Rmail first copies the new mail from the
+inbox file to the Rmail file; then it saves the Rmail file; then it
+clears out the inbox file.  This way, a system crash may cause
+duplication of mail between the inbox and the Rmail file, but cannot
+lose mail.  If @code{rmail-preserve-inbox} is non-@code{nil}, then
+Rmail does not clear out the inbox file when it gets new mail.  You
+may wish to set this, for example, on a portable computer you use to
+check your mail via POP while traveling, so that your mail will remain
+on the server and you can save it later on your workstation.
 
   In some cases, Rmail copies the new mail from the inbox file
 indirectly.  First it runs the @code{movemail} program to move the mail
@@ -403,10 +398,11 @@
 
 @kindex i @r{(Rmail)}
 @findex rmail-input
-  To run Rmail on a file other than your primary Rmail file, you may use
+  To run Rmail on a file other than your primary Rmail file, you can use
 the @kbd{i} (@code{rmail-input}) command in Rmail.  This visits the file
 in Rmail mode.  You can use @kbd{M-x rmail-input} even when not in
-Rmail.
+Rmail, but it is easier to type @kbd{C-u M-x rmail}, which does the
+same thing.
 
   The file you read with @kbd{i} should normally be a valid Rmail file.
 If it is not, Rmail tries to decompose it into a stream of messages in
@@ -416,23 +412,22 @@
 
 @vindex rmail-secondary-file-directory
 @vindex rmail-secondary-file-regexp
-  You can also select an Rmail file from a menu.  Choose first the menu
-bar Classify item, then from the Classify menu choose the Input Rmail
-File item; then choose the Rmail file you want.  The variables
-@code{rmail-secondary-file-directory} and
+  You can also select an Rmail file from a menu.  In the Classify menu,
+choose the Input Rmail File item; then choose the Rmail file you want.
+The variables @code{rmail-secondary-file-directory} and
 @code{rmail-secondary-file-regexp} specify which files to offer in the
 menu: the first variable says which directory to find them in; the
-second says which files in that directory to offer (all those that match
-the regular expression).  These variables also apply to choosing a file
-for output (@pxref{Rmail Output}).
+second says which files in that directory to offer (all those that
+match the regular expression).  These variables also apply to choosing
+a file for output (@pxref{Rmail Output}).
 
 @findex set-rmail-inbox-list
   Each Rmail file can contain a list of inbox file names; you can specify
 this list with @kbd{M-x set-rmail-inbox-list @key{RET} @var{files}
 @key{RET}}.  The argument can contain any number of file names, separated
 by commas.  It can also be empty, which specifies that this file should
-have no inboxes.  Once a list of inboxes is specified, the Rmail file
-remembers it permanently until you specify a different list.
+have no inboxes.  Once you specify a list of inboxes in an Rmail file,
+the  Rmail file remembers it permanently until you specify a different list.
 
   As a special exception, if your primary Rmail file does not specify any
 inbox files, it uses your standard system inbox.
@@ -440,9 +435,9 @@
 @kindex g @r{(Rmail)}
 @findex rmail-get-new-mail
   The @kbd{g} command (@code{rmail-get-new-mail}) merges mail into the
-current Rmail file from its specified inboxes.  If the Rmail file
-has no inboxes, @kbd{g} does nothing.  The command @kbd{M-x rmail}
-also merges new mail into your primary Rmail file.
+current Rmail file from its inboxes.  If the Rmail file has no
+inboxes, @kbd{g} does nothing.  The command @kbd{M-x rmail} also
+merges new mail into your primary Rmail file.
 
   To merge mail from a file that is not the usual inbox, give the
 @kbd{g} key a numeric argument, as in @kbd{C-u g}.  Then it reads a file
@@ -501,14 +496,14 @@
 the minibuffer, so you can specify a different name if you wish.
 
   You can also output a message to an Rmail file chosen with a menu.
-Choose first the menu bar Classify item, then from the Classify menu
-choose the Output Rmail File menu item; then choose the Rmail file you want.
-This outputs the current message to that file, like the @kbd{o} command.
-The variables @code{rmail-secondary-file-directory} and
+In the Classify menu, choose the Output Rmail File menu item; then
+choose the Rmail file you want.  This outputs the current message to
+that file, like the @kbd{o} command.  The variables
+@code{rmail-secondary-file-directory} and
 @code{rmail-secondary-file-regexp} specify which files to offer in the
 menu: the first variable says which directory to find them in; the
-second says which files in that directory to offer (all those that match
-the regular expression).
+second says which files in that directory to offer (all those that
+match the regular expression).
 
 @vindex rmail-delete-after-output
   Copying a message with @kbd{o} or @kbd{C-o} gives the original copy
@@ -606,7 +601,7 @@
 (@code{rmail-summary-by-labels}) displays a summary containing only the
 messages that have at least one of a specified set of labels.  The
 argument @var{labels} is one or more label names, separated by commas.
-@xref{Rmail Summary}, for information on summaries.@refill
+@xref{Rmail Summary}, for information on summaries.
 
   If the @var{labels} argument to @kbd{C-M-n}, @kbd{C-M-p} or
 @kbd{C-M-l} is empty, it means to use the last set of labels specified
@@ -616,9 +611,9 @@
 @section Rmail Attributes
 
   Some labels such as @samp{deleted} and @samp{filed} have built-in
-meanings and are assigned to or removed from messages automatically at
-appropriate times; these labels are called @dfn{attributes}.  Here is a
-list of Rmail attributes:
+meanings, and Rmail assigns them to messages automatically at
+appropriate times; these labels are called @dfn{attributes}.  Here is
+a list of Rmail attributes:
 
 @table @samp
 @item unseen
@@ -648,7 +643,7 @@
 rmail-resend}.  @xref{Rmail Reply}.
 @end table
 
-  All other labels are assigned or removed only by the user, and have no
+  All other labels are assigned or removed only by users, and have no
 standard meaning.
 
 @node Rmail Reply
@@ -659,7 +654,7 @@
 certain features meant to work with Rmail.  What this section documents
 are the special commands of Rmail for entering Mail mode.  Note that the
 usual keys for sending mail---@kbd{C-x m}, @kbd{C-x 4 m}, and @kbd{C-x 5
-m}---are available in Rmail mode and work just as they usually do.
+m}---also work normally in Rmail mode.
 
 @table @kbd
 @item m
@@ -679,15 +674,15 @@
 @kindex r @r{(Rmail)}
 @findex rmail-reply
 @cindex reply to a message
-  The most common reason to send a message while in Rmail is to reply to
-the message you are reading.  To do this, type @kbd{r}
-(@code{rmail-reply}).  This displays the @samp{*mail*} buffer in another
-window, much like @kbd{C-x 4 m}, but preinitializes the @samp{Subject},
-@samp{To}, @samp{CC} and @samp{In-reply-to} header fields based on the
-message you are replying to.  The @samp{To} field starts out as the
-address of the person who sent the message you received, and the
-@samp{CC} field starts out with all the other recipients of that
-message.
+  The most common reason to send a message while in Rmail is to reply
+to the message you are reading.  To do this, type @kbd{r}
+(@code{rmail-reply}).  This displays the @samp{*mail*} buffer in
+another window, much like @kbd{C-x 4 m}, but preinitializes the
+@samp{Subject}, @samp{To}, @samp{CC}, @samp{In-reply-to} and
+@samp{References} header fields based on the message you are replying
+to.  The @samp{To} field starts out as the address of the person who
+sent the message you received, and the @samp{CC} field starts out with
+all the other recipients of that message.
 
 @vindex rmail-dont-reply-to-names
   You can exclude certain recipients from being placed automatically in
@@ -700,13 +695,14 @@
 
   To omit the @samp{CC} field completely for a particular reply, enter
 the reply command with a numeric argument: @kbd{C-u r} or @kbd{1 r}.
+This means to reply only to the sender of the original message.
 
   Once the @samp{*mail*} buffer has been initialized, editing and
 sending the mail goes as usual (@pxref{Sending Mail}).  You can edit the
-presupplied header fields if they are not right for you.  You can also
+presupplied header fields if they are not what you want.  You can also
 use the commands of Mail mode (@pxref{Mail Mode}), including @kbd{C-c
 C-y} which yanks in the message that you are replying to.  You can
-switch to the Rmail buffer, select a different message there, switch
+also switch to the Rmail buffer, select a different message there, switch
 back, and yank the new current message.
 
 @kindex M-m @r{(Rmail)}
@@ -764,13 +760,13 @@
 Its only difference from @kbd{C-x 4 m} is that it makes the Rmail buffer
 accessible for @kbd{C-c C-y}, just as @kbd{r} does.  Thus, @kbd{m} can be
 used to reply to or forward a message; it can do anything @kbd{r} or @kbd{f}
-can do.@refill
+can do.
 
 @kindex c @r{(Rmail)}
 @findex rmail-continue
   The @kbd{c} (@code{rmail-continue}) command resumes editing the
 @samp{*mail*} buffer, to finish editing an outgoing message you were
-already composing, or to alter a message you have sent.@refill
+already composing, or to alter a message you have sent.
 
 @vindex rmail-mail-new-frame
   If you set the variable @code{rmail-mail-new-frame} to a
@@ -845,14 +841,14 @@
   @kbd{C-M-l @var{labels} @key{RET}} (@code{rmail-summary-by-labels}) makes
 a partial summary mentioning only the messages that have one or more of the
 labels @var{labels}.  @var{labels} should contain label names separated by
-commas.@refill
+commas.
 
 @kindex C-M-r @r{(Rmail)}
 @findex rmail-summary-by-recipients
   @kbd{C-M-r @var{rcpts} @key{RET}} (@code{rmail-summary-by-recipients})
 makes a partial summary mentioning only the messages that have one or more
 of the recipients @var{rcpts}.  @var{rcpts} should contain mailing
-addresses separated by commas.@refill
+addresses separated by commas.
 
 @kindex C-M-t @r{(Rmail)}
 @findex rmail-summary-by-topic
@@ -867,8 +863,8 @@
 (including the date and the subject lines) match the regular
 expression @var{regexp}.
 
-  Note that there is only one summary buffer for any Rmail file; making one
-kind of summary discards any previously made summary.
+  Note that there is only one summary buffer for any Rmail file;
+making any kind of summary discards any previous summary.
 
 @vindex rmail-summary-window-size
 @vindex rmail-summary-line-count-flag
@@ -1007,19 +1003,25 @@
 @end table
 
 @vindex rmail-ignored-headers
+@vindex rmail-nonignored-headers
   Reformatting the header involves deleting most header fields, on the
 grounds that they are not interesting.  The variable
 @code{rmail-ignored-headers} holds a regular expression that specifies
-which header fields to hide in this way---if it matches the beginning of
-a header field, that whole field is hidden.
+which header fields to hide in this way---if it matches the beginning
+of a header field, that whole field is hidden.  However, the variable
+@code{rmail-nonignored-headers} provides a further override: a header
+matching that regular expression is shown even if it matches
+@code{rmail-ignored-headers} too.
 
 @kindex t @r{(Rmail)}
 @findex rmail-toggle-header
   Rmail saves the complete original header before reformatting; to see
 it, use the @kbd{t} command (@code{rmail-toggle-header}).  This
-discards the reformatted headers of the current message and displays it
-with the original header.  Repeating @kbd{t} reformats the message
-again.  Selecting the message again also reformats.
+discards the reformatted headers of the current message and displays
+it with the original header.  Repeating @kbd{t} reformats the message
+again, which shows only the interesting headers according to the
+current values of those variable.  Selecting the message again also
+reformats it if necessary.
 
   One consequence of this is that if you edit the reformatted header
 (using @kbd{e}; @pxref{Rmail Editing}), subsequent use of @kbd{t} will
@@ -1041,10 +1043,10 @@
 
   If you specify unusual colors for your text foreground and
 background, the colors used for highlighting may not go well with
-them.  If so, specify different colors for the face
-@code{rmail-highlight-face}.  @xref{Faces}, for how to do this.  To
-turn off highlighting entirely in Rmail, set
-@code{rmail-highlighted-headers} to @code{nil}.
+them.  If so, specify different colors by setting the variable
+@code{rmail-highlight-face} to a suitable face.  To turn off
+highlighting entirely in Rmail, set @code{rmail-highlighted-headers}
+to @code{nil}.
 
   You can highlight and activate URLs in incoming messages by adding
 the function @code{goto-address} to the hook
--- a/man/search.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/search.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -737,7 +737,7 @@
 you can't refer back to it with @samp{\@var{d}}.  This is useful
 in mechanically combining regular expressions, so that you
 can add groups for syntactic purposes without interfering with
-the numbering of the groups that were written by the user.
+the numbering of the groups that are meant to be referred to.
 
 @item \@var{d}
 matches the same text that matched the @var{d}th occurrence of a
--- a/man/sending.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/sending.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -93,9 +93,10 @@
 automatically when you send the message.  Others, such as the recipient
 names, must be specified by you in order to send the message properly.
 
-  Mail mode provides a few commands to help you edit some header fields,
-and some are preinitialized in the buffer automatically at times.  You can
-insert and edit header fields using ordinary editing commands.
+  In the mail buffer, you can insert and edit header fields using
+ordinary editing commands.  Mail mode provides a commands to help you
+edit some header fields, and some are preinitialized in the buffer
+automatically when appropriate.
 
   The line in the buffer that says
 
@@ -110,7 +111,7 @@
 message actually sent.  The text used for the delimiter line is controlled
 by the variable @code{mail-header-separator}.
 
-Here is an example of what the headers and text in the mail buffer
+  Here is an example of what the headers and text in the mail buffer
 might look like.
 
 @example
@@ -221,7 +222,7 @@
 continuation lines: one or more lines starting with whitespace,
 following the starting line of the field, are considered part of the
 field.  Here's an example of a @samp{To} field with a continuation
-line:@refill
+line:
 
 @example
 @group
@@ -433,9 +434,8 @@
 using it.  This is the usual way to send the message.
 
   In a file-visiting buffer, sending the message does not clear the
-modified flag, because only saving the file should do that.  As a
-result, you don't get a warning if you try to send the same message
-twice.
+modified flag, because only saving the file should do that.  Also, you
+don't get a warning if you try to send the same message twice.
 
 @c This is indexed in mule.texi, node "Recognize Coding".
 @c @vindex sendmail-coding-system
--- a/man/text.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/text.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -12,7 +12,8 @@
 that you edit with Emacs is text, in this sense of the word.  The other
 meaning is more restrictive: a sequence of characters in a human language
 for humans to read (possibly after processing by a text formatter), as
-opposed to a program or commands for a program.
+opposed to a program or binary data.  This chapter is concerned with
+editing text in the narrower sense.
 
   Human languages have syntactic/stylistic conventions that can be
 supported or used to advantage by editor commands: conventions involving
@@ -41,7 +42,7 @@
 @ifinfo
 mode.
 @end ifinfo
-For input to nroff, use Nroff mode.
+For input to groff or nroff, use Nroff mode.
 
   Instead of using a text formatter, you can edit formatted text in
 WYSIWYG style (``what you see is what you get''), with Enriched mode.
@@ -113,7 +114,7 @@
 repeat counts.  @kbd{M-f} with a negative argument moves backward, and
 @kbd{M-b} with a negative argument moves forward.  Forward motion
 stops right after the last letter of the word, while backward motion
-stops right before the first letter.@refill
+stops right before the first letter.
 
 @kindex M-d
 @findex kill-word
@@ -130,10 +131,10 @@
 @kindex M-DEL
   @kbd{M-@key{DEL}} (@code{backward-kill-word}) kills the word before
 point.  It kills everything from point back to where @kbd{M-b} would
-move to.  If point is after the space in @w{@samp{FOO, BAR}}, then
-@w{@samp{FOO, }} is killed.  (If you wish to kill just @samp{FOO}, and
-not the comma and the space, use @kbd{M-b M-d} instead of
-@kbd{M-@key{DEL}}.)
+move to.  For instance, if point is after the space in @w{@samp{FOO,
+BAR}}, it kills @w{@samp{FOO, }}.  If you wish to kill just
+@samp{FOO}, and not the comma and the space, use @kbd{M-b M-d} instead
+of @kbd{M-@key{DEL}}.
 
 @c Don't index M-t and transpose-words here, they are indexed in
 @c fixit.texi, in the node "Transpose".
@@ -155,9 +156,9 @@
 scan for the place to put the mark.  In Transient Mark mode, this command
 activates the mark.
 
-  The word commands' understanding of syntax is completely controlled by
-the syntax table.  Any character can, for example, be declared to be a word
-delimiter.  @xref{Syntax}.
+  The word commands' understanding of word boundaries is controlled
+by the syntax table.  Any character can, for example, be declared to
+be a word delimiter.  @xref{Syntax}.
 
 @node Sentences
 @section Sentences
@@ -206,7 +207,7 @@
 There is also a command, @kbd{C-x @key{DEL}}
 (@code{backward-kill-sentence}), for killing back to the beginning of a
 sentence.  This command is useful when you change your mind in the
-middle of composing text.@refill
+middle of composing text.
 
   The sentence commands assume that you follow the American typist's
 convention of putting two spaces at the end of a sentence; they consider
@@ -214,34 +215,36 @@
 followed by the end of a line or two spaces, with any number of
 @samp{)}, @samp{]}, @samp{'}, or @samp{"} characters allowed in between.
 A sentence also begins or ends wherever a paragraph begins or ends.
+It is useful to follow this convention, because it makes a distinction
+between periods that end a sentence and periods that indicate
+abbreviations; that enables the Emacs sentence commands to distinguish,
+too.  These commands to not stop for periods that indicate abbreviations.
+
+@vindex sentence-end-double-space
+  If you want to use just one space between sentences, you can set the
+variable @code{sentence-end-double-space} to @code{nil} to make the
+sentence commands stop for single spaces.  However, this mode has a
+drawback: there is no way to distinguish between periods that end
+sentences and those that indicate abbreviations.  For convenient and
+reliable editing, we therefore recommend you follow the two-space
+convention.  The variable @code{sentence-end-double-space} also
+affects filling (@pxref{Fill Commands}) in related ways.
 
 @vindex sentence-end
-  The variable @code{sentence-end} controls recognition of the end of
-a sentence.  If non-@code{nil}, it is a regexp that matches the last
-few characters of a sentence, together with the whitespace following
-the sentence.  If the value is @code{nil}, the default, then Emacs
-computes the regexp according to various criteria.  The result is
-normally similar to the following regexp:
-
-@example
-"[.?!][]\"')]*\\($\\| $\\|\t\\|  \\)[ \t\n]*"
-@end example
-
-@noindent
-This example is explained in the section on regexps.  @xref{Regexp Example}.
-
-  If you want to use just one space between sentences, you should
-set @code{sentence-end} to this value:
-
-@example
-"[.?!][]\"')]*\\($\\|\t\\| \\)[ \t\n]*"
-@end example
-
-@noindent
-This is what setting the variable @code{sentence-end-double-space} to
-@code{nil} automatically does.  But note that this makes it impossible
-to distinguish between periods that end sentences and those that
-indicate abbreviations.
+  The variable @code{sentence-end} controls how to recognize the end
+of a sentence.  If non-@code{nil}, it is a regexp that matches the
+last few characters of a sentence, together with the whitespace
+following the sentence.  If the value is @code{nil}, the default, then
+Emacs computes the regexp according to various criteria such as the
+value of @code{sentence-end-double-space}.  @xref{Regexp Example}, for
+a detailed explanation of one of the regular expressions Emacs uses
+for this purpose.
+
+@vindex sentence-end-without-period
+  Some languages do not use period to indicate end of sentence.  For
+example, a sentence in Thai text ends with double space but without a
+period.  Set the variable @code{sentence-end-without-period} to
+@code{t} to tell the sentence commands that a period is not necessary.
 
 @node Paragraphs
 @section Paragraphs
@@ -266,18 +269,20 @@
   @kbd{M-@{} moves to the beginning of the current or previous
 paragraph, while @kbd{M-@}} moves to the end of the current or next
 paragraph.  Blank lines and text-formatter command lines separate
-paragraphs and are not considered part of any paragraph.  In
-Paragraph-Indent Text mode, but not in Text mode, an indented line
-also starts a new paragraph.  If there is a blank line before the
-paragraph, @kbd{M-@{} moves to the blank line, because that is
-convenient in practice.
+paragraphs and are not considered part of any paragraph.  If there is
+a blank line before the paragraph, @kbd{M-@{} moves to the blank line,
+because that is convenient in practice.
+
+  In Text mode, an indented line is not a paragraph break.  If you
+want indented lines to have this effect, use Paragraph-Indent Text
+mode instead.  @xref{Text Mode}.
 
   In major modes for programs, paragraphs begin and end only at blank
-lines.  This makes the paragraph commands continue to be useful even
-though there are no paragraphs per se.
-
-  When there is a fill prefix, then paragraphs are delimited by all lines
-which don't start with the fill prefix.  @xref{Filling}.
+lines.  This makes the paragraph commands useful, even though there
+are no paragraphs as such in a program.
+
+  When you have set a fill prefix, then paragraphs are delimited by
+all lines which don't start with the fill prefix.  @xref{Filling}.
 
 @kindex M-h
 @findex mark-paragraph
@@ -399,11 +404,11 @@
 
 @menu
 * Auto Fill::	        Auto Fill mode breaks long lines automatically.
-* Refill::              Keeping paragraphs filled.
 * Fill Commands::       Commands to refill paragraphs and center lines.
 * Fill Prefix::	        Filling paragraphs that are indented
                           or in a comment, etc.
 * Adaptive Fill::       How Emacs can determine the fill prefix automatically.
+* Refill::              Keeping paragraphs filled.
 * Longlines::           Editing text with very long lines.
 @end menu
 
@@ -464,31 +469,6 @@
 The section on init files says how to arrange this permanently for yourself.
 @xref{Init File}.
 
-@node Refill
-@subsection Refill Mode
-@cindex refilling text, word processor style
-@cindex modes, Refill
-@cindex Refill minor mode
-
-  Refill minor mode provides support for keeping paragraphs filled as
-you type or modify them in other ways.  It provides an effect similar
-to typical word processor behavior.  This works by running a
-paragraph-filling command at suitable times.
-
-  To toggle the use of Refill mode in the current buffer, type
-@kbd{M-x refill-mode}.  When you are typing text, only characters
-which normally trigger auto filling, like the space character, will
-trigger refilling.  This is to avoid making it too slow.  Apart from
-self-inserting characters, other commands which modify the text cause
-refilling.
-
-  The current implementation is preliminary and not robust.  You can
-get better ``line wrapping'' behavior using Longlines mode.
-@xref{Longlines}.  However, Longlines mode has an important
-side-effect: the newlines that it inserts for you are not saved to
-disk, so the files that you make with Longlines mode will appear to be
-completely unfilled if you edit them without Longlines mode.
-
 @node Fill Commands
 @subsection Explicit Fill Commands
 
@@ -515,24 +495,24 @@
 
 @findex fill-region
   To refill many paragraphs, use @kbd{M-x fill-region}, which
-divides the region into paragraphs and fills each of them.
+finds the paragraphs in the region and fills each of them.
 
 @findex fill-region-as-paragraph
   @kbd{M-q} and @code{fill-region} use the same criteria as @kbd{M-h}
 for finding paragraph boundaries (@pxref{Paragraphs}).  For more
 control, you can use @kbd{M-x fill-region-as-paragraph}, which refills
-everything between point and mark.  This command deletes any blank lines
-within the region, so separate blocks of text end up combined into one
-block.@refill
+everything between point and mark as a single paragraph.  This command
+deletes any blank lines within the region, so separate blocks of text
+end up combined into one block.
 
 @cindex justification
-  A numeric argument to @kbd{M-q} causes it to @dfn{justify} the text as
-well as filling it.  This means that extra spaces are inserted to make
-the right margin line up exactly at the fill column.  To remove the
-extra spaces, use @kbd{M-q} with no argument.  (Likewise for
+  A numeric argument to @kbd{M-q} tells it to @dfn{justify} the text
+as well as filling it.  This means that extra spaces are inserted to
+make the right margin line up exactly at the fill column.  To remove
+the extra spaces, use @kbd{M-q} with no argument.  (Likewise for
 @code{fill-region}.)  Another way to control justification, and choose
-other styles of filling, is with the @code{justification} text property;
-see @ref{Format Justification}.
+other styles of filling, is with the @code{justification} text
+property; see @ref{Format Justification}.
 
 @kindex M-s @r{(Text mode)}
 @cindex centering
@@ -561,7 +541,6 @@
 the distinction between these two ways of using a period, the fill
 commands do not break a line after a period followed by just one space.
 
-@vindex sentence-end-double-space
   If the variable @code{sentence-end-double-space} is @code{nil}, the
 fill commands expect and leave just one space at the end of a sentence.
 Ordinarily this variable is @code{t}, so the fill commands insist on
@@ -571,18 +550,13 @@
   If the variable @code{colon-double-space} is non-@code{nil}, the
 fill commands put two spaces after a colon.
 
-@vindex sentence-end-without-period
-  Some languages do not use period to indicate end of sentence.  For
-example, a sentence in Thai text ends with double space but without a
-period.  Set the variable @code{sentence-end-without-period} to
-@code{t} to tell the sentence commands that a period is not necessary.
-
 @vindex fill-nobreak-predicate
   The variable @code{fill-nobreak-predicate} specifies additional
 conditions for where line-breaking is allowed.  Its value is either
 @code{nil} or a Lisp function; the function is called with no
-arguments, and if it returns a non-@code{nil} value, then point is not
-a good place to break the line.  Two standard functions you can use are
+arguments, with point at a place where Emacs is considering breaking
+the line.  If the function returns a non-@code{nil} value, then that's
+a bad place to break the line.  Two standard functions you can use are
 @code{fill-single-word-nobreak-p} (don't break after the first word of
 a sentence or before the last) and @code{fill-french-nobreak-p} (don't
 break after @samp{(} or before @samp{)}, @samp{:} or @samp{?}).
@@ -615,20 +589,20 @@
 @findex set-fill-prefix
   To specify a fill prefix for the current buffer, move to a line that
 starts with the desired prefix, put point at the end of the prefix,
-and give the command @w{@kbd{C-x .}}@: (@code{set-fill-prefix}).
-That's a period after the @kbd{C-x}.  To turn off the fill prefix,
-specify an empty prefix: type @w{@kbd{C-x .}}@: with point at the
-beginning of a line.@refill
+and type @w{@kbd{C-x .}}@: (@code{set-fill-prefix}).  (That's a period
+after the @kbd{C-x}.)  To turn off the fill prefix, specify an empty
+prefix: type @w{@kbd{C-x .}}@: with point at the beginning of a line.
 
   When a fill prefix is in effect, the fill commands remove the fill
-prefix from each line before filling and insert it on each line after
-filling.  (The beginning of the first line is left unchanged, since
-often that is intentionally different.)  Auto Fill mode also inserts
-the fill prefix automatically when it makes a new line.  The @kbd{C-o}
-command inserts the fill prefix on new lines it creates, when you use
-it at the beginning of a line (@pxref{Blank Lines}).  Conversely, the
-command @kbd{M-^} deletes the prefix (if it occurs) after the newline
-that it deletes (@pxref{Indentation}).
+prefix from each line of the paragraph before filling and insert it on
+each line after filling.  (The beginning of the first line of the
+paragraph is left unchanged, since often that is intentionally
+different.)  Auto Fill mode also inserts the fill prefix automatically
+when it makes a new line.  The @kbd{C-o} command inserts the fill
+prefix on new lines it creates, when you use it at the beginning of a
+line (@pxref{Blank Lines}).  Conversely, the command @kbd{M-^} deletes
+the prefix (if it occurs) after the newline that it deletes
+(@pxref{Indentation}).
 
   For example, if @code{fill-column} is 40 and you set the fill prefix
 to @samp{;; }, then @kbd{M-q} in the following text
@@ -749,6 +723,31 @@
 line.  If it returns @code{nil}, @code{adaptive-fill-regexp} gets
 a chance to find a prefix.
 
+@node Refill
+@subsection Refill Mode
+@cindex refilling text, word processor style
+@cindex modes, Refill
+@cindex Refill minor mode
+
+  Refill minor mode provides support for keeping paragraphs filled as
+you type or modify them in other ways.  It provides an effect similar
+to typical word processor behavior.  This works by running a
+paragraph-filling command at suitable times.
+
+  To toggle the use of Refill mode in the current buffer, type
+@kbd{M-x refill-mode}.  When you are typing text, only characters
+which normally trigger auto filling, like the space character, will
+trigger refilling.  This is to avoid making it too slow.  Apart from
+self-inserting characters, other commands which modify the text cause
+refilling.
+
+  The current implementation is preliminary and not robust.  You can
+get better ``line wrapping'' behavior using Longlines mode.
+@xref{Longlines}.  However, Longlines mode has an important
+side-effect: the newlines that it inserts for you are not saved to
+disk, so the files that you make with Longlines mode will appear to be
+completely unfilled if you edit them without Longlines mode.
+
 @node Longlines
 @subsection Long Lines Mode
 @cindex refilling text, word processor style
@@ -786,11 +785,11 @@
 automatic line wrapping back on, type @kbd{M-x longlines-auto-wrap}.
 
 @findex longlines-show-hard-newlines
-  Whenever you type @kbd{RET}, you are inserting a hard newline.  If
-you want to see where all the hard newlines are, type @kbd{M-x
-longlines-show-hard-newlines}.  This will mark each hard newline with
-a special symbol.  The same command with a prefix argument turns this
-display off.
+  Type @kbd{RET} to insert a hard newline, one which automatic
+refilling will not remove.  If you want to see where all the hard
+newlines are, type @kbd{M-x longlines-show-hard-newlines}.  This will
+mark each hard newline with a special symbol.  The same command with a
+prefix argument turns this display off.
 
   Long Lines mode does not change normal text files that are already
 filled, since the existing newlines are considered hard newlines.
@@ -845,10 +844,11 @@
 This is convenient when you have just typed a word in the wrong case: you
 can give the case conversion command and continue typing.
 
-  If a word case conversion command is given in the middle of a word, it
-applies only to the part of the word which follows point.  This is just
-like what @kbd{M-d} (@code{kill-word}) does.  With a negative argument,
-case conversion applies only to the part of the word before point.
+  If a word case conversion command is given in the middle of a word,
+it applies only to the part of the word which follows point.  (This is
+comparable to what @kbd{M-d} (@code{kill-word}) does.)  With a
+negative argument, case conversion applies only to the part of the
+word before point.
 
 @kindex C-x C-l
 @kindex C-x C-u
@@ -888,22 +888,23 @@
   Text mode turns off the features concerned with comments except when
 you explicitly invoke them.  It changes the syntax table so that
 single-quotes are considered part of words.  However, if a word starts
-with single-quotes, then these are treated as a prefix for purposes
-such as capitalization.  That is, @kbd{M-c} will convert
-@samp{'hello'} into @samp{'Hello'}, as expected.
+with single-quotes, these are treated as a prefix for purposes such as
+capitalization.  That is, @kbd{M-c} will convert @samp{'hello'} into
+@samp{'Hello'}, as expected.
 
 @cindex Paragraph-Indent Text mode
 @cindex mode, Paragraph-Indent Text
 @findex paragraph-indent-text-mode
 @findex paragraph-indent-minor-mode
   If you indent the first lines of paragraphs, then you should use
-Paragraph-Indent Text mode rather than Text mode.  In this mode, you do
-not need to have blank lines between paragraphs, because the first-line
-indentation is sufficient to start a paragraph; however paragraphs in
-which every line is indented are not supported.  Use @kbd{M-x
-paragraph-indent-text-mode} to enter this mode.  Use @kbd{M-x
-paragraph-indent-minor-mode} to enter an equivalent minor mode, for
-instance during mail composition.
+Paragraph-Indent Text mode rather than Text mode.  In this mode, you
+do not need to have blank lines between paragraphs, because the
+first-line indentation is sufficient to start a paragraph; however
+paragraphs in which every line is indented are not supported.  Use
+@kbd{M-x paragraph-indent-text-mode} to enter this mode.  Use @kbd{M-x
+paragraph-indent-minor-mode} to enable an equivalent minor mode in
+situations where you can't change the major mode---in mail
+composition, for instance.
 
 @kindex M-TAB @r{(Text mode)}
   Text mode, and all the modes based on it, define @kbd{M-@key{TAB}}
@@ -1083,7 +1084,7 @@
 similarly backward.  Both accept numeric arguments as repeat counts.  The
 names emphasize that invisible headings are skipped, but this is not really
 a special feature.  All editing commands that look for lines ignore the
-invisible lines automatically.@refill
+invisible lines automatically.
 
 @findex outline-up-heading
 @findex outline-forward-same-level
@@ -1164,7 +1165,7 @@
 heading line's @dfn{subtree}: its body, all its subheadings, both
 direct and indirect, and all of their bodies.  In other words, the
 subtree contains everything following the current heading line, up to
-and not including the next heading of the same or higher rank.@refill
+and not including the next heading of the same or higher rank.
 
 @findex hide-leaves
 @findex show-branches
@@ -1181,7 +1182,7 @@
   A little weaker than @code{show-branches} is @kbd{C-c C-i}
 (@code{show-children}).  It makes just the direct subheadings
 visible---those one level down.  Deeper subheadings remain invisible, if
-they were invisible.@refill
+they were invisible.
 
 @findex hide-body
 @findex show-all
@@ -1356,13 +1357,14 @@
 @findex slitex-mode
 @findex doctex-mode
 
-  @TeX{} is a powerful text formatter written by Donald Knuth; it is also
-free, like GNU Emacs.  La@TeX{} is a simplified input format for @TeX{},
-implemented by @TeX{} macros; it comes with @TeX{}.  Sli@TeX{} is a special
-form of La@TeX{}.@footnote{Sli@TeX{} is obsoleted by the @samp{slides}
-document class in recent La@TeX{} versions.}  Doc@TeX{} (@file{.dtx})
-is a special file format in which the La@TeX{} sources are written,
-combining sources with documentation.
+  @TeX{} is a powerful text formatter written by Donald Knuth; it is
+also free software, like GNU Emacs.  La@TeX{} is a simplified input
+format for @TeX{}, implemented by @TeX{} macros; it comes with @TeX{}.
+Sli@TeX{} is a special form of La@TeX{}.@footnote{Sli@TeX{} is
+obsoleted by the @samp{slides} document class in recent La@TeX{}
+versions.}  Doc@TeX{} (@file{.dtx}) is a special file format in which
+the La@TeX{} sources are written, combining sources with
+documentation.
 
   Emacs has a special @TeX{} mode for editing @TeX{} input files.
 It provides facilities for checking the balance of delimiters and for
@@ -1611,7 +1613,7 @@
 
   Type @kbd{C-c C-k} (@code{tex-kill-job}) to kill the @TeX{} process if
 you see that its output is no longer useful.  Using @kbd{C-c C-b} or
-@kbd{C-c C-r} also kills any @TeX{} process still running.@refill
+@kbd{C-c C-r} also kills any @TeX{} process still running.
 
 @findex tex-region
 @kindex C-c C-r @r{(@TeX{} mode)}
@@ -1838,7 +1840,7 @@
 @vindex sgml-xml-mode
   SGML mode and HTML mode support XML also.  In XML, every opening tag
 must have an explicit closing tag.  When @code{sgml-xml-mode} is
-non-@code{nil}, SGML mode (and HTML mode) always insert explicit
+non-@code{nil}, SGML mode and HTML mode always insert explicit
 closing tags.  When you visit a file, these modes determine from the
 file contents whether it is XML or not, and set @code{sgml-xml-mode}
 accordingly, so that they do the right thing for the file in either
@@ -2380,7 +2382,7 @@
 @cindex table mode
 @cindex text-based tables
 
-  Table Mode provides an easy and intuitive way to create and edit WYSIWYG
+  Table mode provides an easy and intuitive way to create and edit WYSIWYG
 text-based tables.  Here is an example of such a table:
 
 @smallexample
@@ -2402,7 +2404,7 @@
 +-----------------+--------------------------------+-----------------+
 @end smallexample
 
-  Table Mode allows the contents of the table such as this one to be
+  Table mode allows the contents of the table such as this one to be
 easily manipulated by inserting or deleting characters inside a cell.
 A cell is effectively a localized rectangular edit region and edits to
 a cell do not affect the contents of the surrounding cells.  If the
@@ -2428,8 +2430,8 @@
 @node Table Definition
 @subsection What is a Text-based Table?
 
-  Look at the following examples of valid tables as a reference while
-you read this section:
+  Keep the following examples of valid tables in mind as a reference
+while you read this section:
 
 @example
               +--+----+---+     +-+     +--+-----+
@@ -2441,15 +2443,13 @@
                                         +-----+--+
 @end example
 
-  A table consists of a rectangular frame and the contents inside the
-frame.  A table's cells must be at least one character wide and one
-character high with two adjacent cells sharing a boarder line.  A cell
-can be subdivided into multiple rectangular cells but cannot nest or
-overlap.
-
-  Both the table frame and cell border lines must consist of one of
-three special characters.  The variables that hold these characters
-are described below:
+  A table consists of a rectangular frame whose inside is divided into
+cells.  Each cell must be at least one character wide and one
+character high, not counting its border lines.  A cell can be
+subdivided into multiple rectangular cells, but cells cannot overlap.
+
+  The table frame and cell border lines are made of three special
+characters.  These variables specify those characters:
 
 @table @code
 @vindex table-cell-vertical-char
@@ -2487,9 +2487,9 @@
 
 @enumerate a
 @item
-Nested cells are not allowed.
+Overlapped cells or non-rectangular cells are not allowed.
 @item
-Overlapped cells or non-rectangular cells are not allowed.
+Same as a.
 @item
 The border must be rectangular.
 @item
@@ -2506,16 +2506,15 @@
 @findex table-insert
   The command to create a table is @code{table-insert}.  When called
 interactively, it asks for the number of columns, number of rows, cell
-width and cell height.  The number of columns is a number of cells
-within the table's width.  The number of rows is the number of cells
-within the table's height.  The cell width is a number of characters
-that fit within a cell width.  The cell height is a number of lines
-within cell height.  While the number of columns and number of rows
-must be an integer number, the cell width and the cell height can be
-either an integer number (when the value is constant across the table)
-or a series of integer numbers, separated by spaces or commas, where
-each number corresponds to each cell width within a row from left to
-right or each cell height within a column from top to bottom.
+width and cell height.  The number of columns is the number of cells
+horizontally side by side.  The number of rows is the number of cells
+vertically within the table's height.  The cell width is a number of
+characters that each cell holds, left to right.  The cell height is a
+number of lines each cell holds.  The cell width and the cell height
+can be either an integer (when the value is constant across the table)
+or a series of integer, separated by spaces or commas, where each
+number corresponds to the next cell within a row from left to right,
+or the next cell within a column from top to bottom.
 
 @node Table Recognition
 @subsection Table Recognition
@@ -2523,7 +2522,7 @@
 
 @findex table-recognize
 @findex table-unrecognize
-  Table Mode maintains special text properties in the buffer to allow
+  Table mode maintains special text properties in the buffer to allow
 editing in a convenient fashion.  When a buffer with tables is saved
 to its file, these text properties are lost, so when you visit this
 file again later, Emacs does not see a table, but just formatted text.
@@ -2531,15 +2530,10 @@
 table-recognize} command.  It scans the current buffer, recognizes
 valid table cells, and attaches appropriate text properties to allow
 for table editing.  The converse command, @code{table-unrecognize}, is
-used to remove the special text properties and revert the buffer back
+used to remove the special text properties and convert the buffer back
 to plain text.
 
-  An optional numeric prefix argument can precede the
-@code{table-recognize} command.  If the argument is negative, tables
-in the buffer become inactive.  This is equivalent to invoking
-@code{table-unrecognize}.
-
-  Similar functions exist to enable or disable tables within a region,
+  Special commands exist to enable or disable tables within a region,
 enable or disable individual tables, and enable/disable individual
 cells.  These commands are:
 
@@ -2575,10 +2569,10 @@
   The commands @code{table-forward-cell} and
 @code{table-backward-cell} move point from the current cell to an
 adjacent cell forward and backward respectively.  The order of the
-cell is wrapped.  When point is positioned in the last cell of a
-table, typing @kbd{M-x table-forward-cell} moves point to the first
-cell in the table.  Likewise @kbd{M-x table-backward-cell} from the
-first cell in a table moves point to the last cell in the table.
+cells is cyclic: when point is in the last cell of a table, typing
+@kbd{M-x table-forward-cell} moves to the first cell in the table.
+Likewise @kbd{M-x table-backward-cell} from the first cell in a table
+moves to the last cell.
 
 @findex table-span-cell
   The command @code{table-span-cell} spans the current cell into one
@@ -2602,18 +2596,17 @@
 @findex table-split-cell-horizontally
   The command @code{table-split-cell-horizontally} splits the current
 cell horizontally and creates a pair of cells right and left of where
-point is located.  If the subject cell to split is not empty the user
-is asked how to handle the cell contents.  The three options are:
-@code{split}, @code{left}, or @code{right}.  @code{split} splits the
-contents at point literally while the @code{left} and @code{right}
-options move the entire contents into the left or right cell
-respectively.
+point is located.  If the cell being split is not empty, this asks you
+how to handle the cell contents.  The three options are: @code{split},
+@code{left}, or @code{right}.  @code{split} splits the contents at
+point literally, while the @code{left} and @code{right} options move
+the entire contents into the left or right cell respectively.
 
 @cindex enlarge a table cell
 @cindex shrink a table cell
-  The next four commands enlarge or shrink a cell.  These commands
-accept numeric arguments (@pxref{Arguments}) to specify how many
-columns or rows to enlarge or shrink a particular table.
+  The next four commands enlarge or shrink a cell.  They use numeric
+arguments (@pxref{Arguments}) to specify how many columns or rows to
+enlarge or shrink a particular table.
 
 @table @kbd
 @findex table-heighten-cell
@@ -2639,21 +2632,20 @@
 of cell contents is subject to the specified justification.
 
 @findex table-justify
-  The command @code{table-justify} requests the user to specify what
-to justify: a cell,a column, or a row.  If you select cell
-justification, this command sets the justification only to the current
-cell.  Selecting column or row justification set the justification to
-all the cells within a column or row respectively.  The command then
-requests the user to enter which justification to apply: @code{left},
-@code{center}, @code{right}, @code{top}, @code{middle}, @code{bottom},
-or @code{none}.  The options @code{left}, @code{center}, and
+  The command @code{table-justify} ask you to specify what to justify:
+a cell, a column, or a row.  If you select cell justification, this
+command sets the justification only for the current cell.  Selecting
+column or row justification sets the justification for all the cells
+within a column or row respectively.  The command then ask you which
+kind of justification to apply: @code{left}, @code{center},
+@code{right}, @code{top}, @code{middle}, @code{bottom}, or
+@code{none}.  Horizontal justification and vertical justification are
+specified independently.  The options @code{left}, @code{center}, and
 @code{right} specify horizontal justification while the options
 @code{top}, @code{middle}, @code{bottom}, and @code{none} specify
 vertical justification.  The vertical justification @code{none}
-effectively removes vertical justification while horizontal
-justification must be one of @code{left}, @code{center}, or
-@code{right}.  Horizontal justification and vertical justification are
-specified independently.
+effectively removes vertical justification.  Horizontal justification
+must be one of @code{left}, @code{center}, or @code{right}.
 
 @vindex table-detect-cell-alignment
   Justification information is stored in the buffer as a part of text
@@ -2667,8 +2659,8 @@
 was originally applied to the cell and then applies this justification
 to the cell.  This is a speculative algorithm and is therefore not
 perfect, however, the justification is deduced correctly most of the
-time.  If you desire to disable this feature, customize the variable
-@code{table-detect-cell-alignment} to set it to @code{nil}.
+time.  To disable this feature, customize the variable
+@code{table-detect-cell-alignment} and set it to @code{nil}.
 
 @node Row Commands
 @subsection Commands for Table Rows
@@ -2681,7 +2673,7 @@
 pushed down after the newly inserted row.  A numeric prefix argument
 specifies the number of rows to insert.  Note that in order to insert
 rows @emph{after} the last row at the bottom of a table, you must
-place point below the table, i.e.@: outside the table, prior to
+place point below the table---that is, outside the table---prior to
 invoking this command.
 
 @cindex delete row in table
@@ -2696,12 +2688,11 @@
 @cindex insert column in table
 @findex table-insert-column
   The command @code{table-insert-column} inserts a column of cells to
-the left of the current row in a table.  The current column where
-point is located at is pushed right of the newly inserted column.  To
-insert a column to the right side of the right most column, place
-point to the right of the rightmost column, which is outside of the
-table, prior to invoking this command.  A numeric prefix argument
-specifies the number of columns to insert.
+the left of the current row in a table.  This pushes the current
+column to the right.  To insert a column to the right side of the
+rightmost column, place point to the right of the rightmost column,
+which is outside of the table, prior to invoking this command.  A
+numeric prefix argument specifies the number of columns to insert.
 
 @cindex delete column in table
   A command @code{table-delete-column} deletes a column of cells at
@@ -2714,11 +2705,10 @@
 
 @findex table-fixed-width-mode
   The command @code{table-fixed-width-mode} toggles fixed width mode
-on and off.  When the fixed width mode is turned on, editing inside a
+on and off.  When fixed width mode is turned on, editing inside a
 cell never changes the cell width; when it is off, the cell width
 expands automatically in order to prevent a word from being folded
-into multiple lines.  By default, the fixed width mode is turned off.
-
+into multiple lines.  By default, fixed width mode is disabled.
 
 @node Table Conversion
 @subsection Conversion Between Plain Text and Tables
@@ -2731,9 +2721,11 @@
 Recognition}), the original text does not have a table appearance but
 may hold a logical table structure.  For example, some elements
 separated by known patterns form a two dimensional structure which can
-be turned into a table.  Look at the numbers below.  The numbers are
-horizontally separated by a comma and vertically separated by a
-newline character.
+be turned into a table.
+
+  Here's an example of data that @code{table-capture} can operate on.
+The numbers are horizontally separated by a comma and vertically
+separated by a newline character.
 
 @example
 1, 2, 3, 4
@@ -2742,8 +2734,7 @@
 @end example
 
 @noindent
-When you invoke @kbd{M-x table-capture} on the above three-line
-region, the region can be turned into the next table:
+Invoking @kbd{M-x table-capture} on that text produces this table:
 
 @example
 +-----+-----+-----+-----+
@@ -2756,9 +2747,9 @@
 @end example
 
 @noindent
-where @samp{,} is used for a column delimiter regexp, a newline is
-used for a row delimiter regexp, cells are left justified, and minimum
-cell width is 5.
+The conversion uses @samp{,} for the column delimiter and newline for
+a row delimiter, cells are left justified, and minimum cell width is
+5.
 
 @findex table-release
   The command @code{table-release} does the opposite of
@@ -2771,7 +2762,7 @@
 
 @example
 @samp{table-capture} is a powerful command however mastering its power
-requires some practice.  Here is a list of items what it can do.
+requires some practice.  Here are some things it can do:
 
 Parse Cell Items      By using column delimiter regular
                       expression and raw delimiter regular
@@ -2797,9 +2788,8 @@
 @c produced output!!
 @example
 +-----------------------------------------------------------------+
-|@samp{table-capture} is a powerful command however mastering its      |
-|power requires some practice.  Here is a list of items what it   |
-|can do.                                                          |
+|@samp{table-capture} is a powerful command, but mastering its         |
+|power requires some practice.  Here are some things it can do:   |
 |                                                                 |
 |Parse Cell Items      By using column delimiter regular          |
 |                      expression and raw delimiter regular       |
@@ -2822,9 +2812,8 @@
 
 @example
 +-----------------------------------------------------------------+
-|@samp{table-capture} is a powerful command however mastering its      |
-|power requires some practice.  Here is a list of items what it   |
-|can do.                                                          |
+|@samp{table-capture} is a powerful command, but mastering its         |
+|power requires some practice.  Here are some things it can do:   |
 +---------------------+-------------------------------------------+
 |Parse Cell Items     |By using column delimiter regular          |
 |                     |expression and raw delimiter regular       |
@@ -2877,7 +2866,7 @@
 @cindex table in language format
 @cindex table for HTML and LaTeX
 @findex table-generate-source
-The command @code{table-generate-source} generates a table formatted
+  The command @code{table-generate-source} generates a table formatted
 for a specific markup language.  It asks for a language (which must be
 one of @code{html}, @code{latex}, or @code{cals}), a destination
 buffer where to put the result, and the table caption (a string), and
--- a/man/trouble.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/trouble.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -158,14 +158,14 @@
 and when Emacs is properly configured for your terminal, it translates
 that key into the character @key{DEL}.
 
-  When Emacs starts up using a window system, it determines
+  When Emacs starts up on a graphical display, it determines
 automatically which key should be @key{DEL}.  In some unusual cases
 Emacs gets the wrong information from the system.  If the usual
 erasure key deletes forwards instead of backwards, that is probably
 what happened---Emacs ought to be treating the @key{DELETE} key as
 @key{DEL}, but it isn't.
 
-  With a window system, if the usual erasure key is labeled
+  On a graphical display, if the usual erasure key is labeled
 @key{BACKSPACE} and there is a @key{DELETE} key elsewhere, but the
 @key{DELETE} key deletes backward instead of forward, that too
 suggests Emacs got the wrong information---but in the opposite sense.
@@ -213,7 +213,7 @@
 @key{DEL}, and @code{nil} specifies the other mode.  @xref{Easy
 Customization}.
 
-  With a window system, it can also happen that the usual erasure key
+  On a graphical display, it can also happen that the usual erasure key
 is labeled @key{BACKSPACE}, there is a @key{DELETE} key elsewhere, and
 both keys delete forward.  This probably means that someone has
 redefined your @key{BACKSPACE} key as a @key{DELETE} key.  With X,
@@ -226,7 +226,7 @@
 @subsection Recursive Editing Levels
 
   Recursive editing levels are important and useful features of Emacs, but
-they can seem like malfunctions to the user who does not understand them.
+they can seem like malfunctions if you do not understand them.
 
   If the mode line has square brackets @samp{[@dots{}]} around the parentheses
 that contain the names of the major and minor modes, you have entered a
--- a/man/xresources.texi	Mon Feb 06 18:44:57 2006 +0000
+++ b/man/xresources.texi	Sun Feb 12 00:15:44 2006 +0000
@@ -877,14 +877,14 @@
 sets the scroll bar trough to red.  Buttons that have been pressed but
 not released yet (``armed'') are in this state.
 @item PRELIGHT
-This is the state when widgets that can be manipulated have the mouse
-pointer over them.  For example when the mouse is over the thumb in the
-scroll bar or over a menu item.  When the mouse is over a button that
-is not pressed, the button is in this state.
+This is the state for a widget that can be manipulated, when the mouse
+pointer is over it---for example when the mouse is over the thumb in
+the scroll bar or over a menu item.  When the mouse is over a button
+that is not pressed, the button is in this state.
 @item SELECTED
-This is the state when some data has been selected by the user.  It can
-be selected text or items selected in a list.
-There is no place in Emacs where this setting has any effect.
+This is the state for data that has been selected by the user.  It can
+be selected text or items selected in a list.  This state is not used
+in Emacs.
 @item INSENSITIVE
 This is the state for widgets that are visible, but they can not be
 manipulated in the usual way---for example, buttons that can't be
--- a/msdos/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -615,7 +615,7 @@
 ;; End:
 
     Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-       2004, 2005 Free Software Foundation, Inc.
+       2004, 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.
 
--- a/msdos/README	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/README	Sun Feb 12 00:15:44 2006 +0000
@@ -6,7 +6,8 @@
 Windows 3.X.  Since these are binary files, their copyright notice is
 reproduced here:
 
-# Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1993, 2002, 2003, 2004, 2005,
+#   2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/mainmake	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/mainmake	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 # Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-#   2005 Free Software Foundation, Inc.
+#   2005, 2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
--- a/msdos/mainmake.v2	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/mainmake.v2	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-#   2005 Free Software Foundation, Inc.
+#   2005, 2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
--- a/msdos/sed1.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed1.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004,
-#   2005 Free Software Foundation, Inc.
+#   2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sed1v2.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed1v2.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004,
-#   2005 Free Software Foundation, Inc.
+#   2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sed2.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed2.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003,
-#   2004, 2005 Free Software Foundation, Inc.
+#   2004, 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sed2v2.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed2v2.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003,
-#   2004, 2005 Free Software Foundation, Inc.
+#   2004, 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sed2x.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed2x.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,8 @@
 # Extra configuration script for src/config.h for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2002, 2003, 2004, 2005,
+#   2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sed3.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed3.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
-#   2005 Free Software Foundation, Inc.
+#   2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sed3v2.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed3v2.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004,
-#   2005 Free Software Foundation, Inc.
+#   2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sed4.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed4.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,8 @@
 # Configuration script for src/paths.h
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2002, 2003, 2004, 2005,
+#   2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sed5x.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed5x.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,8 @@
 # Configuration script for oldxmenu/makefile for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2002, 2003, 2004, 2005,
+#   2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sed6.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sed6.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -4,7 +4,7 @@
 # ---------------------------------------------------------------------------
 #
 # Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004,
-#   2005 Free Software Foundation, Inc.
+#   2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sedleim.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sedleim.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (C) 1999, 2000, 2002, 2003, 2004,
-#   2005 Free Software Foundation, Inc.
+#   2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/msdos/sedlisp.inp	Mon Feb 06 18:44:57 2006 +0000
+++ b/msdos/sedlisp.inp	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,8 @@
 # Configuration script for lisp/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002, 2003, 2004, 2005,
+#   2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/nt/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1204,7 +1204,7 @@
 ;; End:
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-       2005 Free Software Foundation, Inc.
+       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.
 
--- a/nt/INSTALL	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/INSTALL	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,8 @@
 		      Building and Installing Emacs
 		on Windows NT/2K/XP and Windows 95/98/ME
 
-  Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005,
+     2006 Free Software Foundation, Inc.
   See the end of the file for copying permissions.
 
   If you used WinZip to unpack the distribution, we suggest to
--- a/nt/README	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/README	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 	     Emacs for Windows NT/2000 and Windows 95/98/ME
 
-  Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005,
+     2006 Free Software Foundation, Inc.
   See the end of the INSTALL file in this directory for copying permissions.
 
   This directory contains support for compiling and running GNU Emacs on
--- a/nt/addpm.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/addpm.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Add entries to the GNU Emacs Program Manager folder.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/nt/addsection.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/addsection.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Add an uninitialized data section to an executable.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/nt/cmdproxy.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/cmdproxy.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Proxy shell designed for use with Emacs on Windows 95 and NT.
-   Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatability
    with elisp code written for Unix.  When possible, executes external
--- a/nt/config.nt	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/config.nt	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* GNU Emacs site configuration template file.  -*- C -*-
    Copyright (C) 1988, 1993, 1994, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/nt/configure.bat	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/configure.bat	Sun Feb 12 00:15:44 2006 +0000
@@ -1,8 +1,8 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   Configuration script for MS Windows 95/98/Me and NT/2000/XP
-rem   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-rem      Free Software Foundation, Inc.
+rem   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+rem      2006 Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
 
--- a/nt/ddeclient.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/ddeclient.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Simple client interface to DDE servers.
-   Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/nt/emacs.rc	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/emacs.rc	Sun Feb 12 00:15:44 2006 +0000
@@ -26,7 +26,7 @@
 	    VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
 	    VALUE "FileVersion", "22, 0, 50, 0\0"
 	    VALUE "InternalName", "Emacs\0"
-	    VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0"
 	    VALUE "OriginalFilename", "emacs.exe"
 	    VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
 	    VALUE "ProductVersion", "22, 0, 50, 0\0"
--- a/nt/envadd.bat	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/envadd.bat	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 rem  Hack to change/add environment variables in the makefiles for the
 rem  Windows platform.
 rem
-rem  Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+rem  Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 rem
 rem  This file is part of GNU Emacs.
 rem
--- a/nt/gmake.defs	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/gmake.defs	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-#  Copyright (c) 2000, 2001, 2002, 2003, 2004,
-#    2005 Free Software Foundation, Inc.
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
+#    2005, 2006 Free Software Foundation, Inc.
 #
 #  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
--- a/nt/inc/grp.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/inc/grp.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Replacement grp.h file for building GNU Emacs on Windows.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/nt/inc/sys/socket.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/inc/sys/socket.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/nt/makefile.w32-in	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/makefile.w32-in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#    2005 Free Software Foundation, Inc.
+#    2005, 2006 Free Software Foundation, Inc.
 #
 #  Top level makefile for building GNU Emacs on Windows NT
 #
--- a/nt/multi-install-info.bat	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/multi-install-info.bat	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
 rem  Hack to run install-info with multiple info files on the command
 rem  line on the Windows platform.
 rem
-rem  Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+rem  Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 rem
 rem  This file is part of GNU Emacs.
 rem
--- a/nt/nmake.defs	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/nmake.defs	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#    2005 Free Software Foundation, Inc.
+#    2005, 2006 Free Software Foundation, Inc.
 #
 #  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
--- a/nt/paths.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/paths.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/nt/preprep.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/preprep.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Pro-process emacs.exe for profiling by MSVC.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2004, 2005,
+      2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/nt/runemacs.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/nt/runemacs.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/.gdbinit	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/.gdbinit	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 2000, 01, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001,
+#   2004, 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
--- a/src/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/ChangeLog	Sun Feb 12 00:15:44 2006 +0000
@@ -1,3 +1,90 @@
+2006-02-11  Eli Zaretskii  <eliz@gnu.org>
+
+	* keyboard.c (Venable_disabled_menus_and_buttons): New variable.
+	(syms_of_keyboard): DEVFAR_LISP and initialize it.
+	(parse_tool_bar_item, parse_menu_item): If that variable is
+	non-nil, don't disable menu items and tool-bar buttons.
+
+2006-02-11  Juanma Barranquero  <lekktu@gmail.com>
+
+	* doc.c (Fsubstitute_command_keys): Doc fix.
+
+2006-02-10  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	* data.c (Findirect_function): Rewrite docstring.
+	Fix omission bug: Declare new arg NOERROR.
+
+2006-02-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macfns.c (x_set_mouse_color): Don't call rif->define_frame_cursor
+	if window_desc is not set yet.
+	(Fx_create_frame): Remove variable x_frame_name.  Apply 2005-12-07
+	and 2006-01-26 changes for xfns.c.  Call x_iconify_frame if frame
+	parameter `visibility' is `icon'.
+	(Fx_create_frame, x_create_tip_frame): Use "fontset-standard"
+	instead of "fontset-mac".
+	(Fx_focus_frame): New defun.
+	(syms_of_macfns): Defsubr it.
+
+	* macterm.c (mac_define_frame_cursor): Don't change pointer shape
+	for unfocused frame.
+	(x_raise_frame): Call BringToFront instead of SelectWindow.
+	(x_lower_frame): Use NULL instead of nil.
+	(x_make_frame_visible): Don't call SelectWindow.
+	(XTread_socket): Increment handling_signal at the start, decrement
+	it at the end.
+	[USE_CG_TEXT_DRAWING] (init_cg_text_anti_aliasing_threshold): Use
+	CFPreferencesGetAppIntegerValue instead of Fmac_get_preference.
+
+2006-02-10  Kim F. Storm  <storm@cua.dk>
+
+	* data.c (Findirect_function): Add NOERROR arg.  All callers changed
+	to pass Qnil for NOERROR.
+
+	* keymap.c (current_minor_maps_error): Remove.
+	(current_minor_maps): Pass Qt for NOERROR to Findirect_function
+	instead of using internal_condition_case_1+current_minor_maps_error.
+
+2006-02-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xterm.c (handle_one_xevent): Must note mouse movement even for nil
+	frames for GTK, in that case it is the tool bar.  This is so that
+	highlighted text get reset properly.
+
+2006-02-09  Juanma Barranquero  <lekktu@gmail.com>
+
+	* alloc.c (Fmake_bool_vector, Fpurecopy): Doc fixes.
+
+2006-02-08  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* window.c (adjust_window_trailing_edge): Check that shrinking
+	does not set a window to size zero or less.
+
+2006-02-08  Miles Bader  <miles@gnu.org>
+
+	* editfns.c (Fconstrain_to_field): Use Fget_char_property instead
+	of Fget_text_property (other field functions work with overlays as
+	well as text-properties).
+
+2006-02-07  Kenichi Handa  <handa@m17n.org>
+
+	* dispextern.h (unibyte_display_via_language_environment): Extern it.
+
+	* xterm.h (unibyte_display_via_language_environment):
+	* w32term.h (unibyte_display_via_language_environment):
+	* macterm.h (unibyte_display_via_language_environment): Delete extern.
+
+2006-02-07  Kenichi Handa  <handa@m17n.org>
+
+	* term.c (append_glyph): Refer to it->char_to_display instead of it->c.
+	(produce_glyphs): Set the character to print in
+	it->char_to_display.  Handle unibyte-display-via-language-environment.
+	(produce_stretch_glyph): Set character to print in it->char_to_display.
+
+2006-02-06  Kenichi Handa  <handa@m17n.org>
+
+	* lread.c (openp): Initialize encoded_fn before GCPRO it.
+
 2006-02-05  Ken Raeburn  <raeburn@raeburn.org>
 
 	* editfns.c (Fconstrain_to_field): Fix int/Lisp_Object mixup.
@@ -22409,7 +22496,8 @@
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 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.
 
--- a/src/Makefile.in	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/Makefile.in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 # Makefile for GNU Emacs.
 # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
-#               2003, 2004, 2005 Free Software Foundation, Inc.
+#               2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
--- a/src/abbrev.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/abbrev.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Primitives for word-abbrev mode.
    Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/alloc.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/alloc.c	Sun Feb 12 00:15:44 2006 +0000
@@ -2301,7 +2301,7 @@
 
 
 DEFUN ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0,
-       doc: /* Return a new bool-vector of length LENGTH, using INIT for as each element.
+       doc: /* Return a new bool-vector of length LENGTH, using INIT for each element.
 LENGTH must be a number.  INIT matters only in whether it is t or nil.  */)
      (length, init)
      Lisp_Object length, init;
@@ -4813,7 +4813,7 @@
 
 
 DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0,
-       doc: /* Make a copy of OBJECT in pure storage.
+       doc: /* Make a copy of object OBJ in pure storage.
 Recursively copies contents of vectors and cons cells.
 Does not copy symbols.  Copies strings without text properties.  */)
      (obj)
--- a/src/atimer.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/atimer.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Asynchronous timers.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/atimer.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/atimer.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Asynchronous timers.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/blockinput.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/blockinput.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* blockinput.h - interface to blocking complicated interrupt-driven input.
    Copyright (C) 1989, 1993, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/buffer.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/buffer.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Buffer manipulation primitives for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994,
                  1995, 1997, 1998, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/buffer.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/buffer.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Header file for the buffer manipulation primitives.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/bytecode.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/bytecode.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Execution of byte code produced by bytecomp.el.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/callint.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/callint.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Call a Lisp function interactively.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/callproc.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/callproc.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Synchronous subprocess invocation for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/casefiddle.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/casefiddle.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* GNU Emacs case conversion functions.
    Copyright (C) 1985, 1994, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/casetab.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/casetab.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* GNU Emacs routines to deal with case tables.
    Copyright (C) 1993, 1994, 2002, 2003, 2004, 
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/category.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/category.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* GNU Emacs routines to deal with category tables.
-   Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 1998, 1999
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/ccl.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/ccl.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* CCL (Code Conversion Language) interpreter.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/charset.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/charset.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Basic multilingual character support.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/charset.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/charset.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Header for multibyte character handler.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 1998, 2003
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/cm.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/cm.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Cursor motion subroutines for GNU Emacs.
    Copyright (C) 1985, 1995, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
     based primarily on public domain code written by Chris Torek
 
 This file is part of GNU Emacs.
--- a/src/cm.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/cm.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Cursor motion calculation definitions for GNU Emacs
    Copyright (C) 1985, 1989, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/cmds.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/cmds.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Simple built-in editing commands.
    Copyright (C) 1985, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002,
-                 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/coding.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/coding.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Coding system handler (conversion, detection, and etc).
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 2005
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/coding.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/coding.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Header for coding system handler.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 1998, 2000
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/commands.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/commands.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions needed by most editing commands.
    Copyright (C) 1985, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/composite.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/composite.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Composite sequence support.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Copyright (C) 1999
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/composite.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/composite.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Header for composite sequence handler.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Copyright (C) 1997
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/config.in	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/config.in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,8 +1,8 @@
 /* src/config.in.  Generated from configure.in by autoheader.  */
 
 /* GNU Emacs site configuration template file.
-   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004
-             Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/cxux-crt0.s	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/cxux-crt0.s	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 /*
  * External symbol setup file for GNU Emacs on CX/UX
- * Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 1990, 2002, 2003, 2004, 2005,
+ *               2006 Free Software Foundation, Inc.
  *
  * This file is part of GNU Emacs.
  *
--- a/src/data.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/data.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1984,23 +1984,26 @@
   return hare;
 }
 
-DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 1, 0,
+DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0,
        doc: /* Return the function at the end of OBJECT's function chain.
-If OBJECT is a symbol, follow all function indirections and return the final
-function binding.
-If OBJECT is not a symbol, just return it.
-Signal a void-function error if the final symbol is unbound.
+If OBJECT is not a symbol, just return it.  Otherwise, follow all
+function indirections to find the final function binding and return it.
+If the final symbol in the chain is unbound, signal a void-function error.
+Optional arg NOERROR non-nil means to return nil instead of signalling.
 Signal a cyclic-function-indirection error if there is a loop in the
 function chain of symbols.  */)
-     (object)
+     (object, noerror)
      register Lisp_Object object;
+     Lisp_Object noerror;
 {
   Lisp_Object result;
 
   result = indirect_function (object);
 
   if (EQ (result, Qunbound))
-    return Fsignal (Qvoid_function, Fcons (object, Qnil));
+    return (NILP (noerror)
+	    ? Fsignal (Qvoid_function, Fcons (object, Qnil))
+	    : Qnil);
   return result;
 }
 
--- a/src/dired.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/dired.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Lisp functions for making directory listings.
    Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/dispextern.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/dispextern.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Interface definitions for display code.
    Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2644,6 +2644,8 @@
 extern struct frame *last_mouse_frame;
 extern int last_tool_bar_item;
 extern int mouse_autoselect_window;
+extern int unibyte_display_via_language_environment;
+
 extern void reseat_at_previous_visible_line_start P_ ((struct it *));
 
 extern int calc_pixel_width_or_height P_ ((double *, struct it *, Lisp_Object,
--- a/src/dispnew.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/dispnew.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Updating of data structures for redisplay.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/disptab.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/disptab.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Things for GLYPHS and glyph tables.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/doc.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/doc.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Record indices of function doc strings stored in a file.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -386,7 +386,7 @@
 	  !NILP (tem)))
     return Fdocumentation_property (function, Qfunction_documentation, raw);
 
-  fun = Findirect_function (function);
+  fun = Findirect_function (function, Qnil);
   if (SUBRP (fun))
     {
       if (XSUBR (fun)->doc == 0)
@@ -739,7 +739,7 @@
 sequence that will invoke COMMAND, or "M-x COMMAND" if COMMAND is not
 on any keys.
 Substrings of the form \\=\\{MAPVAR} are replaced by summaries
-\(made by describe-bindings) of the value of MAPVAR, taken as a keymap.
+\(made by `describe-bindings') of the value of MAPVAR, taken as a keymap.
 Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR
 as the keymap for future \\=\\[COMMAND] substrings.
 \\=\\= quotes the following character and is discarded;
--- a/src/doprnt.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/doprnt.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,8 @@
 /* Output like sprintf to a buffer of specified size.
    Also takes args differently: pass one pointer to an array of strings
    in addition to the format string which is separate.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/dosfns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/dosfns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* MS-DOS specific Lisp utilities.  Coded by Manabu Higashida, 1991.
    Major changes May-July 1993 Morten Welinder (only 10% original code left)
    Copyright (C) 1991, 1993, 1996, 1997, 1998, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/dosfns.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/dosfns.h	Sun Feb 12 00:15:44 2006 +0000
@@ -3,7 +3,7 @@
    Modified by Morten Welinder, 1993-1994.
 
    Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/ecrt0.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/ecrt0.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* C code startup routine.
    Copyright (C) 1985, 1986, 1992, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/editfns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/editfns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Lisp functions pertaining to editing.
    Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -739,24 +739,24 @@
   
   if (NILP (Vinhibit_field_text_motion)
       && !EQ (new_pos, old_pos)
-      && (!NILP (Fget_text_property (new_pos, Qfield, Qnil))
-          || !NILP (Fget_text_property (old_pos, Qfield, Qnil))
+      && (!NILP (Fget_char_property (new_pos, Qfield, Qnil))
+          || !NILP (Fget_char_property (old_pos, Qfield, Qnil))
           /* To recognize field boundaries, we must also look at the
              previous positions; we could use `get_pos_property'
              instead, but in itself that would fail inside non-sticky
              fields (like comint prompts).  */
           || (XFASTINT (new_pos) > BEGV
-              && !NILP (Fget_text_property (prev_new, Qfield, Qnil)))
+              && !NILP (Fget_char_property (prev_new, Qfield, Qnil)))
           || (XFASTINT (old_pos) > BEGV
-              && !NILP (Fget_text_property (prev_old, Qfield, Qnil))))
+              && !NILP (Fget_char_property (prev_old, Qfield, Qnil))))
       && (NILP (inhibit_capture_property)
           /* Field boundaries are again a problem; but now we must
              decide the case exactly, so we need to call
              `get_pos_property' as well.  */
           || (NILP (get_pos_property (old_pos, inhibit_capture_property, Qnil))
               && (XFASTINT (old_pos) <= BEGV
-                  || NILP (Fget_text_property (old_pos, inhibit_capture_property, Qnil))
-                  || NILP (Fget_text_property (prev_old, inhibit_capture_property, Qnil))))))
+                  || NILP (Fget_char_property (old_pos, inhibit_capture_property, Qnil))
+                  || NILP (Fget_char_property (prev_old, inhibit_capture_property, Qnil))))))
     /* It is possible that NEW_POS is not within the same field as
        OLD_POS; try to move NEW_POS so that it is.  */
     {
--- a/src/epaths.in	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/epaths.in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Hey Emacs, this is -*- C -*- code!  */
 /* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/eval.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/eval.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Evaluator for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -618,7 +618,7 @@
 
   /* If this isn't a byte-compiled function, there may be a frame at
      the top for Finteractive_p.  If so, skip it.  */
-  fun = Findirect_function (*btp->function);
+  fun = Findirect_function (*btp->function, Qnil);
   if (SUBRP (fun) && (XSUBR (fun) == &Sinteractive_p
 		      || XSUBR (fun) == &Scalled_interactively_p))
     btp = btp->next;
@@ -639,7 +639,7 @@
      a special form, ignoring frames for Finteractive_p and/or
      Fbytecode at the top.  If this frame is for a built-in function
      (such as load or eval-region) return nil.  */
-  fun = Findirect_function (*btp->function);
+  fun = Findirect_function (*btp->function, Qnil);
   if (exclude_subrs_p && SUBRP (fun))
     return 0;
 
@@ -2079,7 +2079,7 @@
   Vautoload_queue = Qt;
   unbind_to (count, Qnil);
 
-  fun = Findirect_function (fun);
+  fun = Findirect_function (fun, Qnil);
 
   if (!NILP (Fequal (fun, fundef)))
     error ("Autoloading failed to define function %s",
@@ -2142,7 +2142,7 @@
   /* At this point, only original_fun and original_args
      have values that will be used below */
  retry:
-  fun = Findirect_function (original_fun);
+  fun = Findirect_function (original_fun, Qnil);
 
   if (SUBRP (fun))
     {
@@ -2841,7 +2841,7 @@
 
   fun = args[0];
 
-  fun = Findirect_function (fun);
+  fun = Findirect_function (fun, Qnil);
 
   if (SUBRP (fun))
     {
--- a/src/filelock.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/filelock.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Lock files for editing.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/filemode.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/filemode.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* filemode.c -- make a string describing file modes
    Copyright (C) 1985, 1990, 1993, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/src/firstfile.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/firstfile.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Mark beginning of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/floatfns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/floatfns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Primitive operations on floating point for GNU Emacs Lisp interpreter.
    Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/fns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/fns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Random utility Lisp functions.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997,
                  1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/fontset.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/fontset.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Fontset handler.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/fontset.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/fontset.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Header for fontset handler.
-   Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 2000
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
--- a/src/frame.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/frame.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Generic frame functions.
    Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/frame.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/frame.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Define frame-object for GNU Emacs.
    Copyright (C) 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/fringe.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/fringe.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Fringe handling (split from xdisp.c).
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997,
                  1998, 1999, 2000, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/getloadavg.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/getloadavg.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Get the system load averages.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995,
-                 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 1997, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
--- a/src/getpagesize.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/getpagesize.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Emulate getpagesize on systems that lack it.
    Copyright (C) 1986, 1992, 1995, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/gmalloc.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/gmalloc.c	Sun Feb 12 00:15:44 2006 +0000
@@ -6,7 +6,7 @@
 
 /* Declarations for `malloc' and friends.
    Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 		  Written May 1989 by Mike Haertel.
 
 This library is free software; you can redistribute it and/or
--- a/src/gtkutil.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/gtkutil.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Functions for creating and updating GTK widgets.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/gtkutil.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/gtkutil.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Definitions and headers for GTK widgets.
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/image.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/image.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Functions for image support on window system.
    Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/indent.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/indent.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Indentation functions.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/indent.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/indent.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions for interface to indent.c
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/insdel.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/insdel.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Buffer insertion/deletion and gap motion for GNU Emacs.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/intervals.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/intervals.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Code for doing intervals.
    Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/intervals.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/intervals.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions and global variables for intervals.
    Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/keyboard.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/keyboard.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Keyboard and mouse input; editor command loop.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995,
                  1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -633,6 +633,11 @@
 
 static EMACS_TIME timer_last_idleness_start_time;
 
+/* If non-nil, events produced by disabled menu items and tool-bar
+   buttons are not ignored.  Help functions bind this to allow help on
+   those items and buttons.  */
+Lisp_Object Venable_disabled_menus_and_buttons;
+
 
 /* Global variable declarations.  */
 
@@ -7453,7 +7458,9 @@
       if (SYMBOLP (item))
 	{
 	  tem = Fget (item, Qmenu_enable);
-	  if (!NILP (tem))
+	  if (!NILP (Venable_disabled_menus_and_buttons))
+	    AREF (item_properties, ITEM_PROPERTY_ENABLE) = Qt;
+	  else if (!NILP (tem))
 	    AREF (item_properties, ITEM_PROPERTY_ENABLE) = tem;
 	}
     }
@@ -7482,7 +7489,12 @@
 	      item = XCDR (item);
 
 	      if (EQ (tem, QCenable))
-		AREF (item_properties, ITEM_PROPERTY_ENABLE) = XCAR (item);
+		{
+		  if (!NILP (Venable_disabled_menus_and_buttons))
+		    AREF (item_properties, ITEM_PROPERTY_ENABLE) = Qt;
+		  else
+		    AREF (item_properties, ITEM_PROPERTY_ENABLE) = XCAR (item);
+		}
 	      else if (EQ (tem, QCvisible) && !notreal)
 		{
 		  /* If got a visible property and that evaluates to nil
@@ -8002,8 +8014,13 @@
       value = XCAR (XCDR (item));
 
       if (EQ (key, QCenable))
-	/* `:enable FORM'.  */
-	PROP (TOOL_BAR_ITEM_ENABLED_P) = value;
+	{
+	  /* `:enable FORM'.  */
+	  if (!NILP (Venable_disabled_menus_and_buttons))
+	    PROP (TOOL_BAR_ITEM_ENABLED_P) = Qt;
+	  else
+	    PROP (TOOL_BAR_ITEM_ENABLED_P) = value;
+	}
       else if (EQ (key, QCvisible))
 	{
 	  /* `:visible FORM'.  If got a visible property and that
@@ -9907,7 +9924,7 @@
 
   while (1)
     {
-      final = Findirect_function (cmd);
+      final = Findirect_function (cmd, Qnil);
 
       if (CONSP (final) && (tem = Fcar (final), EQ (tem, Qautoload)))
 	{
@@ -11934,6 +11951,14 @@
 The value of that variable is passed to `quit-flag' and later causes a
 peculiar kind of quitting.  */);
   Vthrow_on_input = Qnil;
+
+  DEFVAR_LISP ("enable-disabled-menus-and-buttons",
+	       &Venable_disabled_menus_and_buttons,
+	       doc: /* If non-nil, don't ignore events produced by disabled menu items and tool-bar.
+
+Help functions bind this to allow help on disabled menu items
+and tool-bar buttons.  */);
+  Venable_disabled_menus_and_buttons = Qnil;
 }
 
 void
--- a/src/keyboard.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/keyboard.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Declarations useful when processing input.
    Copyright (C) 1985, 1986, 1987, 1993, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/keymap.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/keymap.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Manipulation of keymaps
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -69,7 +69,7 @@
 /* keymap used for minibuffers when doing completion in filenames */
 Lisp_Object Vminibuffer_local_filename_completion_map;
 
-/* keymap used for minibuffers when doing completion in filenames 
+/* keymap used for minibuffers when doing completion in filenames
    with require-match*/
 Lisp_Object Vminibuffer_local_must_match_filename_map;
 
@@ -1363,13 +1363,6 @@
 static Lisp_Object *cmm_modes = NULL, *cmm_maps = NULL;
 static int cmm_size = 0;
 
-/* Error handler used in current_minor_maps.  */
-static Lisp_Object
-current_minor_maps_error ()
-{
-  return Qnil;
-}
-
 /* Store a pointer to an array of the keymaps of the currently active
    minor modes in *buf, and return the number of maps it contains.
 
@@ -1471,9 +1464,7 @@
 	      }
 
 	    /* Get the keymap definition--or nil if it is not defined.  */
-	    temp = internal_condition_case_1 (Findirect_function,
-					      XCDR (assoc),
-					      Qerror, current_minor_maps_error);
+	    temp = Findirect_function (XCDR (assoc), Qt);
 	    if (!NILP (temp))
 	      {
 		cmm_modes[i] = var;
@@ -3875,11 +3866,11 @@
   Vminibuffer_local_completion_map = Fmake_sparse_keymap (Qnil);
   Fset_keymap_parent (Vminibuffer_local_completion_map, Vminibuffer_local_map);
 
-  DEFVAR_LISP ("minibuffer-local-filename-completion-map", 
+  DEFVAR_LISP ("minibuffer-local-filename-completion-map",
 	       &Vminibuffer_local_filename_completion_map,
 	       doc: /* Local keymap for minibuffer input with completion for filenames.  */);
   Vminibuffer_local_filename_completion_map = Fmake_sparse_keymap (Qnil);
-  Fset_keymap_parent (Vminibuffer_local_filename_completion_map, 
+  Fset_keymap_parent (Vminibuffer_local_filename_completion_map,
 		      Vminibuffer_local_completion_map);
 
 
@@ -3889,11 +3880,11 @@
   Fset_keymap_parent (Vminibuffer_local_must_match_map,
 		      Vminibuffer_local_completion_map);
 
-  DEFVAR_LISP ("minibuffer-local-must-match-filename-map", 
+  DEFVAR_LISP ("minibuffer-local-must-match-filename-map",
 	       &Vminibuffer_local_must_match_filename_map,
 	       doc: /* Local keymap for minibuffer input with completion for filenames with exact match.  */);
   Vminibuffer_local_must_match_filename_map = Fmake_sparse_keymap (Qnil);
-  Fset_keymap_parent (Vminibuffer_local_must_match_filename_map, 
+  Fset_keymap_parent (Vminibuffer_local_must_match_filename_map,
 		      Vminibuffer_local_must_match_map);
 
   DEFVAR_LISP ("minor-mode-map-alist", &Vminor_mode_map_alist,
--- a/src/keymap.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/keymap.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Functions to manipulate keymaps.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/lastfile.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/lastfile.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Mark end of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/lisp.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/lisp.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Fundamental definitions for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -2179,7 +2179,7 @@
 EXFUN (Fsymbol_plist, 1);
 EXFUN (Fsymbol_name, 1);
 extern Lisp_Object indirect_function P_ ((Lisp_Object));
-EXFUN (Findirect_function, 1);
+EXFUN (Findirect_function, 2);
 EXFUN (Ffset, 2);
 EXFUN (Fsetplist, 2);
 EXFUN (Fsymbol_value, 1);
--- a/src/lread.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/lread.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Lisp parsing and input streams.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1081,7 +1081,7 @@
 			    SBYTES (XCAR (tail)));
     }
 
-  string = filename = Qnil;
+  string = filename = encoded_fn = Qnil;
   GCPRO6 (str, string, filename, path, suffixes, encoded_fn);
 
   if (storeptr)
--- a/src/m/7300.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/7300.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for AT&T UNIX PC model 7300
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Modified for this machine by mtxinu!rtech!gonzo!daveb
 
 This file is part of GNU Emacs.
--- a/src/m/acorn.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/acorn.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Machine description file for Acorn RISCiX machines.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/alliant-2800.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/alliant-2800.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800.
-   Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1990, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/alliant.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/alliant.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* alliant.h  Alliant machine running system version 2 or 3.
    Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
    Note that for version 1 of the Alliant system
    you should use alliant1.h instead of this file.
    Use alliant4.h for version 4.
--- a/src/m/alpha.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/alpha.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file For the alpha chip.
    Copyright (C) 1994, 1997, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/altos.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/altos.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* altos machine description file	Altos 3068 Unix System V Release 2
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/amdahl.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/amdahl.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* amdahl machine description file
    Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/amdx86-64.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/amdx86-64.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* machine description file for AMD x86-64.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/apollo.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/apollo.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Apollo machine.
    Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/arm.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/arm.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Machine description file for ARM-based non-RISCiX machines.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/att3b.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/att3b.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Machine-dependent configuration for GNU Emacs for AT&T 3b machines.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
    Modified by David Robinson (daver@csvax.caltech.edu) 6/6/86
 
--- a/src/m/aviion.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/aviion.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Data General AViiON.
    Copyright (C) 1985, 1986, 1991, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/celerity.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/celerity.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Celerity.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/clipper.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/clipper.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for clipper
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/cnvrgnt.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/cnvrgnt.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for convergent S series.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/convex.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/convex.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Convex (all models).
    Copyright (C) 1987, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/cydra5.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/cydra5.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Cydrome's CYDRA 5 mini super computer
    Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/delta88k.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/delta88k.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Machine description file for Motorola System V/88 machines
    Copyright (C) 1985, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/dpx2.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/dpx2.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description for Bull DPX/2 range
    Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/dual.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/dual.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Dual machines using unisoft port.
    Copyright (C) 1985, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/elxsi.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/elxsi.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Elxsi machine (running enix).
    Copyright (C) 1986, 1992, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
    Adapted by John Salmon
 
 This file is part of GNU Emacs.
--- a/src/m/ews4800.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ews4800.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* m- file for NEC EWS4800 RISC series.
    Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/gould-np1.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/gould-np1.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1)
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/gould.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/gould.h	Sun Feb 12 00:15:44 2006 +0000
@@ -5,7 +5,8 @@
 * RELEASE2_1 in config.h. This may also be necessary with un-updated
 * official releases of 2.1
 
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/hp800.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/hp800.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for hp9000 series 800 machines.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/hp9000s300.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/hp9000s300.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for hp9000 series 200 or 300 on either HPUX or BSD.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/i860.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/i860.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for i860.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ia64.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ia64.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for the IA-64 architecture.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
      Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of GNU Emacs.
--- a/src/m/ibm370aix.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ibm370aix.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* m/ file for IBM 370 running AIX.
    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ibmps2-aix.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ibmps2-aix.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for ibm ps/2 aix386.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ibmrs6000.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ibmrs6000.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ibmrt-aix.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ibmrt-aix.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* RTPC AIX machine/system dependent defines
    Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ibmrt.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ibmrt.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* RTPC machine dependent defines
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ibms390.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ibms390.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file template.
    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/intel386.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/intel386.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Machine description file for intel 386.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/iris4d.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/iris4d.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/irist.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/irist.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* machine description file for Silicon Graphics Iris 2500 Turbos;
    also possibly for non-turbo Irises with system release 2.5.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/isi-ov.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/isi-ov.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for ISI 68000's
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/m68k.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/m68k.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Machine description file for generic Motorola 68k.
    Copyright (C) 1985, 1995, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/macppc.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/macppc.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file For the powerpc Macintosh.
    Copyright (C) 1994, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/masscomp.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/masscomp.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for Masscomp 5000 series running RTU, ucb universe.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/mega68.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/mega68.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for Megatest 68000's.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/mg1.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/mg1.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for Whitechapel Computer Works MG1 (ns16000 based).
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    MG-1 version by L.M.McLoughlin
 
 This file is part of GNU Emacs.
--- a/src/m/mips-siemens.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/mips-siemens.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* m- file for Mips machines.
    Copyright (C) 1987, 1992, 1993, 1995, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
    This file contains some changes for our SVR4 based SINIX-Mips 5.4.
    I hope this is helpful to port the emacs to our RM?00 series and
--- a/src/m/mips.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/mips.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* m- file for Mips machines.
    Copyright (C) 1987, 1992, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/news.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/news.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Sony's NEWS workstations, NEWS-OS 3.0.
    Copyright (C) 1985, 1986, 1989, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/next.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/next.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Configuration file for the NeXT machine.
-   Copyright (C) 1990, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1990, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/nh3000.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/nh3000.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,8 @@
 /* machine description for Harris Night Hawk Series 1200 and Series 3000
    MC68030-based systems (FPP on these is custom).  These systems are
    also known as "ecx" and "gcx".
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/nh4000.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/nh4000.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 /* machine description for Harris NightHawk 88k based machines
    (includes nh4000 and nh5000 machines).
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ns16000.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ns16000.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for ns16000.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ns32000.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ns32000.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for National Semiconductor 32000, running Genix.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/nu.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/nu.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for TI Nu machines using system V.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/orion.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/orion.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for HLH Orion.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/orion105.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/orion105.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for HLH Orion 1/05 (Clipper).
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
    Lee McLoughlin <lmjm%doc.imperial.ac.uk@nss.cs.ucl.ac.uk>
 
 This file is part of GNU Emacs.
--- a/src/m/pfa50.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/pfa50.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Machine description file for PFU A-series.
    Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/plexus.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/plexus.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for the Plexus running System V.2.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/powermac.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/powermac.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Machine description file for Apple Power Macintosh
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/powerpcle.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/powerpcle.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for PowerPC.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/pyramid.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/pyramid.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for pyramid.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/sequent-ptx.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/sequent-ptx.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for SEQUENT machines running DYNIX/ptx
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/sequent.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/sequent.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for SEQUENT BALANCE machines
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/sparc.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/sparc.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for Sun 4 SPARC.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/sps7.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/sps7.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Bull SPS-7.
    Copyright (C) 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/sr2k.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/sr2k.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for Hitachi SR2001/SR2201 machines.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/stride.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/stride.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Stride Micro System-V.2.2
    Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/sun1.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/sun1.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for Sun 68000's
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/sun2.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/sun2.h	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
   Note that "sun2.h" refers to the operating system version, not the
   CPU model number.  See the MACHINES file for details.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/sun386.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/sun386.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,8 +1,9 @@
 /* machine description file for Sun's 386-based RoadRunner.  This file borrows heavily from
-  "sun2.h", but since that file is heavily cpu-specific, it was easier
-  not to include it.
+   "sun2.h", but since that file is heavily cpu-specific, it was easier
+   not to include it.
 
-  Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/symmetry.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/symmetry.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for SEQUENT SYMMETRY machines
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/tad68k.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/tad68k.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/tahoe.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/tahoe.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for tahoe.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/targon31.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/targon31.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* targon31 machine description file
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/tek4300.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/tek4300.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for tek4300.
-   Copyright (C) 1988, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/tekxd88.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/tekxd88.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,8 @@
 /* Configuration file for the Tektronix XD88 running UTekV 3.2e,
    contributed by Kaveh Ghazi  (ghazi@caip.rutgers.edu)  1/15/93.
    You probably need to use gnu make (version 3.63 or higher.)
-   Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/template.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/template.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file template.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/tower32.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/tower32.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for the NCR Tower 32 running System V.2.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/tower32v3.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/tower32v3.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for the NCR Tower 32 running System V.3.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/ustation.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/ustation.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30).
    Copyright (C) 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/vax.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/vax.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* machine description file for vax.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/wicat.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/wicat.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* machine description file for WICAT machines.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/windowsnt.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/windowsnt.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Machine description file for Windows NT.
 
    Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/m/xps100.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/m/xps100.h	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
    Mark J. Hewitt (mjh@uk.co.kernel)
 
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/mac.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/mac.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Unix emulation routines for GNU Emacs on the Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/macfns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/macfns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Graphical user interface functions for Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1448,7 +1448,8 @@
 
   BLOCK_INPUT;
 
-  rif->define_frame_cursor (f, cursor);
+  if (FRAME_MAC_WINDOW (f) != 0)
+    rif->define_frame_cursor (f, cursor);
 
   f->output_data.mac->text_cursor = cursor;
   f->output_data.mac->nontext_cursor = nontext_cursor;
@@ -2398,11 +2399,12 @@
   struct mac_display_info *dpyinfo = NULL;
   Lisp_Object parent;
   struct kboard *kb;
-  char x_frame_name[10];
   static int x_frame_count = 2;  /* begins at 2 because terminal frame is F1 */
 
   check_mac ();
 
+  parms = Fcopy_alist (parms);
+
   /* Use this general default value to start with
      until we know if this frame has a specified name.  */
   Vx_resource_name = Vinvocation_name;
@@ -2452,18 +2454,6 @@
   else
     f = make_frame (1);
 
-  if (EQ (name, Qunbound) || NILP (name))
-    {
-      sprintf (x_frame_name, "F%d", x_frame_count++);
-      f->name = build_string (x_frame_name);
-      f->explicit_name = 0;
-    }
-  else
-    {
-      f->name = name;
-      f->explicit_name = 1;
-    }
-
   XSETFRAME (frame, f);
 
   /* Note that X Windows does support scroll bars.  */
@@ -2544,7 +2534,7 @@
       font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
     /* If those didn't work, look for something which will at least work.  */
     if (! STRINGP (font))
-      font = x_new_fontset (f, "fontset-mac");
+      font = x_new_fontset (f, "fontset-standard");
     if (! STRINGP (font))
       font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
     if (! STRINGP (font))
@@ -2679,17 +2669,28 @@
       if (EQ (visibility, Qunbound))
 	visibility = Qt;
 
-#if 0 /* MAC_TODO: really no iconify on Mac */
       if (EQ (visibility, Qicon))
 	x_iconify_frame (f);
-      else
-#endif
-      if (! NILP (visibility))
+      else if (! NILP (visibility))
 	x_make_frame_visible (f);
       else
 	/* Must have been Qnil.  */
 	;
     }
+
+  /* Initialize `default-minibuffer-frame' in case this is the first
+     frame on this display device.  */
+  if (FRAME_HAS_MINIBUF_P (f)
+      && (!FRAMEP (kb->Vdefault_minibuffer_frame)
+          || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame))))
+    kb->Vdefault_minibuffer_frame = frame;
+
+  /* All remaining specified parameters, which have not been "used"
+     by x_get_arg and friends, now go in the misc. alist of the frame.  */
+  for (tem = parms; !NILP (tem); tem = XCDR (tem))
+    if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem))))
+      f->param_alist = Fcons (XCAR (tem), f->param_alist);
+
   UNGCPRO;
 
   /* Make sure windows on this frame appear in calls to next-window
@@ -2699,9 +2700,11 @@
   return unbind_to (count, frame);
 }
 
+
 /* FRAME is used only to get a handle on the X display.  We don't pass the
    display info directly because we're called from frame.c, which doesn't
    know about that structure.  */
+
 Lisp_Object
 x_get_focus_frame (frame)
      struct frame *frame;
@@ -2714,6 +2717,39 @@
   XSETFRAME (xfocus, dpyinfo->x_focus_frame);
   return xfocus;
 }
+
+
+DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0,
+       doc: /* Set the input focus to FRAME.
+FRAME nil means use the selected frame.  */)
+     (frame)
+     Lisp_Object frame;
+{
+  struct frame *f = check_x_frame (frame);
+  struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
+
+  if (dpyinfo->x_focus_frame != f)
+    {
+      BLOCK_INPUT;
+#ifdef MAC_OSX
+      ActivateWindow (ActiveNonFloatingWindow (), false);
+      ActivateWindow (FRAME_MAC_WINDOW (f), true);
+#else
+#if !TARGET_API_MAC_CARBON
+      /* SelectWindow (Non-Carbon) does not issue deactivate events if
+	 the possibly inactive window that is to be selected is
+	 already the frontmost one.  */
+      SendBehind (FRAME_MAC_WINDOW (f), NULL);
+#endif
+      /* This brings the window to the front.  */
+      SelectWindow (FRAME_MAC_WINDOW (f));
+#endif
+      UNBLOCK_INPUT;
+    }
+
+  return Qnil;
+}
+
 
 DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
        doc: /* Internal function called by `color-defined-p', which see.  */)
@@ -3664,7 +3700,7 @@
       font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
     /* If those didn't work, look for something which will at least work.  */
     if (! STRINGP (font))
-      font = x_new_fontset (f, "fontset-mac");
+      font = x_new_fontset (f, "fontset-standard");
     if (! STRINGP (font))
       font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
     if (! STRINGP (font))
@@ -4513,6 +4549,7 @@
   defsubr (&Sx_close_connection);
   defsubr (&Sx_display_list);
   defsubr (&Sx_synchronize);
+  defsubr (&Sx_focus_frame);
 
   /* Setting callback functions for fontset handler.  */
   get_font_info_func = x_get_font_info;
--- a/src/macgui.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/macgui.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication on the Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/macmenu.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/macmenu.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Menu support for GNU Emacs on Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/macros.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/macros.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Keyboard macros.
    Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/macros.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/macros.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Definitions for keyboard macro interpretation in GNU Emacs.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/macterm.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/macterm.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Implementation of GUI terminal on the Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1026,12 +1026,15 @@
 static void
 init_cg_text_anti_aliasing_threshold ()
 {
-  Lisp_Object val =
-    Fmac_get_preference (build_string ("AppleAntiAliasingThreshold"),
-			 Qnil, Qnil, Qnil);
-
-  if (INTEGERP (val))
-    cg_text_anti_aliasing_threshold = XINT (val);
+  int threshold;
+  Boolean valid_p;
+
+  threshold =
+    CFPreferencesGetAppIntegerValue (CFSTR ("AppleAntiAliasingThreshold"),
+				     kCFPreferencesCurrentApplication,
+				     &valid_p);
+  if (valid_p)
+    cg_text_anti_aliasing_threshold = threshold;
 }
 
 static int
@@ -5299,7 +5302,10 @@
      struct frame *f;
      Cursor cursor;
 {
-  SetThemeCursor (cursor);
+  struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
+
+  if (dpyinfo->x_focus_frame == f)
+    SetThemeCursor (cursor);
 }
 
 
@@ -5837,7 +5843,7 @@
   if (f->async_visible)
     {
       BLOCK_INPUT;
-      SelectWindow (FRAME_MAC_WINDOW (f));
+      BringToFront (FRAME_MAC_WINDOW (f));
       UNBLOCK_INPUT;
     }
 }
@@ -5851,7 +5857,7 @@
   if (f->async_visible)
     {
       BLOCK_INPUT;
-      SendBehind (FRAME_MAC_WINDOW (f), nil);
+      SendBehind (FRAME_MAC_WINDOW (f), NULL);
       UNBLOCK_INPUT;
     }
 }
@@ -5964,7 +5970,6 @@
 
       f->output_data.mac->asked_for_visible = 1;
 
-      SelectWindow (FRAME_MAC_WINDOW (f));
       CollapseWindow (FRAME_MAC_WINDOW (f), false);
       ShowWindow (FRAME_MAC_WINDOW (f));
     }
@@ -9581,6 +9586,8 @@
   /* So people can tell when we have read the available input.  */
   input_signal_count++;
 
+  ++handling_signal;
+
 #if USE_CARBON_EVENTS
   toolbox_dispatcher = GetEventDispatcherTarget ();
 
@@ -10221,6 +10228,7 @@
   }
 #endif
 
+  --handling_signal;
   UNBLOCK_INPUT;
   return count;
 }
--- a/src/macterm.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/macterm.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Display module for Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -206,9 +206,6 @@
    FONT-LIST-CACHE records previous values returned by x-list-fonts.  */
 extern Lisp_Object x_display_name_list;
 
-/* A flag to control how to display unibyte 8-bit character.  */
-extern int unibyte_display_via_language_environment;
-
 extern struct x_display_info *x_display_info_for_display P_ ((Display *));
 extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object));
 
--- a/src/makefile.w32-in	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/makefile.w32-in	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005 Free Software Foundation, Inc.
+#                2005, 2006 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
--- a/src/marker.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/marker.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Markers: examining, setting and deleting.
    Copyright (C) 1985, 1997, 1998, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/md5.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/md5.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
    Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU Emacs.
 
    The GNU C Library is free software; you can redistribute it and/or
--- a/src/md5.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/md5.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Declaration of functions and data types used for MD5 sum computing
    library functions.
    Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
    This file is part of GNU Emacs.
 
    The GNU C Library is free software; you can redistribute it and/or
--- a/src/mem-limits.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/mem-limits.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Includes for memory limit warnings.
    Copyright (C) 1990, 1993, 1994, 1995, 1996, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/minibuf.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/minibuf.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 /* Minibuffer input and completion.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/mktime.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/mktime.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Convert a `struct tm' to a time_t value.
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
    Contributed by Paul Eggert (eggert@twinsun.com).
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
--- a/src/msdos.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/msdos.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* MS-DOS specific C utilities.          -*- coding: raw-text -*-
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/msdos.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/msdos.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* MS-DOS specific C utilities, interface.
    Copyright (C) 1993, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/prefix-args.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/prefix-args.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* prefix-args.c - echo each argument, prefixed by a string.
-   Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/print.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/print.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Lisp object printing and output streams.
    Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997,
                  1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/process.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/process.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Asynchronous subprocess control for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1996, 1998, 1999, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/process.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/process.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions for asynchronous process control in GNU Emacs.
    Copyright (C) 1985, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/puresize.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/puresize.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* How much read-only Lisp storage a dumped Emacs needs.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/ralloc.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/ralloc.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Block-relocating memory allocator.
    Copyright (C) 1993, 1995, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/regex.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/regex.h	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
    expression library, version 0.12.
 
    Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2002,
-                 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
--- a/src/region-cache.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/region-cache.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Caching facts about regions of the buffer, for optimization.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/region-cache.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/region-cache.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Header file: Caching facts about regions of the buffer, for optimization.
    Copyright (C) 1985, 1986, 1993, 1995, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/aix3-1.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/aix3-1.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on IBM AIX version 3.1
    Copyright (C) 1985, 1986, 1990, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/bsd4-1.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/bsd4-1.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.1.
    Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/bsd4-2.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/bsd4-2.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.2
    Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/bsd4-3.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/bsd4-3.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.3
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/cxux.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/cxux.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Header file for Harris CXUX.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/cygwin.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/cygwin.h	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
    This file describes the parameters that system description files
    should define or not.
    Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/darwin.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/darwin.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* System description header file for Darwin (Mac OS X).
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/dgux.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/dgux.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    version 4.32 upto and including 5.4.1.
    Copyright (C) 1994, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/dgux4.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/dgux4.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    Release 4.10 and above.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/dgux5-4-3.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/dgux5-4-3.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    version 5.4 Release 3.00 and above.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/dgux5-4r2.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/dgux5-4r2.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    5.4 Release 2.xx systems.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/freebsd.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/freebsd.h	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
    This file describes the parameters that system description files
    should define or not.
    Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/gnu-linux.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/gnu-linux.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* This file is the configuration file for Linux-based GNU systems
    Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/gnu.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/gnu.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
    Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/hpux.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/hpux.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on HPUX release 7.0.
    Based on AT&T System V.2.
    Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/iris3-5.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/iris3-5.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics 3.5
    Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/iris3-6.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/iris3-6.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics system 3.6.
    Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/irix3-3.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/irix3-3.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3.
    Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/lynxos.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/lynxos.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on LynxOS-3.0.1
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/ms-w32.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/ms-w32.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* System description file for Windows NT.
    Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/msdos.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/msdos.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* System description file for MS-DOS
 
    Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/newsos5.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/newsos5.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Sony's NEWS-OS 5.0.2
    Copyright (C) 1992, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/nextstep.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/nextstep.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Configuration file for the NeXTstep system.
    Copyright (C) 1990, 1995, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/ptx.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/ptx.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x
    Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/riscix1-1.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/riscix1-1.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3)
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/riscix12.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/riscix12.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3)
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/rtu.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/rtu.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on RTU 3.0, ucb universe.
    Copyright (C) 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/sco4.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/sco4.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* System description file for SCO 3.2v4.
    Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/sco5.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/sco5.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* System description file for SCO 3.2v5.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/template.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/template.h	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,7 @@
    This file describes the parameters that system description files
    should define or not.
    Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/umax.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/umax.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on UMAX 4.2
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/unipl5-2.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/unipl5-2.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2
    Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/usg5-0.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/usg5-0.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V.0
    Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/usg5-2-2.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/usg5-2-2.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.2
    Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/usg5-2.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/usg5-2.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.0
    Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/usg5-3.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/usg5-3.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 3
    Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/usg5-4.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/usg5-4.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
    Copyright (C) 1987, 1990, 1999, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/vms.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/vms.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* system description header for VMS
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/s/xenix.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/s/xenix.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2
    Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/scroll.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/scroll.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Calculate what line insertion or deletion to do, and do it,
    Copyright (C) 1985, 1986, 1990, 1993, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/search.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/search.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* String search routines for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/sheap.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/sheap.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin;
    complete rewrite of xemacs Cygwin `unexec' code
 
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/sound.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/sound.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* sound.c -- sound support.
    Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/strftime.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/strftime.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
--- a/src/sunfns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/sunfns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Functions for Sun Windows menus and selection buffer.
    Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is probably totally obsolete.  In any case, the FSF is
 unwilling to support it.  We agreed to include it in our distribution
--- a/src/syntax.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/syntax.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* GNU Emacs routines to deal with syntax tables; also word and list parsing.
    Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2002,
-                 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/syntax.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/syntax.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Declarations having to do with GNU Emacs syntax tables.
    Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/sysdep.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/sysdep.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Interfaces to system-dependent kernel and library entries.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/sysselect.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/sysselect.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* sysselect.h - System-dependent definitions for the select function.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/syssignal.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/syssignal.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* syssignal.h - System-dependent definitions for signals.
    Copyright (C) 1993, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/systime.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/systime.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* systime.h - System-dependent definitions for time manipulations.
    Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/systty.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/systty.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* systty.h - System-dependent definitions for terminals.
    Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/syswait.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/syswait.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Define wait system call interface for Emacs.
    Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/term.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/term.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Terminal control module for terminals described by TERMCAP
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1998, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1328,10 +1328,10 @@
 
 
 /* Append glyphs to IT's glyph_row.  Called from produce_glyphs for
-   terminal frames if IT->glyph_row != NULL.  IT->c is the character
-   for which to produce glyphs; IT->face_id contains the character's
-   face.  Padding glyphs are appended if IT->c has a IT->pixel_width >
-   1.  */
+   terminal frames if IT->glyph_row != NULL.  IT->char_to_display is
+   the character for which to produce glyphs; IT->face_id contains the
+   character's face.  Padding glyphs are appended if IT->c has a
+   IT->pixel_width > 1.  */
 
 static void
 append_glyph (it)
@@ -1351,7 +1351,7 @@
     {
       glyph->type = CHAR_GLYPH;
       glyph->pixel_width = 1;
-      glyph->u.ch = it->c;
+      glyph->u.ch = it->char_to_display;
       glyph->face_id = it->face_id;
       glyph->padding_p = i > 0;
       glyph->charpos = CHARPOS (it->position);
@@ -1402,6 +1402,9 @@
   xassert (it->what == IT_CHARACTER
 	   || it->what == IT_COMPOSITION);
 
+  /* Maybe translate single-byte characters to multibyte.  */
+  it->char_to_display = it->c;
+
   if (it->c >= 040 && it->c < 0177)
     {
       it->pixel_width = it->nglyphs = 1;
@@ -1431,13 +1434,11 @@
 	{
 	  int n = nspaces;
 
-	  it->c = ' ';
+	  it->char_to_display = ' ';
 	  it->pixel_width = it->len = 1;
 
 	  while (n--)
 	    append_glyph (it);
-
-	  it->c = '\t';
 	}
 
       it->pixel_width = nspaces;
@@ -1445,14 +1446,30 @@
     }
   else if (SINGLE_BYTE_CHAR_P (it->c))
     {
-      /* Coming here means that it->c is from display table, thus we
-	 must send the code as is to the terminal.  Although there's
-	 no way to know how many columns it occupies on a screen, it
-	 is a good assumption that a single byte code has 1-column
-	 width.  */
-      it->pixel_width = it->nglyphs = 1;
-      if (it->glyph_row)
-	append_glyph (it);
+      if (unibyte_display_via_language_environment
+	  && (it->c >= 0240
+	      || !NILP (Vnonascii_translation_table)))
+	{
+	  int charset;
+
+	  it->char_to_display = unibyte_char_to_multibyte (it->c);
+	  charset = CHAR_CHARSET (it->char_to_display);
+	  it->pixel_width = CHARSET_WIDTH (charset);
+	  it->nglyphs = it->pixel_width;
+	  if (it->glyph_row)
+	    append_glyph (it);
+	}
+      else
+	{
+	  /* Coming here means that it->c is from display table, thus we
+	     must send the code as is to the terminal.  Although there's
+	     no way to know how many columns it occupies on a screen, it
+	     is a good assumption that a single byte code has 1-column
+	     width.  */
+	  it->pixel_width = it->nglyphs = 1;
+	  if (it->glyph_row)
+	    append_glyph (it);
+	}
     }
   else
     {
@@ -1537,17 +1554,15 @@
       Lisp_Object o_object = it->object;
       Lisp_Object object = it->stack[it->sp - 1].string;
       int n = width;
-      int c = it->c;
 
       if (!STRINGP (object))
 	object = it->w->buffer;
       it->object = object;
-      it->c = ' ';
+      it->char_to_display = ' ';
       it->pixel_width = it->len = 1;
       while (n--)
 	append_glyph (it);
       it->object = o_object;
-      it->c = c;
     }
   it->pixel_width = width;
   it->nglyphs = width;
--- a/src/termcap.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/termcap.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Work-alike for termcap, plus extra features.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/src/termchar.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/termchar.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Flags and parameters describing terminal's characteristics.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/termhooks.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/termhooks.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Parameters and display hooks for terminal devices.
    Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/terminfo.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/terminfo.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Interface from Emacs to terminfo.
    Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/termopts.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/termopts.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Flags and parameters describing user options for handling the terminal.
    Copyright (C) 1985, 1986, 1990, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/textprop.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/textprop.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Interface code for dealing with text properties.
    Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/tparam.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/tparam.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Merge parameters into a termcap entry string.
    Copyright (C) 1985, 1987, 1993, 1995, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/src/uaf.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/uaf.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* GNU Emacs VMS UAF definition file.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/undo.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/undo.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* undo handling for GNU Emacs.
    Copyright (C) 1990, 1993, 1994, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexaix.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexaix.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Dump an executable image.
    Copyright (C) 1985, 1986, 1987, 1988, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexalpha.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexalpha.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Unexec for DEC alpha.  schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf).
 
    Copyright (C) 1994, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexapollo.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexapollo.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* unexapollo.c -- COFF File UNEXEC for GNU Emacs on Apollo SR10.x
    Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexconvex.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexconvex.c	Sun Feb 12 00:15:44 2006 +0000
@@ -8,7 +8,7 @@
    break it.
 
    Copyright (C) 1985, 1986, 1988, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexcw.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexcw.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* unexec() support for Cygwin;
    complete rewrite of xemacs Cygwin unexec() code
 
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexec.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexec.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexelf.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexelf.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,5 @@
 /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexenix.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexenix.c	Sun Feb 12 00:15:44 2006 +0000
@@ -7,7 +7,7 @@
    maintenance might break it.
 
    Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexmacosx.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexmacosx.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Dump Emacs in Mach-O format for use on Mac OS X.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexmips.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexmips.c	Sun Feb 12 00:15:44 2006 +0000
@@ -7,7 +7,7 @@
    maintenance might break it.
 
    Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexnext.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexnext.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Dump Emacs in macho format.
    Copyright (C) 1990, 1993, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
    Written by Bradley Taylor (btaylor@next.com).
 
 This file is part of GNU Emacs.
--- a/src/unexsni.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexsni.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Unexec for Siemens machines running Sinix (modified SVR4).
    Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2002,
-                 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexsunos4.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexsunos4.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Unexec for Sunos 4 using shared libraries.
    Copyright (C) 1990, 1994, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/unexw32.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/unexw32.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* unexec for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/vm-limit.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/vm-limit.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Functions for memory limit warnings.
    Copyright (C) 1990, 1992, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w16select.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w16select.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* 16-bit Windows Selection processing for emacs on MS-Windows
    Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs on the Microsoft W32 API.
    Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32.h	Sun Feb 12 00:15:44 2006 +0000
@@ -2,7 +2,8 @@
 #define EMACS_W32_H
 
 /* Support routines for the NT version of Emacs.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32bdf.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32bdf.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Implementation of BDF font handling on the Microsoft W32 API.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32bdf.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32bdf.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Definitions and header for handling BDF fonts on the Microsoft W32 API.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32console.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32console.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Terminal hooks for GNU Emacs on the Microsoft W32 API.
    Copyright (C) 1992, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32fns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32fns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Graphical user interface functions for the Microsoft W32 API.
    Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32gui.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32gui.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Definitions and headers for communication on the Microsoft W32 API.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32heap.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32heap.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Heap management routines for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32heap.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32heap.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32inevt.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32inevt.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Input event support for Emacs on the Microsoft W32 API.
    Copyright (C) 1992, 1993, 1995, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32inevt.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32inevt.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* Input routines for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32menu.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32menu.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Menu support for GNU Emacs on the Microsoft W32 API.
    Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32proc.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32proc.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Process support for GNU Emacs on the Microsoft W32 API.
    Copyright (C) 1992, 1995, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32reg.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32reg.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Emulate the X Resource Manager through the registry.
    Copyright (C) 1990, 1993, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32select.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32select.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Selection processing for Emacs on the Microsoft W32 API.
    Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32term.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32term.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Implementation of GUI terminal on the Microsoft W32 API.
    Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/w32term.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32term.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication on the Microsoft W32 API.
    Copyright (C) 1995, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -248,9 +248,6 @@
 /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'.  */
 extern Lisp_Object Vx_pixel_size_width_font_regexp;
 
-/* A flag to control how to display unibyte 8-bit character.  */
-extern int unibyte_display_via_language_environment;
-
 struct w32_display_info *x_display_info_for_name ();
 
 Lisp_Object display_x_get_resource P_ ((struct w32_display_info *,
--- a/src/w32xfns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/w32xfns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Functions taken directly from X sources for use with the Microsoft W32 API.
    Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/widget.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/widget.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* The emacs frame widget.
    Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/widget.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/widget.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* The emacs frame widget public header file.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/widgetprv.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/widgetprv.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,5 +1,6 @@
 /* The emacs frame widget private header file.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/window.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/window.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,7 +1,7 @@
 /* Window creation, deletion and examination for GNU Emacs.
    Does not include redisplay.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4286,6 +4286,14 @@
 	{
 	  if (!NILP (XWINDOW (window)->next))
 	    {
+              /* This may happen for the minibuffer.  In that case
+                 the window_deletion_count check below does not work.  */
+              if (XINT (CURSIZE (p->next)) - delta <= 0) 
+                {
+                  Fset_window_configuration (old_config);
+                  error ("Cannot adjust window size as specified");
+                }
+
 	      XSETINT (CURBEG (p->next),
 		       XINT (CURBEG (p->next)) + delta);
 	      size_window (p->next, XINT (CURSIZE (p->next)) - delta,
--- a/src/xfaces.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/xfaces.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* xfaces.c -- "Face" primitives.
    Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/xfns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/xfns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Functions for the X window system.
    Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/xmenu.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/xmenu.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
    Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/xrdb.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/xrdb.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Deal with the X Resource Manager.
    Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/xselect.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/xselect.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* X Selection processing for Emacs.
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/xsmfns.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/xsmfns.c	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Session management module for systems which understand the X Session
    management protocol.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
--- a/src/xterm.c	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/xterm.c	Sun Feb 12 00:15:44 2006 +0000
@@ -6508,6 +6508,12 @@
 	 so update things that depend on mouse position.  */
       if (f && !f->output_data.x->hourglass_p)
 	note_mouse_movement (f, &event.xmotion);
+#ifdef USE_GTK
+      /* We may get an EnterNotify on the buttons in the toolbar.  In that
+         case we moved out of any highlighted area and need to note this.  */
+      if (!f && last_mouse_glyph_frame)
+        note_mouse_movement (last_mouse_glyph_frame, &event);
+#endif
       goto OTHER;
 
     case FocusIn:
@@ -6535,6 +6541,11 @@
           if (any_help_event_p)
 	    do_help = -1;
         }
+#ifdef USE_GTK
+      /* See comment in EnterNotify above */
+      else if (last_mouse_glyph_frame)
+        note_mouse_movement (last_mouse_glyph_frame, &event);
+#endif
       goto OTHER;
 
     case FocusOut:
--- a/src/xterm.h	Mon Feb 06 18:44:57 2006 +0000
+++ b/src/xterm.h	Sun Feb 12 00:15:44 2006 +0000
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication with X protocol.
    Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005 Free Software Foundation, Inc.
+                 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -419,9 +419,6 @@
 /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'.  */
 extern Lisp_Object Vx_pixel_size_width_font_regexp;
 
-/* A flag to control how to display unibyte 8-bit character.  */
-extern int unibyte_display_via_language_environment;
-
 extern struct x_display_info *x_display_info_for_display P_ ((Display *));
 extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object));