Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 662-669)

   - Update from CVS
   - Fix read-only prompt problem in isearch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 207-208)

   - Merge from emacs--devo--0
   - Update from CVS

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

2 files changed, 65 insertions, 28 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 835fef666b6..39f14872dd0 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -40,7 +40,8 @@ Reminders sent out on 2006-06-08.
 and KDE projects, to use the new Emacs icons in etc/images/icons.
 
 * WINDOWS SUPPORT BUGS.
-These don't need to be fixed to start pretest, but we call the
+
+These don't need to be fixed before a release, but we call the
 attention of Windows users to fixing them.
 
 ** Drew Adams 12 Aug bug rpt: overlay  display artifact: trace left behind
@@ -50,9 +51,7 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin.
   (Did we decide that is unreproducible?)
 
-** make-network-process :nowait t doesn't work for non-local targets
-   on Windows.  This has been "fixed" for Emacs 22 by defining
-   BROKEN_NON_BLOCKING_CONNECT in ms-w32.h.
+** lennart.borgman@gmail.com, Feb 22: C-h k does not catch text properies keymaps
 
 
 * BUGS
@@ -60,12 +59,7 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 ** Fix up copyright confusions.
   See end of admin/notes/copyright.
 
-** simon.marshall@misys.com, Jan 12:
-  Font-lock decides function call is function declaration in C++
-
-** md5i@cs.cmu.edu, Feb 20: move-end-of-line in comint buffers
-
-** daniel@bigwalter.net, Feb 25: Echoing of keys and process I/O
+** david.hansen@gmx.net, Mar 7: shell.el patch to install
 
 * DOCUMENTATION
 
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 036efa6f006..63947d75df0 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -15,19 +15,26 @@ 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
+1. Don't add code to Emacs written by someone other than yourself
+without thinking about the legal aspect. Even if the changes are
+trivial, consider if they combine with previous changes by the same
+author to make a non-trivial total. If so, make sure they have an
+assignment. If adding a whole file adjust the copyright statements in
+the file.
+
+2. When installing code written by someone else, the ChangeLog entry
+should be in the name of the author of the code, not the person who
+installs it. I think it is helpful to put the author (if not yourself)
+in the CVS log as well; and to not install any of your own changes in
+the same commit.
+
+3. 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
+4. 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.
 
-4. Please don't just add an FSF copyright without checking that is the
+5. Please don't just add an FSF copyright without checking that is the
 right thing to do.
 
 
@@ -133,11 +140,15 @@ lispintro/install-sh
 src/m/news-r6.h
   public domain, leave alone.
 
+etc/BABYL, ms-kermit
+  no notices (see below).
+
 etc/edt-user.doc
   - update BOTH notices in this file
 
 etc/emacs.csh
-  - keep simple license for this simple file
+ - written by Michael DeCorte, who has no assignment. But trivial
+ enough to not need license.
 
 etc/future-bug
  - doesn't need a humourless disclaimer, because Karl Fogel says we
@@ -159,6 +170,12 @@ WHY-FREE
   licenses that they have. They are distributed with Emacs but they
   are not part of Emacs."
 
+etc/HELLO
+  standard notices. Just a note that although the file itself is not
+  really copyrightable, in the wider context of it being part of
+  Emacs (and written by those with assignments), a standard notice is
+  fine.
+
 etc/MAILINGLISTS
   rms: simple license is fine for this file
 
@@ -361,6 +378,20 @@ src/acldef.h, chpdef.h, ndir.h
 
 ** Some notes on resolved issues, for historical information only
 
+etc/TERMS
+rms: "surely written either by me or by ESR. (If you can figure out
+which year, I can probably tell you which.) Either way, we have papers
+for it." Present in Emacs-16.56 (15-jul-85).
+
+etc/ulimit.hack
+  Very obsolete file removed March 2007. Doesn't say who the author
+is, but web-search suggests Karl Kleinpaste, who has no Emacs
+assignment. Trivial anyway.
+http://groups.google.com/group/comp.unix.shell/browse_thread/thread/bf3df496994\
+9f1df/7e5922c67b3a98fb
+http://groups.google.com/group/comp.unix.questions/msg/cc7e49cacfd1ccb4
+    (original 1987 source)
+
 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:
@@ -381,11 +412,16 @@ lisp/term/README
 admin/check-doc-strings
   File says it's in the public domain, but that might not make it so.
 
+etc/BABYL
+  File written long ago by authors with no assignment. Keep them
+  without notices for now, try and contact authors if possible. Be
+  ready to remove these files if the authors ever object.
 
+etc/ms-kermit
 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:
+  to these files in Feb/Mar 2007:
 
     The code here is forced by the interface, and is not subject to
     copyright, constituting the only possible expression of the
@@ -396,6 +432,19 @@ src/acldef.h, chpdef.h, ndir.h
   and possibly add a list of all authors who have changed these files.
   (details in email from Matt Norwood to rms, 2007/02/03).
 
+etc/ms-7bkermit
+  Says it was written by Andy Lowry and Joel Spolsky. No entry for
+either in copyright.list. NB this file is not "constrained" like
+ms-kermit (rms: "We know it isn't. A comment at the front says it has
+other bindings which might be handy."). File removed March 2007.
+Re-add if clear up status at some point.
+
+etc/Xkeymap.txt
+  No info on author. File removed March 2007. rms: "It says it is
+RLK's way of remapping his keyboard, so it is not constrained. I think
+it was written by RLK. Let's delete it; if we contact RLK again, we
+can put it back."
+
 
 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,
@@ -493,11 +542,6 @@ Make sure that all files with non-standard copyrights or licenses are
 noted in this file.
 
 
-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
@@ -528,8 +572,7 @@ REMOVED src/unexhp9k800.c
 
 *** These are copyright issues still to be addressed:
 
-
-etc/ms-kermit - no copyright, but ms-7bkermit has one
+Do we need an assignment from Kevin Rodgers? (rms)