Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 624-636)

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

 * gnus--rel--5.10  (patch 200-201)

   - Merge from emacs--devo--0
   - Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.

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

7 files changed, 396 insertions, 224 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index f675cdbb4e5..3de9ca32484 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,4 +1,9 @@
-2007-01-27  Jan Dj,AC$(Brv  <jhd@winter.localdomain>
+2007-02-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * 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>
 
         * FOR-RELEASE: Removed Gtk/Xft issue.
 
@@ -80,9 +85,9 @@
         * FOR-RELEASE: MH-E 8.0 has been released, so removed reminder
         about it.
 
-2006-04-17 Ramprasad B <ramprasad_i82@yahoo.com>
+2006-04-17  Ramprasad B  <ramprasad_i82@yahoo.com>
 
-        * ./* (Copyright): Updated Copyright year(s)
+        * ./* (Copyright): Updated Copyright year(s).
 
 2006-02-24  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -409,9 +414,24 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-        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.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  This file is part of GNU Emacs.
+
+  GNU Emacs is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2, or (at your option)
+  any later version.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
 
 ;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 590d7ebf024..48d62341ff3 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -1,11 +1,7 @@
 Tasks needed before the next release.
 
-* UPDATE COPYRIGHTS (Happy New Year :-)
-  Done, I think. Please keep an eye out for any errors, eg copyrights
-  not at the start of the file that are easy to miss, as in
-  src/emacs.c.
-
-  See also the oustanding issues in admin/notes/copyright.
+* COPYRIGHTS
+  See the outstanding issues at the end of admin/notes/copyright.
 
 * TO BE DONE SHORTLY BEFORE RELEASE
 
@@ -16,6 +12,8 @@ make sure all the pages really look ok in the manual as formatted.
 
 ** Update AUTHORS.
 
+** Cleanup temporary +++/--- lines in etc/NEWS.
+
 ** Regenerate the postscript files of the reference cards in etc.
 
 ** Ask maintainers of refcard translations to update them.
@@ -60,24 +58,12 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
 ** W3 status with latest url package.
 
-** Fix up the notices in oldXMenu properly.
-
-** disumu@x3y2z1.net, Nov 22:
-  URL not following some 302 redirects after recent changes
+** Fix up copyright confusions.
+  See admin/notes/copyright.
 
-** 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.
-
-** simon.marshall@misys.com, Jan 12: 
+** simon.marshall@misys.com, Jan 12:
   Font-lock decides function call is function declaration in C+ +
 
-** ZTHJWSQQAFHV@spammotel.com, Jan 12:
-  Color-theme problems in Emacs 22+ (Ubuntu, Windows)
-
 * DOCUMENTATION
 
 ** Check the Emacs Tutorial.
diff --git a/admin/README b/admin/README
index 2540ccc73c1..e7124a04a8c 100644
--- a/admin/README
+++ b/admin/README
@@ -1,3 +1,8 @@
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+
                          The admin directory
 
 This directory contains scripts and other things useful for developing
@@ -61,7 +66,23 @@ Show files added/removed between two tar files.
 Get CVS diffs of files.
 
 
-
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
 Local variables:
 mode: outline
diff --git a/admin/make-announcement b/admin/make-announcement
index 992808a514d..03a083e4c72 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -1,5 +1,29 @@
 #! /bin/bash
 
+## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+##   Free Software Foundation, Inc.
+
+## Author: Francesco Potorti` <pot@gnu.org>
+
+## This file is part of GNU Emacs.
+
+## GNU Emacs is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+
+## GNU Emacs is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with GNU Emacs; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301, USA.
+
+### Code:
+
 if [ $# -ne 2 ]; then
     echo "usage: $0 <old version number> <new version number>" >&2
     exit 1
diff --git a/admin/make-changelog-diff b/admin/make-changelog-diff
index 7d98d22ddf9..5ab468c8f5d 100755
--- a/admin/make-changelog-diff
+++ b/admin/make-changelog-diff
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+## Author: Francesco Potorti` <pot@gnu.org>
+
 if [ $# -ne 2 ]; then
     echo "usage: $0 TAG1 TAG2" >&2
     exit 1
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 3f5dad37c73..a4813c050c7 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,3 +1,7 @@
+Copyright (C) 2007  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+
 NOTES ON COPYRIGHTS AND LICENSES
 
 Some terminology:
@@ -21,6 +25,30 @@ a file is auto-generated (eg ldefs-boot.el) from another one in the
 CVS, then it does not really matter about adding a copyright statement
 to the generated file.
 
+However, here is a quote from Matt Norwood (Software Freedom Law
+Center) that suggests we should revise the above policy about trivial
+files:
+
+    If FSF has a strong policy reason notices off of files it
+    considers "trivial", this will take a lot more bookkeeping; it
+    also runs the risk of these "trivial" files later growing into
+    non-trivial files, and being in the tree without any record of
+    authorship. All in all, I think it's a better policy to attach the
+    notice and let future authors decide if something is trivial when
+    they want to reuse it elsewhere.
+    [...]
+    In general, copyright law will step back and look at the overall "work"
+    consisting of all the assembled components working together as a system;
+    it will apply protection and permissions to this system, not to its
+    subcomponents. If parts of it are recombined into another system, it
+    will consider the protections and permissions for each of the source
+    components only in order to assess the overall status of the work again.
+    The assessment of whether a set of components is entitled to copyright
+    protection is the degree to which they display "creativity": not as
+    atomic units, but as parts of a system working in concert. Thus, several
+    "trivial" components working together in some coherent system might be
+    protectible.
+
 The years in the copyright notice should be updated every year (see
 file "years" in this directory). The PS versions of refcards etc
 should display copyright notices (an exception to the rule about
@@ -33,13 +61,17 @@ Copyright changes should be propagated to any associated repositories
 (eg Gnus, MH-E), but I think in every case this happens automatically
 (?).
 
-All README (and other such text files) that are non-trivial and were
-added by Emacs developers need copyright and copying permission
-statements (see eg INSTALL in the top-level directory).
+All README (and other such text files) that are non-trivial should
+contain copyright statements and GPL license notices, exactly as .el
+files do (see e.g. README in the top-level directory). (Before 2007,
+we used a simple, short statement permitting copying and modification
+provided legal notices were retained. In Feb 2007 we switched to the
+standard GPL text, on legal advice.)
 
-All images files that allow for comments should have copyright and
-license statements. Whether or not this is possible, the information
-should be recorded in a README file in each directory with images.
+For image files, the copyright and license details should be recorded
+in a README file in each directory with images. (Legal advice says
+that we need not add notices to each image file individually, if they
+allow for that.)
 
 When installing a file with an "unusual" license (after checking first
 it is ok), put a copy of the copyright and license in the file (if
@@ -66,10 +98,25 @@ author should be removed and the year(s) transferred to the FSF); or
 else it is possible the file should not be in Emacs at all (please
 report!).
 
+Note that it seems painfully clear that one cannot rely on CVS logs,
+or even ChangeLogs, for older changes. People often installed changes
+from others, without recording the true authorship.
+
 [For reference, most of these points were established via email with
 rms, 2007/1, "Copyright years".]
 
 
+lib-src/etags.c           # print_version
+lib-src/rcs2log           # Copyright
+lisp/calc/calc-help.el    # calc-full-help
+lisp/startup.el           # fancy-splash-tail
+mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
+mac/src/Emacs.r           # resource 'vers'
+src/emacs.c
+  - remember to change the latest copyright year in the --version output.
+  [Post-release, will automate this like set-version does for version.]
+
+
 <top-level>/install-sh
 lispintro/install-sh
  - this file is copyright MIT, which is OK. Leave the copyright alone.
@@ -77,10 +124,8 @@ lispintro/install-sh
 etc/edt-user.doc
   - update BOTH notices in this file
 
-[etc/orgcard.tex, orgcard.ps - files removed 2007/1/29]
-  - with no assignment from Rooke, these files were removed. We are
-  asking for an assignment, and if one is received the files will be
-  replaced.
+etc/letter.pbm.letter.xpm
+  - trivial, no notice needed.
 
 leim/CXTERM-DIC/4Corner.tit, ARRAY30.tit, CCDOSPY.tit, ECDICT.tit,
 ETZY.tit, PY-b5.tit, Punct-b5.tit, Punct.tit, QJ-b5.tit, QJ.tit,
@@ -118,66 +163,112 @@ lisp/net/tramp.el
 
 msdos/is_exec.c, sigaction.c
   - these files are copyright DJ Delorie. Leave the copyrights alone.
+  Leave the Eli Zaretskii copyright in is_exec.c alone. See the
+  msdos/README file for the legal history of these files.
 
 src/gmalloc.c
   - contains numerous copyrights from the GNU C library. Leave them alone.
 
-[src/unexhp9k800.c - removed 2007/1/27
+src/acldef.h, chpdef.h, ndir.h
+  - see comments below. These files are OK to be released with Emacs
+  22, but we may want to revisit them afterwards.
+
+[src/unexhp9k800.c - removed 2007/1/27]
 [src/m/sr2k.h - removed 2007/1/27]
   - First file removed due to legal uncertainties; second file removed
   due to dependency on first. Note that src/m/hp800.h is still needed on
   hp800 arch.
+  NB we would like to re-add this file if we can. Please let us know
+  if you can clarify its legal status.
 
 
-*** These are copyright issues still to be addressed:
+*** These are copyright issues that need not be fixed until after
+    Emacs 22 is released (though if they can be fixed before, that is
+    obviously good):
 
 
 Is it OK to just `cvs remove' a file for legal reasons, or is
 something more drastic needed? A removed file is still available from
-CVS, if suitable options are applied.
+CVS, if suitable options are applied. (This CVS issue obviously does
+not affect a release).
+  rms: will ask lawyer
 
 
-All README (and other such files) that are non-trivial and were added
-by Emacs developers need copyright statements and copying permissions
-to be added.
+REMOVED etc/orgcard.tex, orgcard.ps
+  Re-add these files if an assignment is received from Rooke.
 
+etc/images
+  Image files from GTK, Gnome are under GPLv2 (no "or later"?). RMS will
+  contact image authors in regards to future switch to v3.
+
+
+src/acldef.h, chpdef.h, ndir.h
+  On legal advice from Matt Norwood, the following comment was added
+  to these files in Feb 2007:
+
+    The code here is forced by the interface, and is not subject to
+    copyright, constituting the only possible expression of the
+    algorithm in this format.
+
+  With the addition of this notice, these files are OK for the
+  upcoming Emacs-22 release. Post-release, we can revisit this issue
+  and possibly add a list of all authors who have changed these files.
+  (details in email from Matt Norwood to rms, 2007/02/03).
+
+
+REMOVED src/unexhp9k800.c
+  - we would like to re-add this file if possible. Please let us know
+  if you can clarify its legal status.
+  http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00138.html
+
+
+
+*** These are copyright issues still to be addressed:
 
-All images files that allow for comments should have copyright and
-license statements added. Whether or not this is possible, the
-information should be recorded in a README file in each directory with
-images. Image files to consider (is there such a thing as a "trivial"
-image?):
- src/bitmaps/
- etc/*.xpm, *.xbm
- etc/images/
- etc/tree-widget/
- etc/*.ps, .eps
+
+Maybe some relevant comments here?
+<http://groups.google.com/group/linux.debian.legal/browse_thread/thread/123547ea95437a1f>
+
+
+All README (and other such files) that are non-trivial and were added
+by Emacs developers need copyright statements and copying permissions.
+  missed any?
+  etc/BABYL?
+  lisp/term/README?
+  borderline "trivial" cases (see below)...?
+These should use the standard GPL text (same as .el files), rather
+than the short notices we have been using till now.
+rms: "If a README file is under 60 lines long, using the long version
+might be ugly. Please tell me if you encounter one that is under 60
+lines."
+
+
+Clarify the legal status of image files. It's not necessary to put a
+notice in each image (where the format allows it). It's OK to put the
+information in a README file in the associated directory. Files can be
+listed in groups. See etc/README for an example.
+Image files to consider:
+ etc/images/mh-logo
+ etc/images/gnus/
+ etc/images/smilies/
+ nt/icons/
+rms: "Can you find this by searching for items in copyright.list that
+assign images for Emacs?" [this suggests we ask Bill Wohler]
 
 
 admin/check-doc-strings
   Author is Martin Buchholz, but no assignment from him on file, and
   rms has no way to reach him.
-admin/make-announcement - no copyright
-admin/nt/makedist.bat - no copyright
 etc/ms-kermit - no copyright, but ms-7bkermit has one
 etc/e/eterm-color.ti  - no copyright
   rms: "I think that is not copyrightable under the merger doctrine
   because the entries are all forced. At least that is the case in the
   US; I am not sure whether we can rely on that in general."
 
-For the above files, mail sent from rms to Matthew (Martin?) Norwood
+For the above files, mail sent from rms to Matthew Norwood
 asking what to do (via Eben Moglen), 2007/1/22 ("Copyright years").
 
 
-etc/gnus-refcard.tex
-  I (rgm) think the "Gnus Bugfixing Girls + Boys" copyright should
-  probably be removed, but it may be ok (waiting for rms)
-
-
-[etc/orgcard.tex, orgcard.ps]
-  Re-add these files if an assignment is received from Rooke.
-
-
 etc/sk-refcard.ps, pl-refcard.ps, cs-refcard.ps
 These refcards need to be regenerated (by those with suitable TeX
 setups) to get updated copyrights.
@@ -188,10 +279,8 @@ lib-src/etags.c - no 'k.* arnold' in copyright.list'
  Arnold as the starting point. However, it may be that we need to get
  and insert whatever his license was for his code."
 
-
-lispref/back.texi, elisp-covers.texi, lay-flat.texi,
-two-volume-cross-refs.txt, two.el
-  - add standard notices to any decided to be non-trivial.
+ - 1984 version of ctags, with no copyright, posted to net.sources:
+   http://groups.google.com/group/net.sources/msg/a21b6c21be12a98d
 
 
 lwlib/lwlib-int.h, lwlib.h - no copyright
@@ -202,23 +291,6 @@ lwlib/lwlib.c - copyright Lucid, but FSF copyright was added in 2002 -
   rms: "I asked Matthew Norwood about these, I believe."
 
 
-man/back.texi, trampver.texi
-  - add standard notices to any decided to be non-trivial.
-
-
-msdos/
-  - do we need to add COPYING.LIB (because COPYING.DJ refers to it)?
-  (but see below).
-
-
-msdos/is_exec.c
-  - does copying.dj replace eliz's copyright?
-
-
-msdos/is_exec.c, sigaction.c
-  - relicense under the GPL
-
-
 oldXMenu/
  - should there be any FSF copyrights at all in here? Some were added
    in 2005, without licence notices. Was this right?
@@ -227,9 +299,30 @@ oldXMenu/Makefile.in, Makefile, Imakefile, descrip.mms, insque.c
 rms: "I have asked for lawyer's advice about these."
 
 
-src/acldef.h, chpdef.h, gnu.h, ndir.h
+src/gnu.h
 src/m/mips4.h, news-r6.h, news-risc.h, pmax.h
 src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h,
 isc2-2.h, netbsd.h, osf1.h, sol2-3.h, sunos4-0.h, umips.h, usg5-4-2.h
   - all these (not obviously trivial) files are missing copyrights.
   rms: "I should talk about these with Matthew Norwood."
+The current legal advice seems to be that we should attach FSF
+copyright and GPL for the time being, then review post-release. But it
+is still under discussion.
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index db9d9026aec..435462df6bd 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -1,135 +1,161 @@
-@echo off
-
-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
-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
-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   (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
-   arch-tag: 6e2ddd92-c1c9-4992-b6b5-207aaab72f68
-:skipArchTag
+@echo off

+

+rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007

+rem   Free Software Foundation, Inc.

+rem

+rem Cannot use brackets in andrewi's email below because

+rem older Windows shells will treat that as redirection.

+rem

+rem Author: Andrew Innes andrewi@gnu.org

+rem

+rem This file is part of GNU Emacs.

+rem

+rem GNU Emacs is free software; you can redistribute it and/or modify

+rem it under the terms of the GNU General Public License as published by

+rem the Free Software Foundation; either version 2, or (at your option)

+rem any later version.

+rem

+rem GNU Emacs is distributed in the hope that it will be useful,

+rem but WITHOUT ANY WARRANTY; without even the implied warranty of

+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+rem GNU General Public License for more details.

+rem

+rem You should have received a copy of the GNU General Public License

+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.

+

+

+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

+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

+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   (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

+   arch-tag: 6e2ddd92-c1c9-4992-b6b5-207aaab72f68

+:skipArchTag