Merged from emacs@sv.gnu.org.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

10 files changed, 65 insertions, 17 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6374f85bb8d..65606c02cb5 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-01  Miles Bader  <miles@gnu.org>
+
+	* quick-install-emacs (get_config_var): Deal with weird magic
+	string inserted by recent versions of autoconf.
+
 2006-11-25  Juanma Barranquero  <lekktu@gmail.com>
 
 	* admin.el (set-version): Set version number in
@@ -400,7 +405,8 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001 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.
 
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 224a1929997..3b7eb8c4560 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -41,21 +41,56 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin.
   (Did we decide that is unreproducible?)
 
+** make-network-process :nowait t doesn't work for non-local targets
+   on Windows.  This has been "fixed" for Emacs 22 by defining
+   BROKEN_NON_BLOCKING_CONNECT in ms-w32.h.
+
+
 * BUGS
 
-** Document use of gpg-agent
+** 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
 
-** monnier@iro.umontreal.ca, Nov 24: 
-  gnus-summary-tick-article-forward doesn't work any more?
+** Give recommendations for redefining window manager keys
+  to avoid interference with Emacs.
 
-** jpff@codemist.co.uk, Nov 23: Problem in reading mail
-  Error is Invalid search bound
+** 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.
+RMS says that there is no code in the generated defcustom,
+or elsewhere in the generated code, to implement setting that variable
+through the custom mechanism.
 
-** rgm@gnu.org, Nov 29: mouse and horizontal scrolling with long lines
+** b.riefenstahl@turtle-trading.net, Dec 29:
+  GTK build crashes under X
 
-** christopher.ian.moore@gmail.com, Nov 30: too much recursion in gnus-sort-threads-1.
+** dooglus@gmail.com, Dec 29: 4 week-old pretest bugs
+  Two GTK version bugs.
 
-** rmg@gnu.org, Nov 29: saved user abbrevs and system abbrevs
+** pgg bugs reported by rms.
 
 * DOCUMENTATION
 
diff --git a/admin/admin.el b/admin/admin.el
index b9937ea9882..c2d4eebe903 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,6 +1,7 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
+;;   Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 947b542005c..3ca8d4349f3 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,5 +1,6 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
+     Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/admin/build-configs b/admin/build-configs
index 29fc0f0b94c..b3bbfda0cd2 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,6 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
+#   Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 6ff92b88c95..57e98b6f323 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,6 +1,7 @@
 ;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006  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 da3b1911abb..c27a8df991d 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
+#   Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/make-emacs b/admin/make-emacs
index 57d04a8f625..01b8bddbd78 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -1,6 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
+#   Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 9a9d1203d96..2167b8ee2d1 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -136,7 +136,7 @@ fi
 CONFIG_STATUS="$BUILD/config.status"
 get_config_var ()
 {
-  if ! sed -n "s/^s\(.\)@$1@\1\(.*\)\1.*$/\2/p" $CONFIG_STATUS | sed q | grep ''
+  if ! sed -n "s/^s\(.\)@$1@\1\(|#_!!_#|\)*\(.*\)\1.*$/\3/p" $CONFIG_STATUS | sed q | grep ''
   then
     echo 1>&2 "$me: $1: Configuration variable not found in $CONFIG_STATUS"
     exit 4
diff --git a/admin/revdiff b/admin/revdiff
index 3b5ffaad3f1..9d419cdbfdb 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -1,6 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
+#   Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #