entered into RCS

5 files changed, 33 insertions, 18 deletions

diff --git a/lisp/=mhspool.el b/lisp/=mhspool.el
index 81704e54be6..091c753d1af 100644
--- a/lisp/=mhspool.el
+++ b/lisp/=mhspool.el
@@ -1,7 +1,6 @@
 ;;; mhspool.el --- MH folder access using NNTP for GNU Emacs
 
-;; Copyright (C) 1988, 1989 Fujitsu Laboratories LTD.
-;; Copyright (C) 1988, 1989, 1990 Masanobu UMEDA
+;; Copyright (C) 1988, 1989, 1990 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Maintainer: FSF
@@ -9,20 +8,19 @@
 
 ;; This file is part of GNU Emacs.
 
+;; 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.  No author or distributor
-;; accepts responsibility to anyone for the consequences of using it
-;; or for whether it serves any particular purpose or works at all,
-;; unless he says so in writing.  Refer to the GNU Emacs General Public
-;; License for full details.
-
-;; Everyone is granted permission to copy, modify and redistribute
-;; GNU Emacs, but only under the conditions described in the
-;; GNU Emacs General Public License.   A copy of this license is
-;; supposed to have been given to you along with GNU Emacs so you
-;; can know your rights and responsibilities.  It should be in a
-;; file named COPYING.  Among other things, the copyright notice
-;; and this notice must be preserved on all copies.
+;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;; Commentary:
 
diff --git a/lisp/emerge.el b/lisp/emerge.el
index f4faf572935..126b99c3aa2 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -1,4 +1,5 @@
 ;;; emerge.el --- merge diffs under Emacs control
+;;; The author has placed this file in the public domain.
 
 ;; Author: Dale R. Worley <drw@math.mit.edu>
 ;; Version: 4
diff --git a/lisp/play/meese.el b/lisp/play/meese.el
index db0b7d267fa..3159bf6faef 100644
--- a/lisp/play/meese.el
+++ b/lisp/play/meese.el
@@ -1,4 +1,6 @@
 ;; meese.el --- protect the impressionable young minds of America
+;; This is in the public domain on account of being distributed since
+;; 1985 or 1986 without a copyright notice.
 
 ;; Maintainer: FSF
 ;; Keywords: games
diff --git a/lisp/progmodes/cplus-md.el b/lisp/progmodes/cplus-md.el
index ace790cb80d..45b325d6850 100644
--- a/lisp/progmodes/cplus-md.el
+++ b/lisp/progmodes/cplus-md.el
@@ -1,9 +1,21 @@
 ;;; c++-mode.el --- C++ code editing commands for Emacs
+;;; Copyright (C) 1985, 1992 Free Software Foundation, Inc.
 
-;; Copyright (C) 1985 Richard M. Stallman.
+;; This file is part of GNU Emacs.
 
-;; Author: Dave Detlefs <dld@cs.cmu.edu>
-;; 	Stewart Clamen <clamen@cs.cmu.edu>
+;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
 ;; Maintainer: Dave Detlefs <dld@cs.cmu.edu>
 ;; Keywords: c
 
diff --git a/lisp/unused.el b/lisp/unused.el
index 2a7bfa17a33..1cb956b213f 100644
--- a/lisp/unused.el
+++ b/lisp/unused.el
@@ -1,4 +1,6 @@
 ;;; unused.el --- editing commands in GNU Emacs that turned out not to be used.
+;;; This file is in the public domain, as it was distributed in
+;;; 1985 or 1986 without a copyright notice.  Written by RMS.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations