Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 751-770)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change.
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (patch 18-25)
 * gnus--rel--5.10  (patch 222-223)

   - Update from CVS

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

3 files changed, 21 insertions, 116 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index d6584f61a9e..e64da81cc01 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -40,25 +40,24 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
 * BUGS
 
-See the copy of this file on the EMACS_22_BASE branch.
-
-** rcyeske@gmail.com, April 22: Failure to build on OpenBSD macppc.
-OpenBSD compilation works on i386.
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00932.html
-
-** Spurious redisplay bug not fixed.
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00443.html
-http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00732.html
+NB the definitive copy of this file for Emacs 22 is on the
+EMACS_22_BASE branch.  Any entries below are automatically copied from
+that branch.  Do not make manual changes to this file on the trunk.
 
 ** michael.ewe@arcor.de, Apr 24: 22.0.98  not starting on Solaris 10/I386
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
 
-** Takaaki.Ota@am.sony.com, May 2: table cell menu does not appear at the menubar
-   Bug is intermittent.
+* 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.
+
+** Changes to six pbm icons in etc/images.
+Sync change from trunk 2007-05-19.
 
-** Install vc-hooks.el patch from trunk.
+** viper and tramp should not load cl at run time.
 
-** Move some items from magic-mode-alist to file-start-mode-alist.
+** yamaoka@jpl.org's patch for mail-extract-address-components problem.
 
 * DOCUMENTATION
 
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 15cbd8fa59f..15cc7db9d90 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -113,6 +113,11 @@
 
     % unzip some.zip
 
+  The precompiled binaries can be unpacked using unzip.exe from info-zip.org
+  if you do not already have other tools to do this.
+
+    % unzip some.zip
+
   Once you have unpacked a precompiled distribution of Emacs, it should
   have the following subdirectories:
 
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index 435462df6bd..b160da93c4f 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -25,135 +25,36 @@ rem along with GNU Emacs; see the file COPYING.  If not, write to the
 rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

 rem Boston, MA 02110-1301, USA.

 

+set ZIP=zip

 

-rem Beware broken ports of tar. Recent cygwin versions work well, older

-rem cygwin versions and the current MSys port have problems with DOS

-rem line ends when reading file names from a file. Other ports have their

-rem own problems too.

-set TAR=tar

-

-rem Make a copy of current Emacs source

 if (%3) == () goto usage

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

-if not (%4) == (src) goto :lisp

-

-:src

-

-echo Create full source distribution, excluding leim

-%TAR%  --exclude leim --exclude _marker --exclude DOC --exclude DOC-X --exclude TAGS --exclude bin --exclude obj --exclude obj-spd --exclude oo --exclude oo-spd --exclude *~ --exclude *.rej -cvf - emacs-%1 | gzip -9 > %2-src.tar.gz

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

-

-:lisp

-echo Create limited elisp source distribution

-%TAR% --exclude *.rej --exclude *.elc --exclude *~ -cvf - emacs-%1/lisp | gzip -9 > %2-lisp.tar.gz

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

 

 :bin

 

-set eld=emacs-%1/lisp

-

-rem List of Lisp files that are not compiled and that should be

-rem included in the bin distribution.

-

-rem It would be better to generate this list automatically.  It is the

-rem list of all .el files for which there is no corresponding .elc

-rem file, minus ldefs-boot.el.  --lute

-

-set elfiles=%eld%/cus-load.el %eld%/emacs-lisp/cl-specs.el %eld%/eshell/esh-groups.el %eld%/eshell/esh-maint.el %eld%/finder-inf.el %eld%/forms-d2.el %eld%/forms-pass.el %eld%/international/latin-1.el %eld%/international/latin-2.el %eld%/international/latin-3.el %eld%/international/latin-4.el %eld%/international/latin-5.el %eld%/international/latin-8.el %eld%/international/latin-9.el %eld%/international/mule-conf.el %eld%/language/czech.el %eld%/language/devanagari.el %eld%/language/english.el %eld%/language/georgian.el %eld%/language/greek.el %eld%/language/hebrew.el %eld%/language/japanese.el %eld%/language/kannada.el %eld%/language/korean.el %eld%/language/lao.el %eld%/language/malayalam.el %eld%/language/misc-lang.el %eld%/language/romanian.el %eld%/language/slovak.el %eld%/language/tamil.el %eld%/language/thai.el %eld%/language/utf-8-lang.el %eld%/loaddefs.el %eld%/loadup.el %eld%/mail/blessmail.el %eld%/mh-e/mh-acros.el %eld%/mh-e/mh-gnus.el %eld%/mh-e/mh-loaddefs.el %eld%/obsolete/keyswap.el %eld%/patcomp.el %eld%/paths.el %eld%/play/bruce.el %eld%/subdirs.el %eld%/term/AT386.el %eld%/term/apollo.el %eld%/term/bobcat.el %eld%/term/internal.el %eld%/term/iris-ansi.el %eld%/term/linux.el %eld%/term/lk201.el %eld%/term/news.el %eld%/term/vt102.el %eld%/term/vt125.el %eld%/term/vt200.el %eld%/term/vt201.el %eld%/term/vt220.el %eld%/term/vt240.el %eld%/term/vt300.el %eld%/term/vt320.el %eld%/term/vt400.el %eld%/term/vt420.el %eld%/term/wyse50.el %eld%/version.el

-

-set fns_el=

-for %%f in (emacs-%1/bin/fns*) do set fns_el=%fns_el% emacs-%1/bin/%%f

-

-echo Create bin distribution

-copy %3\README.W32 emacs-%1\README.W32

-

-del #files# #elfiles#

-for %%f in (emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32) do echo %%f>>#files#

-for %%f in (emacs-%1/bin/fns*) do echo emacs-%1/bin/%%f>>#elfiles#

-for %%f in (emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp) do echo %%f>>#files#

-for %%f in (emacs-%1/lock emacs-%1/site-lisp) do echo %%f>>#files#

-for %%f in (%elfiles% emacs-%1/site-lisp/subdirs.el) do echo %%f>>#elfiles#

-

-%TAR% --exclude temacs.exe --exclude emacs.mdp --exclude *.pdb --exclude *.opt --exclude "*.el" --exclude "*~" -T #files# -cvf %2-bin-i386.tar

-%TAR% -T #elfiles# -rvf %2-bin-i386.tar

-gzip -9 %2-bin-i386.tar

-del emacs-%1\README.W32

-rem del #files# #elfiles#

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

-

-:fullbin

-

 echo Create full bin distribution

 copy %3\README.W32 emacs-%1\README.W32

 

-%TAR% --exclude temacs.exe --exclude emacs.mdp --exclude *.pdb --exclude *.opt --exclude *~ -cvf - emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/lock emacs-%1/site-lisp | gzip -9 > %2-fullbin-i386.tar.gz

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

 del emacs-%1\README.W32

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

 

-:leim

-

-echo Create archive with precompiled leim files

-%TAR% -cvf - emacs-%1/leim/leim-list.el emacs-%1/leim/quail emacs-%1/leim/ja-dic | gzip -9 > %2-leim.tar.gz

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

-

-:undumped

-

-echo Create archive with extra files needed for redumping emacs

-copy %3\README-UNDUMP.W32 emacs-%1\README-UNDUMP.W32

-copy %3\dump.bat emacs-%1\bin

-if exist emacs-%1\src\obj-spd\i386\temacs.exe copy emacs-%1\src\obj-spd\i386\temacs.exe emacs-%1\bin

-if exist emacs-%1\src\oo-spd\i386\temacs.exe copy emacs-%1\src\oo-spd\i386\temacs.exe emacs-%1\bin

-%TAR% -cvf - emacs-%1/README-UNDUMP.W32 emacs-%1/bin/dump.bat emacs-%1/bin/temacs.exe | gzip -9 > %2-undumped-i386.tar.gz

-del emacs-%1\bin\temacs.exe

-del emacs-%1\bin\dump.bat

-del emacs-%1\README-UNDUMP.W32

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

-

 :barebin

 

 echo Create archive with just the basic binaries and generated files

 echo (the user needs to unpack the full source distribution for

 echo  everything else)

 copy %3\README.W32 emacs-%1\README.W32

-%TAR% -cvf - emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X | gzip -9 > %2-barebin-i386.tar.gz

+%ZIP% -9 emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X %2-barebin-i386.zip

 del emacs-%1\README.W32

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

 

 goto end

 

-rem Only do this if explicitly requested

-:zipfiles

-

-echo Create zip files for bin and lisp archives

-mkdir distrib

-cd distrib

-gunzip -c ..\%2-bin-i386.tar.gz | %TAR% xf -

-rem Need to split emacs.exe into fragments because it is too big now

-rem to fit on a floppy even by itself.

-copy %3\stitch.bat %2\bin

-cd %2\bin

-split -b 1000000 emacs.exe emacs

-del emacs.exe

-cd ..\..

-zip -rp9 em%5bin %2

-rm -rf %2

-zipsplit -n 1400000 -b .. em%5bin.zip

-del em%5bin.zip

-gunzip -c ..\%2-lisp.tar.gz | %TAR% xf -

-zip -rp9 em%5lis %2

-rm -rf %2

-zipsplit -n 1400000 -b .. em%5lis.zip

-del em%5lis.zip

-cd ..

-

-goto end

-

 :usage

 echo Generate source and binary distributions of emacs.

-echo Usage: %0 emacs-version dist-basename distfiles [lisp,bin,undumped,barebin]

+echo Usage: %0 emacs-version dist-basename distfiles [bin,barebin]

 echo   (e.g., %0 19.34 emacs-19.34.5 d:\andrewi\distfiles)

-echo Or: %0 emacs-version dist-basename distfiles "zipfiles" short-version

-echo   (e.g., %0 20.6 emacs-20.6 d:\andrewi\distfiles zipfiles 206)

 :end

 

 goto skipArchTag