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

35 files changed, 216 insertions, 240 deletions

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 840fe6d8d07..7bca8665ea2 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -1,10 +1,28 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
 /*
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
+
+This program 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.
+
+This program 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 this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
+
+
+/*
  * XMenu:	MIT Project Athena, X Window system menu package
  *
  *	XMenuActivate -	Maps a given menu to the display and activates
diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c
index d80f1633077..54b55a150c9 100644
--- a/oldXMenu/AddPane.c
+++ b/oldXMenu/AddPane.c
@@ -1,8 +1,6 @@
-#include "copyright.h"
-
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
+
+#include "copyright.h"
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index 0d1085bb3d5..e38b3404b56 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index c3f40630092..c92563d3bc2 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,14 @@
+2007-02-27  Glenn Morris  <rgm@gnu.org>
+
+	* Imakefile: Remove unused file with no explicit legal info.
+	* Makefile.in (distclean): Remove Makefile.
+
+2007-02-25  Glenn Morris  <rgm@gnu.org>
+
+	* XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c:
+	* XMakeAssoc.c: Remove license text in favour of including
+	copyright.h, as was done in original X11 source.
+
 2004-12-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* Activate.c (XMenuActivate): Return XM_NO_SELECT if Escape or C-g
diff --git a/oldXMenu/ChgPane.c b/oldXMenu/ChgPane.c
index 463b57151ed..35caf0917c9 100644
--- a/oldXMenu/ChgPane.c
+++ b/oldXMenu/ChgPane.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c
index 4249982d7d1..4d246f7bdbc 100644
--- a/oldXMenu/ChgSel.c
+++ b/oldXMenu/ChgSel.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index 52560d01a68..11044a66bee 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -1,10 +1,28 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
 /*
+Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
+
+This program 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.
+
+This program 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 this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
+
+
+/*
  * XMenu:	MIT Project Athena, X Window system menu package
  *
  * 	XMenuCreate -	Creates an X window system menu object.
diff --git a/oldXMenu/DelPane.c b/oldXMenu/DelPane.c
index fa300d91142..e7568cff56e 100644
--- a/oldXMenu/DelPane.c
+++ b/oldXMenu/DelPane.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/DelSel.c b/oldXMenu/DelSel.c
index dd63b1c49ee..e7b6ace3845 100644
--- a/oldXMenu/DelSel.c
+++ b/oldXMenu/DelSel.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index f673ed9fcad..117f04ed1c5 100644
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Error.c b/oldXMenu/Error.c
index 35f5920e34a..6f43cbdbf9b 100644
--- a/oldXMenu/Error.c
+++ b/oldXMenu/Error.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/EvHand.c b/oldXMenu/EvHand.c
index d0d2b8efa91..41ba49bcbca 100644
--- a/oldXMenu/EvHand.c
+++ b/oldXMenu/EvHand.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/FindPane.c b/oldXMenu/FindPane.c
index 1ac74ef2b43..fa71c6b39a1 100644
--- a/oldXMenu/FindPane.c
+++ b/oldXMenu/FindPane.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Imakefile b/oldXMenu/Imakefile
deleted file mode 100644
index 2637feb7768..00000000000
--- a/oldXMenu/Imakefile
+++ /dev/null
@@ -1,100 +0,0 @@
-        HEADERS = XMenu.h
-       LINTLIBS = ../lib/X/llib-lX.ln
-   INSTALLFLAGS = $(INSTINCFLAGS)
-         RANLIB = ranlib -t
-
-SRCS =  Activate.c \
-	AddPane.c \
-	AddSel.c \
-	ChgPane.c \
-	ChgSel.c \
-	Create.c \
-	DelPane.c \
-	DelSel.c \
-	Destroy.c \
-	Error.c \
-	EvHand.c \
-	FindPane.c \
-	FindSel.c \
-	InsPane.c \
-	InsSel.c \
-	Internal.c \
-	Locate.c \
-	Post.c \
-	Recomp.c \
-	SetAEQ.c \
-	SetFrz.c \
-	SetPane.c \
-	SetSel.c \
-	XCrAssoc.c \
-	XDelAssoc.c \
-	XDestAssoc.c \
-	XLookAssoc.c \
-	XMakeAssoc.c
-
-OBJS =  Activate.o \
-	AddPane.o \
-	AddSel.o \
-	ChgPane.o \
-	ChgSel.o \
-	Create.o \
-	DelPane.o \
-	DelSel.o \
-	Destroy.o \
-	Error.o \
-	EvHand.o \
-	FindPane.o \
-	FindSel.o \
-	InsPane.o \
-	InsSel.o \
-	Internal.o \
-	Locate.o \
-	Post.o \
-	Recomp.o \
-	SetAEQ.o \
-	SetFrz.o \
-	SetPane.o \
-	SetSel.o \
-	XCrAssoc.o \
-	XDelAssoc.o \
-	XDestAssoc.o \
-	XLookAssoc.o \
-	XMakeAssoc.o
-
-#if DebugOldLibXMenu && ProfileOldLibXMenu
-DebuggedAndProfiledLibraryObjectRule()
-#else
-# if DebugOldLibXMenu
-DebuggedLibraryObjectRule()
-# else
-#  if ProfileOldLibXMenu
-ProfiledLibraryObjectRule()
-#  else
-NormalLibraryObjectRule()
-#  endif
-# endif
-#endif
-
-NormalLibraryTarget(XMenu11,$(OBJS))
-LintLibraryTarget(XMenu11,$(SRCS))
-InstallLibrary(XMenu11,$(USRLIBDIR))
-#if InstallLintLibs
-InstallLintLibrary(XMenu11,$(LINTLIBDIR))
-#endif
-InstallMultiple($(HEADERS),$(INCDIR))
-
-#if ProfileOldLibXMenu
-ProfiledLibraryTarget(XMenu11,$(OBJS))
-InstallLibrary(XMenu11_p,$(USRLIBDIR))
-#endif
-
-#if DebugOldLibXMenu
-DebuggedLibraryTarget(XMenu11,$(OBJS))
-#endif
-
-DependTarget()
-
-NormalLintTarget($(SRCS))
-
-/* arch-tag: bc7d2799-8343-4700-a415-847e7fa12540
-   (do not change this comment) */
diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c
index 980694f4cc4..0aa43935ea2 100644
--- a/oldXMenu/InsPane.c
+++ b/oldXMenu/InsPane.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/InsSel.c b/oldXMenu/InsSel.c
index f4f615b430d..08a0370868c 100644
--- a/oldXMenu/InsSel.c
+++ b/oldXMenu/InsSel.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index f569c6d24df..6ab4ed8ff8b 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -1,8 +1,26 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
+/*
+Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007 Free Software Foundation, Inc.
+
+This program 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.
+
+This program 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 this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
+
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Locate.c b/oldXMenu/Locate.c
index f419ba2a0bb..edd94369e6e 100644
--- a/oldXMenu/Locate.c
+++ b/oldXMenu/Locate.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index e20a583514a..ddbb5b7d315 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -1,3 +1,50 @@
+## Makefile for oldXMenu 
+
+## Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
+
+## Permission to use, copy, modify, and distribute this
+## software and its documentation for any purpose and without
+## fee is hereby granted, provided that the above copyright
+## notice appear in all copies and that both that copyright
+## notice and this permission notice appear in supporting
+## documentation, and that the name of M.I.T. not be used in
+## advertising or publicity pertaining to distribution of the
+## software without specific, written prior permission.
+## M.I.T. makes no representations about the suitability of
+## this software for any purpose.  It is provided "as is"
+## without express or implied warranty.
+
+
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+##   Free Software Foundation, Inc.
+
+## This program 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.
+## 
+## This program 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 this program; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301, USA.
+
+
+### Commentary:
+
+## To the best of our knowledge, this code was originally based on the
+## X11 oldXMenu Makefile, which was automatically generated from the
+## X11 oldXMenu Imakefile. There was no explicit copyright information
+## in the Imakefile, therefore we have added the same MIT license as
+## used by the rest of the oldXMenu code.
+
+
+### Code:
+
 srcdir=@srcdir@
 VPATH=@srcdir@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
@@ -103,6 +150,7 @@ mostlyclean: FRC.mostlyclean
 	rm -f libXMenu11.a ${OBJS} ${EXTRA}
 clean: mostlyclean
 distclean: clean
+	rm -f Makefile
 maintainer-clean: distclean
 
 tags::
diff --git a/oldXMenu/Post.c b/oldXMenu/Post.c
index 281c1197c62..c51f23e7146 100644
--- a/oldXMenu/Post.c
+++ b/oldXMenu/Post.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/README b/oldXMenu/README
index 4d6619b77ae..57365e59f49 100644
--- a/oldXMenu/README
+++ b/oldXMenu/README
@@ -1,6 +1,22 @@
-This directory contains the source code for the X11R2 XMenu library.
+Most of the files in this directory are originally from the X11R2
+XMenu library, distributed by MIT under the terms in the file copyright.h.
 
 As of Release 2 of the X Window System, Version 11 from MIT, the XMenu
-library no longer supported.  It is not used in any software supplied
-by MIT and its use is not encouraged.
+library is no longer supported.  It is not used in any software
+supplied by MIT and its use is not encouraged.
 
+In X11R1, oldXMenu/ was found in the lib/ directory of the X11 source;
+but in X11R2 it was moved to contrib/.
+
+The following files are from the X11 oldXMenu/ directory:
+
+ Activate.c AddPane.c AddSel.c ChgPane.c ChgSel.c Create.c DelPane.c
+ DelSel.c Destroy.c Error.c EvHand.c FindPane.c FindSel.c InsPane.c
+ InsSel.c Internal.c Locate.c Post.c Recomp.c SetAEQ.c SetFrz.c
+ SetPane.c SetSel.c XMenu.h XMenuInt.h (renamed from "XMenuInternal.h")
+
+The following files are from the X11 oldX/ directory:
+
+ X10.h XCrAssoc.c XDelAssoc.c XDestAssoc.c XLookAssoc.c XMakeAssoc.c
+
+This code is used by Emacs in the absence of an X-toolkit.
diff --git a/oldXMenu/Recomp.c b/oldXMenu/Recomp.c
index e985ee3e2a8..230db9e3a13 100644
--- a/oldXMenu/Recomp.c
+++ b/oldXMenu/Recomp.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetAEQ.c b/oldXMenu/SetAEQ.c
index 49ff6646a24..0e81ed55a49 100644
--- a/oldXMenu/SetAEQ.c
+++ b/oldXMenu/SetAEQ.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetFrz.c b/oldXMenu/SetFrz.c
index e6444551951..be9f76f7d80 100644
--- a/oldXMenu/SetFrz.c
+++ b/oldXMenu/SetFrz.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetPane.c b/oldXMenu/SetPane.c
index 61759e3793d..b9ecb7e8706 100644
--- a/oldXMenu/SetPane.c
+++ b/oldXMenu/SetPane.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetSel.c b/oldXMenu/SetSel.c
index e6f57bd0104..aae161322eb 100644
--- a/oldXMenu/SetSel.c
+++ b/oldXMenu/SetSel.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index cc592525a81..e1abcbbe6c5 100644
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -15,8 +15,6 @@
  *
  */
 
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  *	X10.h - Header definition and support file for the C subroutine
diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index c24928c9a3e..874ed81d31f 100644
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -1,18 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
+#include "copyright.h"
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
 
 #include <config.h>
 #include <X11/Xlib.h>
diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c
index 1d69cf8c138..11e8c35a774 100644
--- a/oldXMenu/XDelAssoc.c
+++ b/oldXMenu/XDelAssoc.c
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <X11/Xlib.h>
 #include "X10.h"
diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c
index 706fa680f89..fee53eb756f 100644
--- a/oldXMenu/XDestAssoc.c
+++ b/oldXMenu/XDestAssoc.c
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <X11/Xlib.h>
 #include "X10.h"
diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c
index d275137e57d..0ab71c3e78b 100644
--- a/oldXMenu/XLookAssoc.c
+++ b/oldXMenu/XLookAssoc.c
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index b6b0e470764..d443084ac13 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <config.h>
 #include <X11/Xlib.h>
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h
index ef94cf0a07a..2589ae68cca 100644
--- a/oldXMenu/XMenu.h
+++ b/oldXMenu/XMenu.h
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985	*/
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index 9bf976ccc6b..d2844d8ea2b 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -1,6 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
+
+#include "copyright.h"
+
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/descrip.mms b/oldXMenu/descrip.mms
index 6ecd694bf08..71ae9c203bf 100644
--- a/oldXMenu/descrip.mms
+++ b/oldXMenu/descrip.mms
@@ -1,3 +1,28 @@
+### descrip.mms - port of oldXMenu Makefile to VMS
+
+## Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006,
+##   2007  Free Software Foundation, Inc.
+
+## Author: Richard Levitte
+
+## This program 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.
+
+## This program 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 this program; see the file COPYING.  If not, write to
+## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301, USA.
+
+
+### Code:
+
 !# Uncomment following line if linking temacs complains about missing insque.
 EXTRA=insque.obj