Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

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

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

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

4 files changed, 42 insertions, 24 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 51332e21cdc..3cb98270c8b 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-10  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* FOR-RELEASE (http): Add Gtk+ tool bar and GUD focus problem.
+
 2007-07-25  Glenn Morris  <rgm@gnu.org>
 
 	* Relicense all FSF files to GPLv3 or later.
@@ -19,7 +23,7 @@
 	* nt/makedist.bat: Change EOL format to DOS.  Don't use
 	redirection characters in REM lines.
 
-2007-01-27  Jan Dj,Ad(Brv  <jhd@winter.localdomain>
+2007-01-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* FOR-RELEASE: Removed Gtk/Xft issue.
 
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 9d67f20240a..6ddf0bb54dd 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -48,19 +48,23 @@ that branch.  Do not make manual changes to this file on the trunk.
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
 
 ** davby@ida.liu.se, 6 July: Bug in pos-visible-in-window-p
-
 ** dak@gnu.org, 30 May: Redraw problem with overlapping frames
 
-** dksw@eircom.net, 3 Jul: Telnet mode (rsh/ssh)
-
 ** bojohan+news@dd.chalmers.se, 1 Aug: n_schumacher@web.de: modification hooks called only once in
 
-** sdl.web@gmail.com: problem with transparent PNG image display
+** ams@gnu.org, 9 July: eshell and external commands
+
+** timh@insightful.com, 25 June: undigestify-rmail-message in emacs 22.1 doesn't split a digest
+
+** andreas.roehler@online.de, 24 Jul: CVS build on Suse 10.0 failed
+
+** Gtk+ tool bar looses focus when pressing next tool bar button in GUD.
+http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-08/msg00008.html
 
 * FIXES FOR EMACS 22.2
 
-Here we list small fixes that arrived too late for Emacs 22.1, but
-that should be installed on the release branch after 22.1 is released.
+Here we list small fixes that arrived too late for Emacs 22.2, but
+that should be installed on the release branch after 22.2 is released.
 
 ** Changes to six pbm icons in etc/images.
 Sync change from trunk 2007-05-19.
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 92f2920ba6c..470c78fd41d 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -1,7 +1,7 @@
 		      Precompiled Distributions of
 			   Emacs for Windows
 
-			      Version 22.1
+			      Version 22.2
 
 			     May 22, 2007
 		
@@ -26,9 +26,9 @@
 
   If you want to redistribute any of the precompiled distributions of
   Emacs, be careful to check the implications of the GPL.  For instance,
-  if you put the emacs-22.1-bin-i386.tar.gz file from this directory on
+  if you put the emacs-22.2-bin-i386.tar.gz file from this directory on
   an Internet site, you must arrange to distribute the source files of
-  the SAME version (i.e. ../emacs-22.1.tar.gz).
+  the SAME version (i.e. ../emacs-22.2.tar.gz).
 
   Making a link to our copy of the source is NOT sufficient, since we
   might upgrade to a new version while you are still distributing the
@@ -37,8 +37,8 @@
 
 * Files in this directory
 
-  + emacs-22.1-bin-i386.zip
-    Windows binaries of Emacs-22.1, with all lisp code and documentation
+  + emacs-22.2-bin-i386.zip
+    Windows binaries of Emacs-22.2, with all lisp code and documentation
     included.
 
     Download this file if you want a single installation package, and
@@ -49,8 +49,8 @@
     If you need the C source code at a later date, it will be safe to
     unpack the source distribution on top of this installation.
 
-  + emacs-22.1-barebin-i386.zip
-    Windows binaries of Emacs-22.1, without lisp code or documentation.
+  + emacs-22.2-barebin-i386.zip
+    Windows binaries of Emacs-22.2, without lisp code or documentation.
 
     Download this file if you already have the source distribution, or
     if you need to redump the emacs.exe executable.
@@ -60,12 +60,22 @@
     file, plus temacs.exe and dump.bat, which are required if you want to
     redump emacs without recompiling it.
 
+  + libxpm-src.zip
+    Source code for libXpm-X11R7.2-3.5.6 modified to compile on Windows.
+    This corresponds to the libXpm.dll in emacs-22.2-bin-i386.zip
+    and emacs-22.2-barebin-i386.zip.
+
+
+    The following are provided for users who require older versions.
+
+  + emacs-22.1-bin-i386.zip
+  + emacs-22-1-barebin-i386.zip
+    Windows binaries of Emacs 22.1, contents as above.
+
   + emacs-21.3-bin-i386.tar.gz
     Windows binaries of Emacs 21.3, with compiled lisp code and some
     documentation included.
 
-    This is provided for users who require the older version.
-
   + emacs-21.3-leim.tar.gz
     Compiled lisp input methods. This optional addition to Emacs-21.3
     is required if you want to enter languages that are not directly
@@ -73,7 +83,7 @@
 
 * Image support
 
-  Emacs 22.1 contains support for images, however for most image formats
+  Emacs 22.2 contains support for images, however for most image formats
   supporting libraries are required.  This distribution has been tested
   with the libraries that are distributed with GTK for Windows, and the
   libraries found at http://gnuwin32.sourceforge.net/. The following image
@@ -82,10 +92,10 @@
       PBM/PGM/PPM: Supported natively by Emacs. This format is used for
       the black and white versions of the toolbar icons.
 
-      XPM: requires a Windows port of the XPM library 3.4 or later,
-      which will be named xpm4.dll, libxpm-nox4.dll or
-      libxpm.dll. This format is used for the color versions of the
-      toolbar icons, and other images in Emacs.
+      XPM: a Windows port of the XPM library corresponding to the x.org
+      release of X11R7.2 is included with the binary distribution, but
+      can be replaced by other versions with the name xpm4.dll,
+      libxpm-nox4.dll or libxpm.dll.
 
       PNG: requires the PNG reference library 1.2 or later, which will
       be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll
@@ -222,7 +232,7 @@
   about the Windows port and related software packages. Note that as
   of writing, most of the information in that FAQ was for Emacs-21.3
   and earlier versions, so some information may not be relevant to
-  Emacs-22.1.
+  Emacs-22.2.
 
   In addition to the FAQ, there is a mailing list for discussing issues
   related to the Windows port of Emacs.  For information about the
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index 87e151dd06a..5afef00e9b3 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -35,8 +35,8 @@ copy %3\README.W32 emacs-%1\README.W32
 rem Info-ZIP zip seems to be broken on Windows.

 rem It always writes to zip.zip and treats the zipfile argument as one

 rem of the files to go in it.

-rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim -x emacs.mdp *.pdb *.opt *~ CVS

-7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim emacs-%1/site-lisp

+rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim -x emacs.mdp *.pdb *.opt *~ CVS

+7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim emacs-%1/site-lisp

 del emacs-%1\README.W32

 if not (%4) == () goto end