Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 523-544)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 168-171)

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

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

9 files changed, 36 insertions, 10 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index b60edd3bea9..0f01e1ae1c7 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * admin.el (set-version): Set version number in
+        lib-src/makefile.w32-in.
+
 2006-11-06  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * FOR-RELEASE (BUGS): Remove "Build failure under Suse 10.0" was
@@ -395,7 +400,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 68a6038cbdd..3e481810a69 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -43,11 +43,21 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
 * BUGS
 
+** make-network-process :nowait t doesn't work for non-local targets
+   on Windows.
+   If it cannot be fixed, (featurep 'make-network-process '(:nowait t))
+   should return nil.
+
 ** Document use of gpg-agent
 
-** seltenreich@gmx.de, Nov 19: Failed assertion on make-frame-on-display
+** monnier@iro.umontreal.ca, Nov 24:
+  gnus-summary-tick-article-forward doesn't work any more?
+
+** christopher.ian.moore@gmail.com, Nov 30: too much recursion in gnus-sort-threads-1.
+
+** dooglus@gmail.com, Dec 1: Replacement of spaces in wdired
 
-** jbuehler@spirentcom.com, Nov 20: AIX 5.2 loadup failure
+** Should CC mode set beginning-of-defun-function?
 
 * DOCUMENTATION
 
diff --git a/admin/admin.el b/admin/admin.el
index 6cd090c0805..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.
 
@@ -88,6 +89,9 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file root "lispref/elisp.texi" version
                        (rx (and "EMACSVER" (1+ space)
                                 (submatch (1+ (in "0-9."))))))
+  (set-version-in-file root "lib-src/makefile.w32-in" version
+                       (rx (and "VERSION" (0+ space) "=" (0+ space)
+                                (submatch (1+ (in "0-9."))))))
   ;; nt/emacs.rc also contains the version number, but in an awkward
   ;; format. It must contain four components, separated by commas, and
   ;; in two places those commas are followed by space, in two other
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/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.
 #