Mercurial > hg > xemacs-beta

changeset 5292:e4305eb6fb8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge some permissions corrections to trunk.
author Stephen J. Turnbull <stephen@xemacs.org>
date Mon, 18 Oct 2010 23:21:23 +0900
parents 85bd42a1e544 (diff) 99de5fd48e87 (current diff)
children 63f247c5da0a
files lisp/ChangeLog lisp/gtk-widget-accessors.el src/ChangeLog tests/ChangeLog
diffstat 50 files changed, 296 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Oct 14 18:50:38 2010 +0100
+++ b/ChangeLog	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* aclocal.m4: Add standard permission boilerplate.
+
 2010-06-02  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* version.sh.in: 
--- a/aclocal.m4	Thu Oct 14 18:50:38 2010 +0100
+++ b/aclocal.m4	Mon Oct 18 23:21:23 2010 +0900
@@ -2,7 +2,21 @@
 dnl Copyright (C) 1998, 1999 J. Kean Johnston.
 dnl Author: J. Kean Johnston <jkj@sco.com>, based on work in libtool.
 dnl This file is part of XEmacs.
-
+dnl
+dnl XEmacs is free software; you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl XEmacs is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with XEmacs; see the file COPYING.  If not, write to the Free
+dnl Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+dnl Boston, MA 02110-1301, USA.
 dnl
 dnl There are several things we care about here. First, we need to find
 dnl out how we create an executable that has its symbols exported, so
--- a/lib-src/ChangeLog	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/ChangeLog	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,22 @@
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* gnuserv.c:
+	* gnuserv.h:
+	* gnuslib.c:
+	Add standard permission boilerplate.
+
+	* ad2c:
+	Add copyright notices based on internal evidence.
+
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* cvtmail.c:
+	* fakemail.c:
+	* make-path.c:
+	* profile.c:
+	* tcp.c:
+	Fix typo (doubled phrase) in permission notice.
+
 2010-06-13  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* ad2c: Correct FSF address in permission notice.
--- a/lib-src/ad2c	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/ad2c	Mon Oct 18 23:21:23 2010 +0900
@@ -1,5 +1,9 @@
 #!/bin/sh
 #
+# Copyright (C) 1990, 1991 George Ferguson
+# Copyright (C) 1992 Charles Hannum
+# Copyright (C) 1992 Matthew Stier
+#
 #	ad2c : Convert app-defaults file to C strings decls.
 #
 #	George Ferguson, ferguson@cs.rcohester.edu, 12 Nov 1990.
--- a/lib-src/config.values.sh	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/config.values.sh	Mon Oct 18 23:21:23 2010 +0900
@@ -4,6 +4,8 @@
 
 # config.values.sh --- create config.values.in from ../configure
 
+# Copyright (C) 1997, 1999 Martin Buchholz
+
 # Author:	Martin Buchholz
 # Maintainer:	Martin Buchholz
 # Keywords:	configure elisp report-xemacs-bugs
--- a/lib-src/cvtmail.c	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/cvtmail.c	Mon Oct 18 23:21:23 2010 +0900
@@ -13,7 +13,7 @@
 
 You should have received a copy of the GNU General Public License
 along with XEmacs; see the file COPYING.  If not, write to
-the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: FSF 19.28. */
--- a/lib-src/fakemail.c	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/fakemail.c	Mon Oct 18 23:21:23 2010 +0900
@@ -15,7 +15,7 @@
 
 You should have received a copy of the GNU General Public License
 along with XEmacs; see the file COPYING.  If not, write to
-the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: FSF 19.28. */
--- a/lib-src/gnuserv.c	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/gnuserv.c	Mon Oct 18 23:21:23 2010 +0900
@@ -2,12 +2,24 @@
  Server code for handling requests from clients and forwarding them
  on to the XEmacs process.
 
+ Copyright (C) 1989 Free Software Foundation, Inc.
+
  This file is part of XEmacs.
 
- Copying is permitted under those conditions described by the GNU
- General Public License.
+ XEmacs 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.
 
- Copyright (C) 1989 Free Software Foundation, Inc.
+ XEmacs 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 XEmacs; see the file COPYING.  If not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
 
  Author: Andy Norman (ange@hplb.hpl.hp.com), based on 'etc/server.c'
          from the 18.52 GNU Emacs distribution.
--- a/lib-src/gnuserv.h	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/gnuserv.h	Mon Oct 18 23:21:23 2010 +0900
@@ -2,12 +2,24 @@
 
  Header file for the XEmacs server and client C code.
 
+ Copyright (C) 1989 Free Software Foundation, Inc.
+
  This file is part of XEmacs.
 
- Copying is permitted under those conditions described by the GNU
- General Public License.
+ XEmacs 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.
 
- Copyright (C) 1989 Free Software Foundation, Inc.
+ XEmacs 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 XEmacs; see the file COPYING.  If not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
 
  Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
          'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
--- a/lib-src/gnuslib.c	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/gnuslib.c	Mon Oct 18 23:21:23 2010 +0900
@@ -1,12 +1,24 @@
 /* -*-C-*-
  Common library code for the XEmacs server and client.
 
+ Copyright (C) 1989 Free Software Foundation, Inc.
+
  This file is part of XEmacs.
 
- Copying is permitted under those conditions described by the GNU
- General Public License.
+ XEmacs 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.
 
- Copyright (C) 1989 Free Software Foundation, Inc.
+ XEmacs 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 XEmacs; see the file COPYING.  If not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
 
  Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
          'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
--- a/lib-src/make-path.c	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/make-path.c	Mon Oct 18 23:21:23 2010 +0900
@@ -15,7 +15,7 @@
 
 You should have received a copy of the GNU General Public License
 along with XEmacs; see the file COPYING.  If not, write to
-the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: FSF 19.28. */
--- a/lib-src/profile.c	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/profile.c	Mon Oct 18 23:21:23 2010 +0900
@@ -18,8 +18,8 @@
 
  You should have received a copy of the GNU General Public License
  along with XEmacs; see the file COPYING.  If not, write to
- the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: FSF 19.28. */
 /* #### Not sure if this is needed for XEmacs. */
--- a/lib-src/tcp.c	Thu Oct 14 18:50:38 2010 +0100
+++ b/lib-src/tcp.c	Mon Oct 18 23:21:23 2010 +0900
@@ -19,7 +19,7 @@
 
 You should have received a copy of the GNU General Public License
 along with XEmacs; see the file COPYING.  If not, write to
-the Free the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 
  *
--- a/lisp/ChangeLog	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/ChangeLog	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,50 @@
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* term/vt100.el:
+	Refer to XEmacs, not GNU Emacs, in permissions.
+
+	* term/bg-mouse.el:
+	* term/sup-mouse.el:
+	Put copyright notice in canonical "Copyright DATE AUTHOR" form.
+	Refer to XEmacs, not GNU Emacs, in permissions.
+
+	* site-load.el:
+	Add permission boilerplate.
+
+	* mule/canna-leim.el:
+	* alist.el:
+	Refer to XEmacs, not APEL/this program, in permissions.
+
+	* mule/canna-leim.el:
+	Remove my copyright, I've assigned it to the FSF.
+
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* gtk.el:
+	* gtk-widget-accessors.el:
+	* gtk-package.el:
+	* gtk-marshal.el:
+	* gtk-compose.el:
+	* gnome.el:
+	Add copyright notice based on internal evidence.
+
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* easymenu.el: Add reference to COPYING to permission notice.
+
+	* gutter.el:
+	* gutter-items.el:
+	* menubar-items.el:
+	Fix typo "Xmacs" in permissions notice.
+
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* auto-save.el:
+	* font.el:
+	* fontconfig.el:
+	* mule/kinsoku.el:
+	Add "part of XEmacs" text to permission notice.
+
 2010-10-14  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* byte-optimize.el (side-effect-free-fns): 
--- a/lisp/alist.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/alist.el	Mon Oct 18 23:21:23 2010 +0900
@@ -5,14 +5,14 @@
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: alist
 
-;; This file is part of APEL (A Portable Emacs Library).
+;; This file is part of XEmacs.
 
-;; This program is free software; you can redistribute it and/or
+;; XEmacs 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
+;; XEmacs 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.
--- a/lisp/auto-save.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/auto-save.el	Mon Oct 18 23:21:23 2010 +0900
@@ -9,6 +9,8 @@
 ;; Keywords: extensions, dumped
 ;; Version: 1.26
 
+;; This file is part of XEmacs.
+
 ;; XEmacs 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)
--- a/lisp/easymenu.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/easymenu.el	Mon Oct 18 23:21:23 2010 +0900
@@ -19,9 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Synched up with: Not synched with FSF but coordinated with the FSF
 ;;;                  easymenu maintainer for compatibility with FSF 20.4.
--- a/lisp/font.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/font.el	Mon Oct 18 23:21:23 2010 +0900
@@ -10,6 +10,8 @@
 ;; Keywords: faces
 ;; Version: 1.52
 
+;; This file is part of XEmacs.
+
 ;; XEmacs 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)
--- a/lisp/fontconfig.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/fontconfig.el	Mon Oct 18 23:21:23 2010 +0900
@@ -10,6 +10,8 @@
 ;; Updated:	05 Mar 2005 by Stephen J. Turnbull
 ;; Keywords: faces
 
+;; This file is part of XEmacs.
+
 ;; XEmacs 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)
--- a/lisp/gnome.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/gnome.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; gnome.el --- GNOME integration for XEmacs/GTK
+;;
+;; Copyright (C) 2000, 2001 William M. Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/lisp/gtk-compose.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/gtk-compose.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; gtk-compose.el --- provide compose-key handling to GTK
+;;
+;; Copyright (C) 2000, 2001 William M. Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/lisp/gtk-marshal.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/gtk-marshal.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; gtk-marshal.el --- regenerate C wrappers for GTK
+;;
+;; Copyright (C) 2000, 2001 William M. Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/lisp/gtk-package.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/gtk-package.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; gtk-package.el --- GTK version of package-ui
+;;
+;; Copyright (C) 2000, 2001 William M. Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/lisp/gtk-widget-accessors.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/gtk-widget-accessors.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; gtk-widget-accessors.el --- GTK wrappers for widgets
+;;
+;; Copyright (C) 2000, 2001 William M. Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/lisp/gtk.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/gtk.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; gtk.el --- provide information about GTK wrapping
+;;
+;; Copyright (C) 2000, 2001 William M. Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/lisp/gutter-items.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/gutter-items.el	Mon Oct 18 23:21:23 2010 +0900
@@ -18,7 +18,7 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with Xmacs; see the file COPYING.  If not, write to the
+;; along with XEmacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
--- a/lisp/gutter.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/gutter.el	Mon Oct 18 23:21:23 2010 +0900
@@ -19,7 +19,7 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with Xmacs; see the file COPYING.  If not, write to the
+;; along with XEmacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
--- a/lisp/menubar-items.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/menubar-items.el	Mon Oct 18 23:21:23 2010 +0900
@@ -22,7 +22,7 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with Xmacs; see the file COPYING.  If not, write to the
+;; along with XEmacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
--- a/lisp/mule/canna-leim.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/mule/canna-leim.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,5 +1,5 @@
 ;;; canna-leim.el --- Canna-related code for LEIM -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 1997  Stephen Turnbull <turnbull@sk.tsukuba.ac.jp>
+;;
 ;; Copyright (C) 1997 Free Software Foundation, Inc.
 ;;
 ;; Shamelessly ripped off from
@@ -13,12 +13,14 @@
 ;; Keywords: japanese, input method, LEIM
 ;; Last Modified: 1997/10/27 10:08:49
 
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of XEmacs.
+
+;; XEmacs 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 versions 2, or (at your option)
 ;; any later version.
 
-;; This program is distributed in the hope that it will be useful
+;; XEmacs 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.
--- a/lisp/mule/kinsoku.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/mule/kinsoku.el	Mon Oct 18 23:21:23 2010 +0900
@@ -4,6 +4,8 @@
 ;; This file is part of Mule (MULtilingual Enhancement of XEmacs).
 ;; This file contains Japanese and Chinese characters.
 
+;; This file is part of XEmacs.
+
 ;; XEmacs 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)
--- a/lisp/site-load.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/site-load.el	Mon Oct 18 23:21:23 2010 +0900
@@ -6,6 +6,21 @@
 
 ;; This file is part of XEmacs.
 
+;; XEmacs 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.
+
+;; XEmacs 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 XEmacs; see the file COPYING.  If not, write to the Free
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
 ;;; Commentary:
 
 ;; This is a prototype site-load.el file.
--- a/lisp/term/bg-mouse.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/term/bg-mouse.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,26 +1,26 @@
 ;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse.
 
-;; Copyright (C) Free Software Foundation, Inc. Oct 1985.
+;; Copyright (C) 1985 Free Software Foundation, Inc.
 
 ;; Author: John Robinson <jr@bbn-unix.arpa>
 ;;	Stephen Gildea <gildea@bbn.com>
 ;; Maintainer: FSF
 ;; Keywords: hardware
 
-;; This file is part of GNU Emacs.
+;; This file is part of XEmacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; XEmacs 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,
+;; XEmacs 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
+;; along with XEmacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; Code:
--- a/lisp/term/sup-mouse.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/term/sup-mouse.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,6 +1,6 @@
 ;;; sup-mouse.el --- supdup mouse support for lisp machines
 
-;; Copyright (C) Free Software Foundation 1985, 1986
+;; Copyright (C) 1985, 1986 Free Software Foundation
 
 ;; Author: Wolfgang Rupprecht
 ;; Maintainer: FSF
@@ -9,20 +9,20 @@
 
 ;;     (from code originally written by John Robinson@bbn for the bitgraph)
 
-;; This file is part of GNU Emacs.
+;; This file is part of XEmacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; XEmacs 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,
+;; XEmacs 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
+;; along with XEmacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; Code:
--- a/lisp/term/vt100.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/lisp/term/vt100.el	Mon Oct 18 23:21:23 2010 +0900
@@ -5,20 +5,20 @@
 ;; Author: FSF
 ;; Keywords: terminals
 
-;;; This file is part of GNU Emacs.
+;;; This file is part of XEmacs.
 ;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
+;;; XEmacs 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,
+;;; XEmacs 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
+;;; along with XEmacs; see the file COPYING.  If not, write to
 ;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; Synched up with: FSF 21.0.103.
--- a/nt/ChangeLog	Thu Oct 14 18:50:38 2010 +0100
+++ b/nt/ChangeLog	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* compface.mak: More permission consistency.
+
 2010-06-13  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* tiff.mak:
--- a/nt/compface.mak	Thu Oct 14 18:50:38 2010 +0100
+++ b/nt/compface.mak	Mon Oct 18 23:21:23 2010 +0900
@@ -16,7 +16,7 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with XEmacs; see the file COPYING.  If not, write to
-## the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor,
+## the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
 ## Boston, MA 02110-1301, USA.
 
 !if !defined(DEBUG_XEMACS)
--- a/src/ChangeLog	Thu Oct 14 18:50:38 2010 +0100
+++ b/src/ChangeLog	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,13 @@
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* ui-byhand.c:
+	* gtk-glue.c:
+	Add copyright notice based on internal evidence.
+
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* number.h: Another permission consistency fix.
+
 2010-10-14  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* fns.c (Fnbutlast, Fbutlast):
--- a/src/gtk-glue.c	Thu Oct 14 18:50:38 2010 +0100
+++ b/src/gtk-glue.c	Mon Oct 18 23:21:23 2010 +0900
@@ -1,4 +1,7 @@
-/*
+/* gtk-glue.c --- GTK interfaces with XEmacs
+
+Copyright (C) 2000, 2001 William M. Perry
+
 This file is part of XEmacs.
 
 XEmacs is free software; you can redistribute it and/or modify it
--- a/src/number.h	Thu Oct 14 18:50:38 2010 +0100
+++ b/src/number.h	Mon Oct 18 23:21:23 2010 +0900
@@ -15,7 +15,7 @@
 
 You should have received a copy of the GNU General Public License
 along with XEmacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin St - Fifth Floor,
+the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
 /* Synched up with: Not in FSF. */
--- a/src/ui-byhand.c	Thu Oct 14 18:50:38 2010 +0100
+++ b/src/ui-byhand.c	Mon Oct 18 23:21:23 2010 +0900
@@ -1,4 +1,8 @@
-/* I really wish this entire file could go away, but there is
+/* ui-byhand.c --- hand-coded GTK functions
+
+Copyright (C) 2000, 2001 William M. Perry
+
+   I really wish this entire file could go away, but there is
    currently no way to do the following in the Foreign Function
    Interface:
 
--- a/tests/ChangeLog	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/ChangeLog	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,23 @@
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* automated/lisp-reader-tests.el:
+	Change references to SXEmacs to XEmacs.
+
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* gtk/xemacs-toolbar.el:
+	* gtk/toolbar-test.el:
+	* gtk/statusbar-test.el:
+	* gtk/gtk-extra-test.el:
+	* gtk/gtk-embedded-test.el:
+	* gtk/gnome-test.el:
+	* gtk/event-stream-tests.el:
+	Add copyright notice based on internal evidence.
+	
+2010-06-14  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* reproduce-crashes.el: Amend "this file" to "XEmacs is free...".
+
 2010-10-14  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* automated/lisp-tests.el (x):
--- a/tests/automated/lisp-reader-tests.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/automated/lisp-reader-tests.el	Mon Oct 18 23:21:23 2010 +0900
@@ -5,20 +5,20 @@
 ;; Created: 2005
 ;; Keywords: tests
 
-;; This file is NOT part of SXEmacs.
+;; This file is part of XEmacs.
 
-;; SXEmacs is free software; you can redistribute it and/or modify it
+;; XEmacs 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.
 
-;; SXEmacs is distributed in the hope that it will be useful, but
+;; XEmacs 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 SXEmacs; see the file COPYING.  If not, write to the Free
+;; along with XEmacs; see the file COPYING.  If not, write to the Free
 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ;; 02111-1307, USA.
 
--- a/tests/gtk/event-stream-tests.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/gtk/event-stream-tests.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,8 @@
+;; event-stream-tests.el --- test the GTK event stream
+;;
+;; Copyright 2000, 2001 William Perry
+;; Seems to be based on the comment at the end of src/event-stream.c.
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/tests/gtk/gnome-test.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/gtk/gnome-test.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; gnome-test.el --- test GNOME integration
+;;
+;; Copyright 2000, 2001 William Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/tests/gtk/gtk-embedded-test.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/gtk/gtk-embedded-test.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; gtk-embedded-test.el --- test GTK embedding in another window
+;;
+;; Copyright 2000, 2001 William Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/tests/gtk/gtk-extra-test.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/gtk/gtk-extra-test.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; gtk-extra-test.el --- test extra GTK widgets
+;;
+;; Copyright 2000, 2001 William Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/tests/gtk/statusbar-test.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/gtk/statusbar-test.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; statusbar-test.el --- test the GTK status bar
+;;
+;; Copyright 2000, 2001 William Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/tests/gtk/toolbar-test.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/gtk/toolbar-test.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; toolbar-test.el --- test the GTK toolbar
+;;
+;; Copyright 2000, 2001 William Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/tests/gtk/xemacs-toolbar.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/gtk/xemacs-toolbar.el	Mon Oct 18 23:21:23 2010 +0900
@@ -1,3 +1,7 @@
+;; xemacs-toolbar.el --- test the XEmacs toolbar under GTK
+;;
+;; Copyright 2000, 2001 William Perry
+;;
 ;; This file is part of XEmacs.
 ;;
 ;; XEmacs is free software; you can redistribute it and/or modify it
--- a/tests/reproduce-crashes.el	Thu Oct 14 18:50:38 2010 +0100
+++ b/tests/reproduce-crashes.el	Mon Oct 18 23:21:23 2010 +0900
@@ -7,7 +7,7 @@
 
 ;; This file is part of XEmacs.
 
-;; This file is free software; you can redistribute it and/or modify it
+;; XEmacs 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.