Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162

11 files changed, 76 insertions, 106 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 65606c02cb5..c36ebf904d6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -405,8 +405,8 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-        Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index f45c5819466..84ada56b26d 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -1,7 +1,9 @@
 Tasks needed before the next release.
 
 * UPDATE COPYRIGHTS (Happy New Year :-)
-
+  Done, I think. Please keep an eye out for any errors, eg copyrights
+  not at the start of the file that are easy to miss, as in
+  src/emacs.c.
 
 * TO BE DONE SHORTLY BEFORE RELEASE
 
@@ -50,35 +52,13 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
 * BUGS
 
-** document gpg-agent.
-
-** Need papers from Rubini for his code in t-mouse.el
-  Sent instructions.
-
-** lennart.borgman.073@student.lu.se, Dec 21:
-  Saving when the coding system can't code all buffer characters
-
-** Bug in ESHELL that Wiegley is supposed to fix.
-
-** How should C-x C-v ask about saving?
-
-** lennart.borgman.073@student.lu.se, Dec 16:
-  compilation-previous-error fails if first error is at start of buffer
-
-** CC mode fixes to be installed.
-
 ** W3 status with latest url package.
 
 ** Fix up the notices in oldXMenu properly.
 
-** bruno@clisp.org's patches for location of Info file directory.
-
 ** disumu@x3y2z1.net, Nov 22:
   URL not following some 302 redirects after recent changes
 
-** Give recommendations for redefining window manager keys
-  to avoid interference with Emacs.
-
 ** lennart.borgman.073@student.lu.se, Dec 29:
   How global is a define-global-minor-mode mode
 He says that customizing such a mode simply does not work.
@@ -88,11 +68,14 @@ through the custom mechanism.
 
 ** b.riefenstahl@turtle-trading.net, Dec 29:
   GTK build crashes under X
+  Seems to be a libXft or gtk theme bug, not an Emacs bug.
+  However, a workaround is possible.
 
-** dooglus@gmail.com, Dec 29: 4 week-old pretest bugs
-  Two GTK version bugs.
+** simon.marshall@misys.com, Jan 12: 
+  Font-lock decides function call is function declaration in C+ +
 
-** pgg bugs reported by rms.
+** ZTHJWSQQAFHV@spammotel.com, Jan 12:
+  Color-theme problems in Emacs 22+ (Ubuntu, Windows)
 
 * DOCUMENTATION
 
diff --git a/admin/admin.el b/admin/admin.el
index c2d4eebe903..342b40f9bde 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,7 +1,7 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 3ca8d4349f3..c336d808d58 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,6 +1,6 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-     Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/admin/build-configs b/admin/build-configs
index b3bbfda0cd2..b99b5405075 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-#   Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 57e98b6f323..cba8e31ac89 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,7 +1,7 @@
 ;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006  Free
-;;   Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
 ;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index c27a8df991d..03b5a00a12f 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-#   Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/make-emacs b/admin/make-emacs
index 01b8bddbd78..d6b14ca22b9 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-#   Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/notes/years b/admin/notes/years
index 155ccd6f065..b5e93f1406a 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -2,7 +2,7 @@ How to Maintain Copyright Years for GNU Emacs
 
 
 "Our lawyer says it is ok if we add, to each file that has been in Emacs
- since Emacs 21 came out in 2001, all the subsequent years.  We don't
+ since Emacs 21 came out in 2001, all the subsequent years[1].  We don't
  need to check whether *that file* was changed in those years.
  It's sufficient that *Emacs* was changed in those years (and it was!).
 
@@ -11,6 +11,9 @@ How to Maintain Copyright Years for GNU Emacs
 
  --RMS, 2005-07-13
 
+[1] Note that this includes 2001 - see
+<http://lists.gnu.org/archive/html/emacs-pretest-bug/2006-12/msg00119.html>
+
 
 For the refcards under etc/, it's ok to simply use the latest year
 (typically in a `\def\year{YEAR}' expression) for the rendered copyright
@@ -18,6 +21,23 @@ notice, while maintaining the full list of years in the copyright notice
 in the comments.
 
 
+Please fix or report any non-trivial files that have "odd" copyright
+notices.  This includes missing copyright notices, and copyright
+holders other than FSF (or AIST in some cases).  In most cases,
+individual authors should not appear in copyright statements.  Either
+the copyright has been assigned (check copyright.list) to the FSF (in
+which case the original author should be removed and the year(s)
+transferred to the FSF); or else it is possible the file should not be
+in Emacs at all (please report!).
+
+When updating the copyright in a file (eg a .tex file) that generates
+another file distributed with Emacs, don't forget to check in a
+regenerated version of the target file.
+
+For auto-generated files (eg ldefs-boot.el), RMS says (20061211,
+private mail): "Since they are automatically generated, it doesn't
+really matter what they say."
+
 ------------------------------------------------------------------------------
 
 
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index e351d025309..67d8e7919ce 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -88,44 +88,25 @@
       leim-21.3-src.tar.gz
 
 
-* Distributions in multi-file .zip format
-
-  A second distribution in the form of multiple small .zip files is also
-  provided, for the benefit of people who have unreliable internet
-  connections, or who need to copy the distribution onto floppy disks:
-
-      em213b*.zip
-
-  This is equivalent to getting emacs-21.3-bin-i386.tar.gz above.
-  The lisp source is available as em213l*.zip.
-
-
 * Distributions for non-x86 platforms
 
-  I try to make this port available for all platforms supported by
-  Windows (it should build on all supported Windows NT/9x platforms).
-  However, I do not always have access to non-x86 platforms, and so I
-  cannot guarantee to provide precompiled distributions for the other
-  platforms myself.  If you find there are no binaries for your
-  platform, and you have access to a Microsoft compiler, then you can
-  download the source and compile Emacs yourself (and, if you do, please
-  consider contributing your executables; send me mail and we can make
-  arrangements for making them available on this ftp server.)
-
+  Distributions for non-x86 platforms are no longer supplied. Older
+  platforms supported by Windows NT no longer seem to be in demand,
+  and Emacs is yet to be ported to 64bit Windows platforms. If you are
+  willing to help port Emacs to 64bit versions of Windows, your
+  contribution will be welcome on the emacs-devel mailing list.
 
 * Unpacking distributions
 
-  Programs for handling the distribution file formats can be found in
-  the utilities directory: 
+  Ports of GNU gzip and GNU tar for handling the distribution file
+  formats can be found in several places that distribute ports of GNU
+  programs, for example:
 
-    http://mirrors.sunsite.dk/gnu/windows/emacs/utilities/
+    Cygwin:   http://www.cygwin.com/
+    GnuWin32: http://gnuwin32.sourceforge.net/
 
-  For gzipped tar files, you will need either gunzip.exe and tar.exe
-  together, or djtarnt.exe.  djtarnt.exe can also unpack .zip files.  I
-  strongly urge you to use these utilities since they were the ones used
-  to create the distributions; the most common problem people have in
-  trying to get Emacs to run is due to some other utility program
-  corrupting the distribution while unpacking.
+  Many other popular file compression utilities for Windows are also
+  able to handle gzipped tar files.
 
   Open a command prompt (MSDOS) window.  Decide on a directory in which
   to place Emacs.  Move the distribution to that directory, and then
@@ -151,25 +132,10 @@
   You may be prompted to rename or overwrite directories when using
   djtarnt: simply type return to continue (this is harmless).
 
-  If you have the multi-file .zip distribution, use djtarnt to unpack
-  all of the .zip files:
-
-    % djtarnt -x *.zip
-
   Once you have unpacked a precompiled distribution of Emacs, it should
   have the following subdirectories:
 
-        bin     etc     info    lisp    lock    site-lisp
-
-  If your utility failed to create the lock directory, then you can
-  simply create it by hand (it is initially empty).
-
-  One final step is needed only when installing from the multi-file .zip
-  distribution, in order to recreate emacs.exe from its fragments (it is
-  too big to fit on a floppy even when zipped):
-
-    % cd emacs-21.3\bin
-    % stitch
+        bin     etc     info    lisp    site-lisp
 
 
 * Unpacking with other tools
@@ -178,9 +144,9 @@
   the following to be sure the distribution was not corrupted:
 
   + Be sure to disable the CR/LF translation or the executables will be
-    unusable.  Older versions of WinZipNT would enable this translation
-    by default.  If you are using WinZipNT, disable it.  (I don't have
-    WinZipNT myself, and I do not know the specific commands necessary
+    unusable.  Older versions of WinZip would enable this translation
+    by default.  If you are using WinZip, disable it.  (I don't have
+    WinZip myself, and I do not know the specific commands necessary
     to disable it.)
 
   + Check that filenames were not truncated to 8.3.  For example, there
@@ -188,12 +154,9 @@
     abbrevli.el, your distribution has been corrupted while unpacking
     and Emacs will not start.
 
-  + I've been told that some utilities (WinZip again?) don't create the
-    lock subdirectory.  The lock subdirectory needs to be created.
-
-  + I've also had reports that the "gnu-win32" port of tar corrupts the
-    executables.  Use the version of tar or djtarnt in the utilities
-    directory instead.
+  + I've also had reports that some older "gnuwin32" port of tar
+    corrupts the executables.  Use the latest version from the gnuwin32
+    site or another port of tar instead.
 
   If you believe you have unpacked the distributions correctly and are
   still encountering problems, see the section on Further Information
@@ -204,11 +167,12 @@
 
   If you would like to compile Emacs from source, download the source
   distribution, unpack it in the same manner as a precompiled
-  distribution, and look in the file nt/INSTALL for detailed directions.
-  You can either use the Microsoft compiler included with Visual C++, or
-  GCC 2.95 or later with MinGW support, to compile the source.  The port
-  of GCC included in Cygwin is supported, but check the nt/INSTALL file
-  if you have trouble since some builds of GNU make aren't supported.
+  distribution, and look in the file nt/INSTALL for detailed
+  directions.  You can either use the Microsoft compiler included with
+  Visual C++ 2003 or earlier, or GCC 2.95 or later with MinGW support,
+  to compile the source.  The port of GCC included in Cygwin is
+  supported, but check the nt/INSTALL file if you have trouble since
+  some builds of GNU make aren't supported.
 
 
 * Further information
@@ -250,5 +214,8 @@
 
   Enjoy!
 
-  Andrew Innes
-  (andrewi@gnu.org)
+  Jason Rumney
+  (jasonr@gnu.org)
+
+  Most of this README was contributed by former maintainer Andrew Innes
+  (andrewi@gnu.org)
\ No newline at end of file
diff --git a/admin/revdiff b/admin/revdiff
index 9d419cdbfdb..78be1f62304 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-#   Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #