Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-619
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-620
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-621
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-622
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-623
   Remove RCS keywords

 * emacs@sv.gnu.org/emacs--devo--0--patch-624
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-625
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-626
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-627
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-628
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-629
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-630
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-631
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-632
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-633
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-634
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-635
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-636
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-637
   Remove RCS keywords

 * emacs@sv.gnu.org/emacs--devo--0--patch-638
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-639
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-640
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-641
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-642
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-643
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-644
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-645
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-646
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-647
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-648
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-649
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-197
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-198
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-199
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-200
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-201
   Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-202
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-596

1 files changed, 335 insertions, 67 deletions

diff --git a/admin/notes/copyright b/admin/notes/copyright
index 0c2340fc54f..227a39a7f11 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:
@@ -9,6 +13,21 @@ A "license notice" is a statement of permissions, and is usually much
 longer, eg the text "GNU Emacs is free software...".
 
 
+Summary for the impatient:
+
+1. Don't add a file to Emacs written by someone other than yourself
+without thinking about the legal aspect (make sure they have an
+assignment, adjust the copyright statements in the file). NB the
+ChangeLog entry should be in the name of the author of the code, not
+the person who installs it.
+
+2. With images, add the legal info to a README file in the directory
+containing the image.
+
+3. If you add a lot of text to a previously trivial file that had no
+legal notices, consider if you should add a copyright statement.
+
+
 Every non-trivial file distributed through the Emacs CVS should be
 self-explanatory in terms of copyright and license. This includes
 files that are not distributed in Emacs releases (for example, the
@@ -21,6 +40,15 @@ 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.
 
+Legal advice says that we could, if we wished, put a license notice
+even in trivial files, because copyright law in general looks at the
+overall work as a whole. It is not _necessary_ to do so, and rms
+prefers that we do not. This means one needs to take care that trivial
+files do not grow and become non-trivial without having a license
+added. NB consequently, if you add a lot of text to a small file,
+consider whether your changes have made the file worthy of a copyright
+notice, and if so, please add one.
+
 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,21 @@ 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. Some older text files in etc/
+should, however, keep their current licenses (see below for list).
+
+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.). It is recommended to use the word "convert" to
+describe the automatic process of changing an image from one format to
+another (http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00618.html).
 
-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.
 
 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,24 +102,61 @@ 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.
 
+src/m/news-r6.h
+  public domain, leave alone.
+
 etc/edt-user.doc
   - update BOTH notices in this file
 
-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,
-[SW.tit, TONEPY.tit,] ZOZY.tit
+etc/emacs.csh
+  - keep simple license for this simple file
+
+etc/letter.pbm,letter.xpm
+  - trivial, no notice needed.
+<http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00324.html>
+
+etc/FTP, ORDERS
+  - trivial (at time of writing), no license needed
+
+etc/GNU, INTERVIEW, LINUX-GNU, MOTIVATION, SERVICE, THE-GNU-PROJECT,
+WHY-FREE
+  rms: "These are statements of opinion or testimony. Their licenses
+  should permit verbatim copying only. Please don't change the
+  licenses that they have. They are distributed with Emacs but they
+  are not part of Emacs."
+
+etc/MAILINGLISTS
+  rms: simple license is fine for this file
+
+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,
+SW.tit, TONEPY.tit, ZOZY.tit
   - leave the copyrights alone.
 
 leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns,
-[pinyin.map, ziranma.cin]
+pinyin.map, ziranma.cin
   - leave the copyright alone.
 
 leim/SKK-DIC/SKK-JISYO.L
@@ -97,6 +170,13 @@ lib-src/etags.c
 lib-src/getopt1.c, getopt_int.h
   - these are from the GNU C library. Leave the copyrights alone.
 
+lisp/play/tetris.el
+  - no special rules about the copyright. We note here that we believe
+  (2007/1) there is no problem with our use of the name "tetris" or
+  the concept.
+  rms: "My understanding is that game rules as such are not copyrightable."
+  <http://lists.gnu.org/archive/html/emacs-devel/2007-01/msg00960.html>
+
 lispref/doclicense.texi
 man/doclicense.texi
   - leave the copyright alone in this imported file.
@@ -104,102 +184,290 @@ man/doclicense.texi
 lisp/net/tramp.el
   - there are also copyrights in the body of the file. Update these too.
 
+lwlib/
+rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider
+it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib."
+
 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.
+  - contains numerous copyrights from the GNU C library. Leave them alone.
 
+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.
 
-*** These are copyright issues still to be addressed:
+[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.
+
+
+** Some notes on resolved issues, for historical information only
+
+lisp/term/README
+  - had no copyright notice till Feb 2007. ChangeLog.3 suggests it was
+  written by Eric Raymond. When asked by rms on 14 Feb 2007 he said:
+
+    I don't remember writing it, but it reads like my prose and I believe
+    I wrote the feature(s) it's describing.  So I would have been the
+    likeliest person to write it.
 
+    Odds are that I did, but I'm not certain.
 
-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.
+  Accordingly, FSF copyright was added.
 
 
-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.
+** Issues that are "fixed" for the release of Emacs 22, but we may
+   wish to revisit later in more detail
 
 
 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."
+  File says it's in the public domain, but that might not make it so.
+
+
+etc/e/eterm-color.ti
+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).
+
+
+src/m/mips4.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, usg5-4-2.h
+  - all these (not obviously trivial) files were missing copyrights
+  till Feb 2007, when FSF copyright was added. Matt Norwood advised:
+
+    For now, I think the best policy is to assume that we do have
+    assignments from the authors (I recall many of these header files
+    as having been originally written by rms), and to attach an FSF
+    copyright with GPL notice. We can amend this if and when we
+    complete the code audit. Any additions to these files by
+    non-assigned authors are arguably "de minimis" contributions to
+    Emacs: small changes or suggestions to a work that are subsumed in
+    the main authors' copyright in the entire work.
+
+Here is my (rgm) take on the details of the above files:
+
+mips4.h
+  might be trivial? started trivial, been added to in tiny changes by
+  those with FSF assignment, often result of email suggestions by others.
+
+news-risc.h
+  started trivial. Grown by tiny additions, plus chunk
+  from mips.h, which was and is Copyright FSF
+
+pmax.h
+  started trivial. grown in tiny changes, except for maybe Jim Wilson's
+  comment.
 
-For the above files, mail sent froam rms to Matthew (Martin?) Norwood
-asking what to do (via Eben Moglen), 2007/1/22 ("Copyright years").
+? irix4-0.h
+  I would say started non-trivial (1992, rms). only tiny changes since
+  installed.
 
+? irix5-0.h
+  I would say started non-trivial (1993, jimb, heavily based
+  on irix4-0.h). A few borderline non-tiny changes since.
 
-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)
+? isc2-2.h
+ started trivial. 2 non-tiny change, in 1993. looks to
+ be made up of several small tweaks from various sources. maybe
+ non-tiny total changes from Karl Berry (no emacs assignment).
 
+osf1.h
+  started trivial. grown in tiny changes (one borderline tiny change
+  by fx in 2000, but most code was later removed). non-tiny addition
+  in 2002 from m/alpha.h, but that was and is copyright FSF.
 
-etc/orgcard.tex - no Rooke in copyright.list
- rms will talk with Org mode author about this.
+usg5-4-2.h
+ started non-trivial, but was heavily based on usg5-4.h, which was and is
+ copyright FSF. only tiny changes since installed.
 
+sol2-3.h
+ started trivial. only non-tiny change (1994) incorporated code from
+ usg5-4.h, which was and is copyright FSF.
 
-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.
+aix3-2.h, bsd386.h, hpux8.h, hpux9.h, netbsd.h, sunos4-0.h
+  started trivial, grown in tiny changes.
 
+netbsd.h:
+Roland McGrath said to rms (2007/02/17): "I don't really remember
+anything about it. If I put it in without other comment, then probably
+I wrote it myself."
 
-leim/CXTERM-DIC/CCDOSPY.tit, PY-b5.tit, SW.tit, TONEPY.tit
-leim/MISC-DIC/pinyin.map, ziranma.cin
- The copyright and license is stated in the README file, but we may as
- well copy them into the files themselves (possibly at the expense of
- making them incompatible with their original formats, but they will
- still be usable by Emacs). [Kenichi Handa]
 
+Someone might want to tweak the copyright years (for dates before
+2001) that I used in all these files.
 
-lib-src/etags.c - no 'k.* arnold' in copyright.list'
- rms: "That is ok, in principle. I used free code released by Ken
- Arnold as the starting point. However, it may be that we need to get
- and insert whatever his license was for his code."
+Note: erring on the side of caution, I also added notices to some
+files I thought might be considered non-trivial (if one includes
+comment) in s/:
+  aix4-1.h hiuxmpp.h hiuxwe2.h hpux10.h irix6-0.h irix6-5.h isc3-0.h
+  ptx4.h sol2.h sunos4-0.h
 
+(everything with > 30 non-blank lines, which at least is _some_ kind of
+system)
 
-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.
 
+*** 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):
 
-lwlib/lwlib-int.h, lwlib.h - no copyright
-lwlib/Makefile.in, lwlib-utils.c, lwlib.c - copyright Lucid
-lwlib/lwlib-Xaw.c - copyright Chuck Thompson
-lwlib/lwlib.c - copyright Lucid, but FSF copyright was added in 2002 -
-   was that correct?
-  rms: "I asked Matthew Norwood about these, I believe."
 
+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. (This CVS issue obviously does
+not affect a release).
+  rms: will ask lawyer
 
-man/back.texi, trampver.texi
-  - add standard notices to any decided to be non-trivial.
 
+Make sure that all files with non-standard copyrights or licenses are
+noted in this file.
 
-msdos/
-  - do we need to add COPYING.LIB (because COPYING.DJ refers to it)?
 
+etc/BABYL
+  File says it was written in 1983 by Eugene Ciccarelli, who has no
+  assignment. RMS: "The lawyer said we can keep BABYL."
 
+
+REMOVED etc/gnu.xpm, nt/icons/emacs21.ico, nt/icons/sink.ico
+  - Restore if find legal info. emacs21.ico is not due to Davenport.
+  Voelker could not immediately recall anything, but will check and
+  let us know if he finds anything.
+
+
+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.
+
+
+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:
+
+NB apart from switching the TUTORIALs to GPL, I think there is nothing
+here that anyone can work on without further input from rms.
+
+
+Maybe some relevant comments here?
+<http://groups.google.com/group/linux.debian.legal/browse_thread/thread/123547ea95437a1f>
+
+
+etc/gnus-logo.eps, gnus-booklet.ps, gnus-refcard.ps
+ just to be safe, papers are on the way for the "Gnus logo", even
+ though it is very similar to the already-assigned "Emacs logo".
+
+
+etc/ms-kermit - no copyright, but ms-7bkermit has one
+
+
+etc/TUTORIAL* (translations)
+  switch to GPL (see english TUTORIAL)
+  rms: "We can leave the TUTORIAL translations alone until their
+  maintainers update them."
+  Can adapt short license text from end of GPL translations at:
+  http://www.gnu.org/licenses/translations.html
+  Only a few sentences around the license notice need changing from
+  previous version.
+Done: TUTORIAL.eo
+
+[waiting for legal advice]
+lib-src/etags.c
+ - was it ok to use Ken Arnold's code as a basis?
+   1984 version of ctags, with no copyright, posted to net.sources:
+   http://groups.google.com/group/net.sources/msg/a21b6c21be12a98d)
+   version of etags.c in emacs-16.56 seems to be derived from this
+   (duplicate typos in comments).
+
+
+[waiting for legal advice on lwlib/*]
+lwlib/lwlib-Xaw.c
+  copyright Chuck Thompson; but under GPL, so OK?
+
+lwlib/lwlib-Xlw.c, lwlib-Xm.c, lwlib-Xm.h, xlwmenu.c
+  copyright lucid and FSF, but under GPL, so OK?
+  FSF copyrights were added in 200x, was that right?
+
+lwlib/lwlib-int.h, lwlib.h, lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h
+  no copyright. last three trivial?
+  suspect these must have been part of the "Lucid Widget Library",
+  which is under GPL. Can't find an original version of this to check.
+
+lwlib/Makefile.in
+ "some parts" copyright Lucid, no license
+
+lwlib/lwlib-utils.c, lwlib.c
+  copyright Lucid, Inc; but under GPL, so OK?
+
+lwlib/xlwmenu.h, xlwmenuP.h
+  part of 'Lucid Widget Library', but only FSF copyright (when files
+  were first checked into RCS, there were no copyrights). Was it right
+  to add FSF copyright?
+  should we add a 1992 Lucid copyright?
+
+lwlib/*
+  should we:
+  1) ensure all files that were originally in the "Lucid Widget
+  Library" have 1992 Lucid copyright?
+  2) add or remove FSF copyrights to any files we have made non-trivial
+  changes to since 1992?
+
+
+[waiting for legal advice]
 oldXMenu/
  - should there be any FSF copyrights at all in here? Some were added
    in 2005, without licence notices. Was this right?
+   Eg don't think copyright.h should have FSF copyright!
+   Should add copyright details for X11R1 to the README file. (see
+   copyright.h). I suggest we remove copyright.h and add the notices
+   directly into the files.
+
+
+The general issue is, as with some of the Lucid code in lwlib, suppose
+file foo.c is Copyright (C) 2000 John Smith, and released under the
+GPL. We check it into Emacs CVS and make non-trivial changes to it.
+Should we add a FSF copyright or not? Can we add such a notice as soon
+as we check it check it in to CVS?
+
+
+[waiting for legal advice]
 oldXMenu/Makefile.in, Makefile, Imakefile, descrip.mms, insque.c
   - issues described in mail to rms, 2006/12/17.
 rms: "I have asked for lawyer's advice about these."
 
+
+This file is part of GNU Emacs.
 
-src/acldef.h, chpdef.h, gnu.h, ndir.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."
+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.