Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 890-898)

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

 * emacs--rel--22  (patch 122-128)

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

 * gnus--rel--5.10  (patch 257-258)

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

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

3 files changed, 15 insertions, 11 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 10cec99a09b..e73eb21327c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * make-emacs: Doc fix.
+
 2007-08-28  Glenn Morris  <rgm@gnu.org>
 
         * admin.el: Provide self.
@@ -167,7 +171,7 @@
 2005-10-17  Bill Wohler  <wohler@newt.com>
 
         * FOR-RELEASE (DOCUMENTATION): Removed lisp/toolbar from list
-        since it's gone. Also marked mh-e as done.
+        since it's gone.  Also marked mh-e as done.
 
 2005-10-11  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -213,11 +217,11 @@
 
 2005-03-30  Marcelo Toledo  <marcelo@marcelotoledo.org>
 
-        * FOR-RELEASE (Documentation): Added check the Emacs Tutorial. The
-        first line of every tutorial must begin with a sentence saying
-        "Emacs Tutorial" in the respective language.  This should be
-        followed by "See end for copying conditions", likewise in the
-        respective language.
+        * FOR-RELEASE (Documentation): Added check the Emacs Tutorial.
+        The first line of every tutorial must begin with a sentence saying
+        "Emacs Tutorial" in the respective language.  This should be
+        followed by "See end for copying conditions", likewise in the
+        respective language.
 
 2005-03-29  Luc Teirlinck  <teirllm@auburn.edu>
 
diff --git a/admin/make-emacs b/admin/make-emacs
index 23b4e1c6374..94bf2092a8b 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -68,7 +68,7 @@ Build Emacs.
  --help                 show this help
  --all                  make clean versionclean first
  --boot                 make boostrap, log to boot.log
- --enable-checking      ENABLE_CHECKING=1 (implies Lisp union type)
+ --enable-checking      ENABLE_CHECKING=1
  --no-warn              disable warnings
  --check-marked         GC_CHECK_MARKED_OBJECTS=1
  --optim                no debug defines
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index 5afef00e9b3..db9446db36e 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/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

+rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/COPYING 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/COPYING 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

 

@@ -49,8 +49,8 @@ copy %3\dump.bat emacs-%1\bin\dump.bat
 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-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X

-7z a -tZIP -mx=9 %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X

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

+7z a -tZIP -mx=9 %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X emacs-%1/COPYING

 del emacs-%1\README.W32

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