Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

13 files changed, 108 insertions, 23 deletions

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 176197e6308..5396754d142 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-28  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (distclean): Delete Makefile.
+	(maintainer-clean): Delete TAGS.
+
 2007-01-01  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xlwmenu.c (xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index af9c2a233e6..18fa3547cf5 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -1,6 +1,27 @@
-# This was taken from the output of Imake
+# Copyright (C) 1992, 1993 Lucid, Inc.
+# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+#   2007 Free Software Foundation, Inc.
+# 
+# This file is part of the Lucid Widget Library.
+# 
+# The Lucid Widget Library 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 1, or (at your option)
+# any later version.
+# 
+# The Lucid Widget Library 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.
+
+
+# This was taken from the output of Imake using Lucid's Imakefile.
 # and set up to be configured by ../configure.
-# Some parts Copyright (c) 1992, 1993 Lucid, Inc.
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -61,7 +82,9 @@ mostlyclean:
 
 clean: mostlyclean
 distclean: clean
+	$(RM) Makefile
 maintainer-clean: distclean
+	$(RM) TAGS
 
 TAGS:
 	../lib-src/etags $(srcdir)/*.[ch]
diff --git a/lwlib/README b/lwlib/README
index 427eea509e4..97fdeac3d4b 100644
--- a/lwlib/README
+++ b/lwlib/README
@@ -1,5 +1,9 @@
-This subdirectory contains the lwlib library which provides a uniform
-interface to a few different X toolkits.  The library was written by
-Lucid, and is not part of GNU Emacs.  This version has changes in the
-makefile to fit in with Emacs's configure script, and some source
-files have been renamed to fit in 14 characters.
+This subdirectory contains the Lucid Widget Library (lwlib), which
+provides a uniform interface to a few different X toolkits.  The
+library was written by Lucid, Inc and released under the terms of the
+GPL version 1 (or later).  It is not considered part of GNU Emacs.
+
+This version of the library differs from the original as described in
+the ChangeLog file.  For example, the file "lwlib-int.h" was renamed
+from "lwlib-internal.h" in order to fit in 14 characters, and the
+makefile adjusted to fit in with Emacs's configure script.
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 1369ed26f72..be1990ed6fe 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -1,5 +1,7 @@
 /* The lwlib interface to Athena widgets.
-   Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
+Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index f15bbdf7b39..2adb1d44ce2 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -7,7 +7,7 @@ This file is part of the Lucid Widget Library.
 
 The Lucid Widget Library 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)
+the Free Software Foundation; either version 1, or (at your option)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h
index 92112a1f946..3a827036f36 100644
--- a/lwlib/lwlib-Xm.h
+++ b/lwlib/lwlib-Xm.h
@@ -1,13 +1,11 @@
 /* The lwlib interface to Motif widgets.
-   Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
-   Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
 
 The Lucid Widget Library 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)
+the Free Software Foundation; either version 1, or (at your option)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h
index 3e9bee646cd..edb975ac6cb 100644
--- a/lwlib/lwlib-int.h
+++ b/lwlib/lwlib-int.h
@@ -1,3 +1,26 @@
+/*
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library 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 1, or (at your option)
+any later version.
+
+The Lucid Widget Library 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.  */
+
+
 #ifndef LWLIB_INTERNAL_H
 #define LWLIB_INTERNAL_H
 
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index df9cba52f63..1bec9c69403 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -1,5 +1,7 @@
 /* Defines some widget utility functions.
-   Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 39b9400c5c8..bd5d9adbf9d 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1,5 +1,7 @@
 /* A general interface to the widgets of different toolkits.
-   Copyright (C) 1992, 1993 Lucid, Inc.
+Copyright (C) 1992, 1993 Lucid, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h
index a141c600526..3b6aa99277c 100644
--- a/lwlib/lwlib.h
+++ b/lwlib/lwlib.h
@@ -1,3 +1,26 @@
+/*
+Copyright (C) 1992, 1993 Lucid, Inc.
+Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007  Free Software Foundation, Inc.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library 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 1, or (at your option)
+any later version.
+
+The Lucid Widget Library 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.  */
+
+
 #ifndef LWLIB_H
 #define LWLIB_H
 
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index bdd2194d500..02ba4520d5c 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1,6 +1,7 @@
 /* Implements a lightweight menubar widget.
-   Copyright (C) 1992 Lucid, Inc.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index f14ffd72dab..ce29c6ac510 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,12 +1,13 @@
 /* Interface of a lightweight menubar widget.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
 The Lucid Widget Library 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)
+the Free Software Foundation; either version 1, or (at your option)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 7ad135ac7b7..c067dd1aafe 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,12 +1,13 @@
 /* Internals of a lightweight menubar widget.
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
 The Lucid Widget Library 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)
+the Free Software Foundation; either version 1, or (at your option)
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,