changeset 14186:ee40177f6c68

Update FSF's address in the preamble.
author Erik Naggum <erik@naggum.no>
date Mon, 15 Jan 1996 09:18:04 +0000
parents aba3b91c8b3d
children fb0b99d7038e
files lib-src/Makefile.in lib-src/cvtmail.c lib-src/emacsclient.c lib-src/emacsserver.c lib-src/emacstool.c lib-src/etags.c lib-src/fakemail.c lib-src/make-docfile.c lib-src/movemail.c lib-src/ntlib.c lib-src/pop.c lib-src/pop.h lib-src/profile.c lib-src/tcp.c lwlib/dispatch.c lwlib/lwlib-Xaw.c lwlib/lwlib-Xlw.c lwlib/lwlib-Xm.c lwlib/lwlib-Xolmb.c lwlib/lwlib-Xolmb.h lwlib/lwlib-XolmbP.h lwlib/lwlib-utils.c lwlib/lwlib.c src/=unexsgi.c src/Makefile.in src/abbrev.c src/alloc.c src/blockinput.h src/buffer.c src/buffer.h src/bytecode.c src/callint.c src/callproc.c src/casefiddle.c src/casetab.c src/cm.c src/cm.h src/cmds.c src/commands.h src/data.c src/dired.c src/dispextern.h src/dispnew.c src/disptab.h src/doc.c src/doprnt.c src/dosfns.c src/dosfns.h src/eval.c src/fileio.c src/filelock.c src/floatfns.c src/fns.c src/frame.c src/frame.h src/indent.c src/indent.h src/insdel.c src/intervals.c src/intervals.h src/keyboard.c src/keyboard.h src/keymap.c src/lastfile.c src/lisp.h src/lread.c src/m/7300.h src/m/acorn.h src/m/alliant-2800.h src/m/alliant.h src/m/alpha.h src/m/altos.h src/m/amdahl.h src/m/apollo.h src/m/att3b.h src/m/aviion.h src/m/celerity.h src/m/clipper.h src/m/cnvrgnt.h src/m/convex.h src/m/cydra5.h src/m/delta.h src/m/delta88k.h src/m/dpx2.h src/m/dual.h src/m/elxsi.h src/m/gec63.h src/m/gould.h src/m/hp800.h src/m/hp9000s300.h src/m/i860.h src/m/ibmps2-aix.h src/m/ibmrs6000.h src/m/ibmrt-aix.h src/m/ibmrt.h src/m/intel386.h src/m/iris4d.h src/m/iris5d.h src/m/irist.h src/m/isi-ov.h src/m/m68k.h src/m/masscomp.h src/m/mega68.h src/m/mg1.h src/m/mips-siemens.h src/m/mips.h src/m/news.h src/m/next.h src/m/nh3000.h src/m/nh4000.h src/m/ns16000.h src/m/ns32000.h src/m/nu.h src/m/orion.h src/m/orion105.h src/m/pfa50.h src/m/plexus.h src/m/pyramid.h src/m/sequent-ptx.h src/m/sequent.h src/m/sparc.h src/m/sps7.h src/m/stride.h src/m/sun1.h src/m/sun2.h src/m/sun386.h src/m/symmetry.h src/m/tad68k.h src/m/tahoe.h src/m/targon31.h src/m/tek4300.h src/m/tekxd88.h src/m/template.h src/m/tower32.h src/m/tower32v3.h src/m/ustation.h src/m/vax.h src/m/wicat.h src/m/windowsnt.h src/m/xps100.h src/macros.c src/macros.h src/marker.c src/mem-limits.h src/minibuf.c src/mocklisp.c src/mocklisp.h src/msdos.c src/msdos.h src/print.c src/process.c src/process.h src/puresize.h src/ralloc.c src/region-cache.c src/region-cache.h src/s/aix3-1.h src/s/bsd4-1.h src/s/bsd4-2.h src/s/bsd4-3.h src/s/cxux.h src/s/dgux.h src/s/dgux5-4-3.h src/s/dgux5-4r2.h src/s/gnu-linux.h src/s/gnu.h src/s/hpux.h src/s/iris3-5.h src/s/iris3-6.h src/s/irix3-3.h src/s/ms-w32.h src/s/msdos.h src/s/newsos5.h src/s/ptx.h src/s/rtu.h src/s/sco4.h src/s/template.h src/s/umax.h src/s/unipl5-0.h src/s/unipl5-2.h src/s/usg5-0.h src/s/usg5-2-2.h src/s/usg5-2.h src/s/usg5-3.h src/s/usg5-4.h src/s/vms.h src/s/xenix.h src/scroll.c src/search.c src/sunfns.c src/syntax.c src/syntax.h src/sysdep.c src/sysselect.h src/syssignal.h src/systime.h src/systty.h src/syswait.h src/term.c src/termchar.h src/termhooks.h src/terminfo.c src/termopts.h src/textprop.c src/uaf.h src/undo.c src/unexaix.c src/unexalpha.c src/unexconvex.c src/unexec.c src/unexelf.c src/unexenix.c src/unexmips.c src/unexnext.c src/unexsni.c src/unexsunos4.c src/unexw32.c src/vm-limit.c src/vms-pp.c src/vms-pwd.h src/vmsdir.h src/vmsfns.c src/vmsgmalloc.c src/vmsmap.c src/vmsproc.c src/vmstime.c src/vmstime.h src/w32.c src/w32.h src/w32console.c src/w32faces.c src/w32fns.c src/w32gui.h src/w32heap.c src/w32heap.h src/w32inevt.c src/w32inevt.h src/w32menu.c src/w32proc.c src/w32reg.c src/w32select.c src/w32term.c src/w32term.h src/w32xfns.c src/widget.c src/widget.h src/widgetprv.h src/window.c src/window.h src/xdisp.c src/xfaces.c src/xfns.c src/xmenu.c src/xrdb.c src/xselect.c src/xterm.c src/xterm.h
diffstat 257 files changed, 733 insertions(+), 463 deletions(-) [+]
line wrap: on
line diff
--- a/lib-src/Makefile.in	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/Makefile.in	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 # 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.  */
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.
--- a/lib-src/cvtmail.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/cvtmail.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 1985, 1994 Free Software Foundation
+
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
@@ -13,7 +14,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* cvtmail:
  * Program to convert oldstyle goslings emacs mail directories into
--- a/lib-src/emacsclient.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/emacsclient.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #define NO_SHORTNAMES
--- a/lib-src/emacsserver.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/emacsserver.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The GNU Emacs edit server process is run as a subprocess of Emacs
--- a/lib-src/emacstool.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/emacstool.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,19 +1,22 @@
 /*
    Copyright (C) 1986, 1988, 1990, 1991 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 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.
 
-   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.
+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 this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /*
  * For Emacs in SunView/Sun-Windows: (supported by Sun Unix v3.2 or greater)
--- a/lib-src/etags.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/etags.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,6 +1,7 @@
 /* Tags file maker to go with GNU Emacs
    Copyright (C) 1984, 87, 88, 89, 93, 94, 95
    Free Software Foundation, Inc. and Ken Arnold
+
 This file is not considered part of GNU Emacs.
 
 This program is free software; you can redistribute it and/or modify
@@ -14,8 +15,8 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /*
  * Authors:
--- a/lib-src/fakemail.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/fakemail.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #define NO_SHORTNAMES
--- a/lib-src/make-docfile.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/make-docfile.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* The arguments given to this program are all the C and Lisp source files
  of GNU Emacs.  .elc and .el and .c files are allowed.
--- a/lib-src/movemail.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/movemail.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Important notice: defining MAIL_USE_FLOCK or MAIL_USE_LOCKF *will
    cause loss of mail* if you do it on a system that does not normally
--- a/lib-src/ntlib.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/ntlib.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,21 +1,22 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
    Copyright (C) 1994 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+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 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.
+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.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                         10-8-94
 */
--- a/lib-src/pop.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/pop.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #define NO_SHORTNAMES	/* Tell config not to load remap.h */
--- a/lib-src/pop.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/pop.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 
--- a/lib-src/profile.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/profile.c	Mon Jan 15 09:18:04 1996 +0000
@@ -3,21 +3,22 @@
 
  Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
 
- This file is part of GNU Emacs.
+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 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.
+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.  */
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /**
--- a/lib-src/tcp.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lib-src/tcp.c	Mon Jan 15 09:18:04 1996 +0000
@@ -19,7 +19,8 @@
 
 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.
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
  *
  * Yasunari, Itoh at PFU limited contributed for Fujitsu UTS and SX/A.
--- a/lwlib/dispatch.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lwlib/dispatch.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
 
 /* 
  *   The function XtWidgetToDispatchTo(), given an XEvent, returns the 
--- a/lwlib/lwlib-Xaw.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lwlib/lwlib-Xaw.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 
--- a/lwlib/lwlib-Xlw.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lwlib/lwlib-Xlw.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "lwlib-Xlw.h"
 #include <X11/StringDefs.h>
--- a/lwlib/lwlib-Xm.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lwlib/lwlib-Xm.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <stdlib.h>
 #include <unistd.h>
--- a/lwlib/lwlib-Xolmb.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lwlib/lwlib-Xolmb.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <X11/IntrinsicP.h>
 #include <X11/Intrinsic.h>
--- a/lwlib/lwlib-Xolmb.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/lwlib/lwlib-Xolmb.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef LW_MENUBAR_H
 #define LW_MENUBAR_H
--- a/lwlib/lwlib-XolmbP.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/lwlib/lwlib-XolmbP.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef LW_MENUBARP_H
 #define LW_MENUBARP_H
--- a/lwlib/lwlib-utils.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lwlib/lwlib-utils.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- a/lwlib/lwlib.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/lwlib/lwlib.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef NeXT
 #undef __STRICT_BSD__ /* ick */
--- a/src/=unexsgi.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/=unexsgi.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,19 +1,22 @@
 /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992
    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 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.
 
-    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.
+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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
--- a/src/Makefile.in	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/Makefile.in	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 # 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.  */
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 # Here are the things that we expect ../configure to edit.
 srcdir=@srcdir@
--- a/src/abbrev.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/abbrev.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/alloc.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/alloc.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Note that this declares bzero on OSF/1.  How dumb.  */
 #include <signal.h>
--- a/src/blockinput.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/blockinput.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* When Emacs is using signal-driven input, the processing of those
--- a/src/buffer.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/buffer.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <sys/types.h>
--- a/src/buffer.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/buffer.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #ifdef USE_TEXT_PROPERTIES
--- a/src/bytecode.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/bytecode.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
 hacked on by jwz@lucid.com 17-jun-91
   o  added a compile-time switch to turn on simple sanity checking;
--- a/src/callint.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/callint.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/callproc.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/callproc.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <signal.h>
--- a/src/casefiddle.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/casefiddle.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/casetab.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/casetab.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Written by Howard Gayle.  See chartab.c for details. */
 
--- a/src/cm.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/cm.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/cm.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/cm.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Holds the minimum and maximum costs for the parametrized capabilities.  */
 struct parmcap
--- a/src/cmds.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/cmds.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/commands.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/commands.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #define Ctl(c) ((c)&037)
--- a/src/data.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/data.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <signal.h>
--- a/src/dired.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/dired.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/dispextern.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/dispextern.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef _DISPEXTERN_H_
 #define _DISPEXTERN_H_
--- a/src/dispnew.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/dispnew.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <signal.h>
--- a/src/disptab.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/disptab.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Access the slots of a display-table, according to their purpose.  */
 
--- a/src/doc.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/doc.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/doprnt.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/doprnt.c	Mon Jan 15 09:18:04 1996 +0000
@@ -17,7 +17,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/dosfns.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/dosfns.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/dosfns.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/dosfns.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 extern int dos_hyper_key;
 extern int dos_super_key;
--- a/src/eval.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/eval.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/fileio.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/fileio.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 
--- a/src/filelock.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/filelock.c	Mon Jan 15 09:18:04 1996 +0000
@@ -14,7 +14,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <sys/types.h>
--- a/src/floatfns.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/floatfns.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* ANSI C requires only these float functions:
--- a/src/fns.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/fns.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/frame.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/frame.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 
--- a/src/frame.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/frame.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Miscellanea.  */
--- a/src/indent.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/indent.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/indent.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/indent.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 struct position
--- a/src/insdel.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/insdel.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/intervals.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/intervals.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* NOTES:
--- a/src/intervals.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/intervals.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef USE_TEXT_PROPERTIES
 #ifndef NORMAL_FACE
--- a/src/keyboard.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/keyboard.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Allow config.h to undefine symbols found here.  */
 #include <signal.h>
--- a/src/keyboard.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/keyboard.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Length of echobuf field in each KBOARD.  */
 
--- a/src/keymap.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/keymap.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/lastfile.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/lastfile.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* How this works:
--- a/src/lisp.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/lisp.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* These are default choices for the types to use.  */
--- a/src/lread.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/lread.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/m/7300.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/7300.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/acorn.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/acorn.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 
--- a/src/m/alliant-2800.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/alliant-2800.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/alliant.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/alliant.h	Mon Jan 15 09:18:04 1996 +0000
@@ -18,7 +18,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* The following line tells the configuration script what sort of 
    operating system this machine is likely to run.
--- a/src/m/alpha.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/alpha.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/altos.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/altos.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/amdahl.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/amdahl.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /*
 This file for amdahl_uts created by modifying the template.h
--- a/src/m/apollo.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/apollo.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/att3b.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/att3b.h	Mon Jan 15 09:18:04 1996 +0000
@@ -17,7 +17,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/aviion.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/aviion.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/celerity.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/celerity.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/clipper.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/clipper.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/cnvrgnt.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/cnvrgnt.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/convex.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/convex.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/cydra5.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/cydra5.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/delta.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/delta.h	Mon Jan 15 09:18:04 1996 +0000
@@ -17,7 +17,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/delta88k.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/delta88k.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/dpx2.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/dpx2.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* The following line tells the configuration script what sort of 
    operating system this machine is likely to run.
--- a/src/m/dual.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/dual.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* The following line tells the configuration script what sort of 
    operating system this machine is likely to run.
--- a/src/m/elxsi.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/elxsi.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* The following line tells the configuration script what sort of 
    operating system this machine is likely to run.
--- a/src/m/gec63.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/gec63.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/gould.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/gould.h	Mon Jan 15 09:18:04 1996 +0000
@@ -21,7 +21,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/hp800.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/hp800.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/hp9000s300.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/hp9000s300.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/i860.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/i860.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/ibmps2-aix.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/ibmps2-aix.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/ibmrs6000.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/ibmrs6000.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/ibmrt-aix.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/ibmrt-aix.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/ibmrt.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/ibmrt.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/intel386.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/intel386.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/iris4d.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/iris4d.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/iris5d.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/iris5d.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/irist.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/irist.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/isi-ov.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/isi-ov.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/m68k.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/m68k.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following three symbols give information on
--- a/src/m/masscomp.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/masscomp.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/mega68.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/mega68.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/mg1.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/mg1.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/mips-siemens.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/mips-siemens.h	Mon Jan 15 09:18:04 1996 +0000
@@ -20,7 +20,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/mips.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/mips.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/news.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/news.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/next.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/next.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Say this machine is a next if not previously defined */
--- a/src/m/nh3000.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/nh3000.h	Mon Jan 15 09:18:04 1996 +0000
@@ -17,7 +17,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This file manually constructed for Harris Night Hawk 4000 (and 5000)
  * series Motorola 88100 and 88110 based machines.
--- a/src/m/nh4000.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/nh4000.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This file manually constructed for Harris Night Hawk 4000 (and 5000)
  * series Motorola 88100 and 88110 based machines.
--- a/src/m/ns16000.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/ns16000.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/ns32000.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/ns32000.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 
--- a/src/m/nu.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/nu.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/orion.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/orion.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/orion105.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/orion105.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/pfa50.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/pfa50.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/plexus.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/plexus.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/pyramid.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/pyramid.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/sequent-ptx.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/sequent-ptx.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/sequent.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/sequent.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/sparc.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/sparc.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* The following line tells the configuration script what sort of 
    operating system this machine is likely to run.
--- a/src/m/sps7.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/sps7.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/stride.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/stride.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/sun1.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/sun1.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/sun2.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/sun2.h	Mon Jan 15 09:18:04 1996 +0000
@@ -17,7 +17,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/sun386.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/sun386.h	Mon Jan 15 09:18:04 1996 +0000
@@ -18,7 +18,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* The following line tells the configuration script what sort of 
    operating system this machine is likely to run.
--- a/src/m/symmetry.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/symmetry.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* CHANGE: [Eric H. Herrin II; eric@ms.uky.edu - 15 Sept 1988] 
  * Modified the sequent.h file for the Sequent Symmetry machine.   
--- a/src/m/tad68k.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/tad68k.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/tahoe.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/tahoe.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/targon31.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/targon31.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/tek4300.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/tek4300.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/tekxd88.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/tekxd88.h	Mon Jan 15 09:18:04 1996 +0000
@@ -17,7 +17,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
--- a/src/m/template.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/template.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/tower32.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/tower32.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/tower32v3.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/tower32v3.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 
--- a/src/m/ustation.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/ustation.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/vax.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/vax.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/wicat.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/wicat.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/m/windowsnt.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/windowsnt.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* The following line tells the configuration script what sort of 
    operating system this machine is likely to run.
--- a/src/m/xps100.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/m/xps100.h	Mon Jan 15 09:18:04 1996 +0000
@@ -17,7 +17,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* The following line tells the configuration script what sort of 
--- a/src/macros.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/macros.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/macros.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/macros.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Kbd macro currently being executed (a string) */
--- a/src/marker.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/marker.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/mem-limits.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/mem-limits.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef MSDOS
 #include <dpmi.h>
--- a/src/minibuf.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/minibuf.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/mocklisp.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/mocklisp.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Compatibility for mocklisp */
--- a/src/mocklisp.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/mocklisp.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This is the main entry point to mocklisp execution.
  When eval sees a mocklisp function being called, it calls here
--- a/src/msdos.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/msdos.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Contributed by Morten Welinder */
 /* New display, keyboard, and mouse control by Kim F. Storm */
--- a/src/msdos.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/msdos.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef _MSDOS_H_
 #define _MSDOS_H_
--- a/src/print.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/print.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/process.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/process.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <signal.h>
--- a/src/process.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/process.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/puresize.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/puresize.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Define PURESIZE, the number of bytes of pure Lisp code to leave space for.
 
--- a/src/ralloc.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/ralloc.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* NOTES:
 
--- a/src/region-cache.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/region-cache.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/region-cache.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/region-cache.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* This code was written by Jim Blandy <jimb@cs.oberlin.edu> to help
--- a/src/s/aix3-1.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/aix3-1.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/bsd4-1.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/bsd4-1.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/bsd4-2.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/bsd4-2.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/bsd4-3.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/bsd4-3.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/cxux.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/cxux.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/dgux.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/dgux.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
--- a/src/s/dgux5-4-3.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/dgux5-4-3.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* NOTE: DGUX5.4R3.00 will not build with the delivered gcc-2.4.5
    compiler.  You must upgraded to at least gcc-2.5.8.  If you are
--- a/src/s/dgux5-4r2.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/dgux5-4r2.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "dgux.h"
 
--- a/src/s/gnu-linux.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/gnu-linux.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This file was put together by Michael K. Johnson and Rik Faith.  */
 
--- a/src/s/gnu.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/gnu.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Get most of the stuff from bsd4.3 */
--- a/src/s/hpux.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/hpux.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/iris3-5.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/iris3-5.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/iris3-6.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/iris3-6.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/irix3-3.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/irix3-3.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/ms-w32.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/ms-w32.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /*
  *      Define symbols to identify the version of Unix this is.
--- a/src/s/msdos.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/msdos.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Note: lots of stuff here was taken from s-msdos.h in demacs. */
 
--- a/src/s/newsos5.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/newsos5.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Use the SysVr4 file for at least base configuration. */
 
--- a/src/s/ptx.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/ptx.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This file was written by Bill Burton <billb@progress.com>.  Parts were
    adapted from m-ptx1-2.h and process.c as distributed with the Emacs 18.57
--- a/src/s/rtu.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/rtu.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/sco4.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/sco4.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Contributed by Ian Lance Taylor, ian@cygnus.com.  */
 
--- a/src/s/template.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/template.h	Mon Jan 15 09:18:04 1996 +0000
@@ -17,7 +17,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/umax.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/umax.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/unipl5-0.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/unipl5-0.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/unipl5-2.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/unipl5-2.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/usg5-0.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/usg5-0.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/usg5-2-2.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/usg5-2-2.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/usg5-2.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/usg5-2.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/usg5-3.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/usg5-3.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/s/usg5-4.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/usg5-4.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This file written by James Van Artsdalen of Dell Computer Corporation.
  * james@bigtex.cactus.org.  Subsequently improved for Dell 2.2 by Eric
--- a/src/s/vms.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/vms.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
--- a/src/s/xenix.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/s/xenix.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /*
  *	Define symbols to identify the version of Unix this is.
--- a/src/scroll.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/scroll.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/search.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/search.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/sunfns.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/sunfns.c	Mon Jan 15 09:18:04 1996 +0000
@@ -25,7 +25,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Author: Jeff Peck, Sun Microsystems, Inc. <peck@sun.com>
 Original ideas by David Kastan and Eric Negaard, SRI International
--- a/src/syntax.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/syntax.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/syntax.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/syntax.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 extern Lisp_Object Qsyntax_table_p;
--- a/src/sysdep.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/sysdep.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <signal.h>
--- a/src/sysselect.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/sysselect.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_SYS_SELECT
 #include <sys/select.h>
--- a/src/syssignal.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/syssignal.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef POSIX_SIGNALS
 
--- a/src/systime.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/systime.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
--- a/src/systty.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/systty.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_TERMIOS
 #define HAVE_TCATTR
--- a/src/syswait.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/syswait.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Define the structure that the wait system call stores.
    On many systems, there is a structure defined for this.
--- a/src/term.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/term.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/termchar.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/termchar.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 extern int baud_rate;		/* Output speed in baud */
--- a/src/termhooks.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/termhooks.h	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Miscellanea.   */
--- a/src/terminfo.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/terminfo.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Define these variables that serve as global parameters to termcap,
    so that we do not need to conditionalize the places in Emacs
--- a/src/termopts.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/termopts.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Nonzero means flash the screen instead of ringing the bell.  */
--- a/src/textprop.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/textprop.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include "lisp.h"
--- a/src/uaf.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/uaf.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /*
  * User Authorization File record formats
--- a/src/undo.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/undo.c	Mon Jan 15 09:18:04 1996 +0000
@@ -3,20 +3,20 @@
 
 This file is part of GNU Emacs.
 
-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.
+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.
 
-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.  */
+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, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/unexaix.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexaix.c	Mon Jan 15 09:18:04 1996 +0000
@@ -2,19 +2,22 @@
 
 /* Copyright (C) 1985, 1986, 1987, 1988 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 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.
 
-    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.
+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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
--- a/src/unexalpha.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexalpha.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/unexconvex.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexconvex.c	Mon Jan 15 09:18:04 1996 +0000
@@ -23,7 +23,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* modified for C-1 arch by jthomp@convex 871103 */
--- a/src/unexec.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexec.c	Mon Jan 15 09:18:04 1996 +0000
@@ -14,7 +14,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/unexelf.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexelf.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,19 +1,22 @@
 /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992
    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 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.
 
-    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.
+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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
--- a/src/unexenix.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexenix.c	Mon Jan 15 09:18:04 1996 +0000
@@ -22,7 +22,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 
--- a/src/unexmips.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexmips.c	Mon Jan 15 09:18:04 1996 +0000
@@ -22,7 +22,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/unexnext.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexnext.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #undef __STRICT_BSD__
--- a/src/unexsni.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexsni.c	Mon Jan 15 09:18:04 1996 +0000
@@ -2,19 +2,22 @@
    Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995
    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 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.
 
-    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.
+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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
 In other words, you are welcome to use, share and improve this program.
 You are forbidden to forbid anyone else to use, share and improve
--- a/src/unexsunos4.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexsunos4.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Contributed by Viktor Dukhovni.  */
 /*
--- a/src/unexw32.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/unexw32.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,23 +1,22 @@
-/*
-   unexec for GNU Emacs on Windows NT.
-
+/* unexec for GNU Emacs on Windows NT.
    Copyright (C) 1994 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+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 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.
+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.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                         8-12-94
 */
--- a/src/vm-limit.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vm-limit.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef emacs
 #include <config.h>
--- a/src/vms-pp.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vms-pp.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
  *
  * Usage:
--- a/src/vms-pwd.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vms-pwd.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifdef VMS
 /* On VMS, we read the UAF file and emulate some of the necessary
--- a/src/vmsdir.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vmsdir.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /*
  * Files-11 Ver. 2 directory structure (VMS V4.x - long names)
--- a/src/vmsfns.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vmsfns.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Written by Mukesh Prasad.  */
 
--- a/src/vmsgmalloc.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vmsgmalloc.c	Mon Jan 15 09:18:04 1996 +0000
@@ -8,20 +8,22 @@
    Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
 		  Written May 1989 by Mike Haertel.
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+This file is part of GNU Emacs.
 
-This library is distributed in the hope that it will be useful,
+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
-Library General Public License for more details.
+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 Library General Public
-License along with this library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
--- a/src/vmsmap.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vmsmap.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Written by Mukesh Prasad.  */
 
--- a/src/vmsproc.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vmsproc.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /*
--- a/src/vmstime.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vmstime.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include "vmstime.h"
--- a/src/vmstime.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/vmstime.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef vmstime_h
 #define vmstime_h
--- a/src/w32.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,21 +1,22 @@
 /* Utility and Unix shadow routines for GNU Emacs on Windows NT.
    Copyright (C) 1994, 1995 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+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 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.
+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.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                         7-29-94
 */
--- a/src/w32.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* File descriptor set emulation.  */
 
--- a/src/w32console.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32console.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,21 +1,22 @@
 /* Terminal hooks for Windows NT port of GNU Emacs.
    Copyright (C) 1992 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+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 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.
+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.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    Tim Fleehart (apollo@online.com)		1-17-92
    Geoff Voelker (voelker@cs.washington.edu)	9-12-93
--- a/src/w32faces.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32faces.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Ported xfaces.c for win32 - Kevin Gallo */
 
--- a/src/w32fns.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32fns.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Added by Kevin Gallo */
 
--- a/src/w32gui.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32gui.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef __WIN32_H__
 #define __WIN32_H__
--- a/src/w32heap.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32heap.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,21 +1,22 @@
 /* Heap management routines for GNU Emacs on Windows NT.
    Copyright (C) 1994 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+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 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.
+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.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)			     7-29-94
 */
--- a/src/w32heap.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32heap.h	Mon Jan 15 09:18:04 1996 +0000
@@ -1,21 +1,22 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
    Copyright (C) 1994 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+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 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.
+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.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)			     7-29-94
 */
--- a/src/w32inevt.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32inevt.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,21 +1,22 @@
 /* Input event support for Windows NT port of GNU Emacs.
    Copyright (C) 1992, 1993, 1995 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+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 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.
+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.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    Drew Bliss                   01-Oct-93
      Adapted from ntkbd.c by Tim Fleehart
--- a/src/w32inevt.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32inevt.h	Mon Jan 15 09:18:04 1996 +0000
@@ -1,21 +1,22 @@
 /* Win32 input routines.
    Copyright (C) 1995 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+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 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.
+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.  */
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef __NTINEVT_H__
 #define __NTINEVT_H__
--- a/src/w32menu.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32menu.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Written by Kevin Gallo.  */
 
--- a/src/w32proc.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32proc.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,21 +1,22 @@
 /* Process support for Windows NT port of GNU EMACS.
    Copyright (C) 1992, 1995 Free Software Foundation, Inc.
 
-   This file is part of GNU Emacs.
+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 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.
+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.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
    Drew Bliss                   Oct 14, 1993
      Adapted from alarm.c by Tim Fleehart
--- a/src/w32reg.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32reg.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,19 +1,22 @@
 /* Emulate the X Resource Manager through the registry.
    Copyright (C) 1990, 1993, 1994 Free Software Foundation.
 
-This program is free software; you can redistribute it and/or modify
+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.
 
-This program is distributed in the hope that it will be useful,
+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 this program; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Written by Kevin Gallo */
 
--- a/src/w32select.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32select.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,21 +1,22 @@
 /* Win32 Selection processing for emacs
    Copyright (C) 1993, 1994 Free Software Foundation.
    
-   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; 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.  */
+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; 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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Written by Kevin Gallo */
 
--- a/src/w32term.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32term.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Added by Kevin Gallo */
 
--- a/src/w32term.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32term.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Added by Kevin Gallo */
 
--- a/src/w32xfns.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/w32xfns.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <signal.h>
 #include <config.h>
--- a/src/widget.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/widget.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
--- a/src/widget.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/widget.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
--- a/src/widgetprv.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/widgetprv.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Emacs 19 face widget ported by Fred Pierresteguy */
 
--- a/src/window.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/window.c	Mon Jan 15 09:18:04 1996 +0000
@@ -16,7 +16,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include "lisp.h"
--- a/src/window.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/window.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Windows are allocated as if they were vectors, but then the
--- a/src/xdisp.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/xdisp.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include <config.h>
--- a/src/xfaces.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/xfaces.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This is derived from work by Lucid (some parts very loosely so).  */
 
--- a/src/xfns.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/xfns.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Completely rewritten by Richard Stallman.  */
 
--- a/src/xmenu.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/xmenu.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* X pop-up deck-of-cards menu facility for gnuemacs.
  *
--- a/src/xrdb.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/xrdb.c	Mon Jan 15 09:18:04 1996 +0000
@@ -1,19 +1,22 @@
 /* Deal with the X Resource Manager.
    Copyright (C) 1990, 1993, 1994 Free Software Foundation.
 
-This program is free software; you can redistribute it and/or modify
+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.
 
-This program is distributed in the hope that it will be useful,
+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 this program; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Written by jla, 4/90 */
 
--- a/src/xselect.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/xselect.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Rewritten by jwz */
--- a/src/xterm.c	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/xterm.c	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Xt features made by Fred Pierresteguy.  */
 
--- a/src/xterm.h	Mon Jan 15 08:32:56 1996 +0000
+++ b/src/xterm.h	Mon Jan 15 09:18:04 1996 +0000
@@ -15,7 +15,8 @@
 
 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.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>