Merged from miles@gnu.org--gnu-2005 (patch 469)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-469
   Update from CVS

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

Makefile.in

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 # make all	to compile and build Emacs.
 # make install	to install it.

admin/admin.el

@@ -16,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

admin/alloc-colors.c

@@ -15,8 +15,8 @@ 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,
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02111-1307, USA.  */
+Boston, MA 02110-1301, USA.  */
 
 #include <X11/Xlib.h>
 #include <stdio.h>

admin/build-configs

@@ -16,8 +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, Inc., 59 Temple Place - Suite 330,
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 # Build Emacs in several different configurations.
 

admin/cus-test.el

@@ -21,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

admin/diff-tar-files

@@ -16,8 +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, Inc., 59 Temple Place - Suite 330,
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 if [ $# != 2 ]; then
     cat <<EOF

admin/make-emacs

@@ -16,8 +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, Inc., 59 Temple Place - Suite 330,
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.

admin/revdiff

@@ -16,8 +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, Inc., 59 Temple Place - Suite 330,
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 use File::Basename;
 

config.bat

@@ -18,8 +18,8 @@ rem   GNU General Public License for more details.
 
 rem   You should have received a copy of the GNU General Public License
 rem   along with GNU Emacs; see the file COPYING.  If not, write to the
-rem   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+rem   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-rem   Boston, MA 02111-1307, USA.
+rem   Boston, MA 02110-1301, USA.
 rem   ----------------------------------------------------------------------
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem

config.guess

@@ -17,7 +17,7 @@ timestamp='2002-11-13'
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a

config.sub

@@ -21,8 +21,8 @@ timestamp='2002-11-13'
 #
 # 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., 59 Temple Place - Suite 330,
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a

configure.in

@@ -20,8 +20,8 @@ dnl  GNU General Public License for more details.
 dnl
 dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs; see the file COPYING.  If not, write to the
-dnl  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+dnl  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl  Boston, MA 02111-1307, USA.
+dnl  Boston, MA 02110-1301, USA.
 
 AC_PREREQ(2.54)dnl
 AC_INIT(src/lisp.h)
@@ -2813,8 +2813,8 @@ 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,
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02111-1307, USA.  */
+Boston, MA 02110-1301, USA.  */
 
 
 /* No code in Emacs #includes config.h twice, but some bits of code

etc/INTERVIEW

@@ -412,13 +412,12 @@ BYTE: How can you get a copy of that?
 Stallman: Write to the Free Software Foundation, 675 Massachusetts Ave.,
 Cambridge, MA 02139.
 
-[In June 1995, this address changed to:
+[As of April 2005, this address is:
      Free Software Foundation
-     59 Temple Place - Suite 330
+     51 Franklin Street, Fifth Floor
-     Boston, MA  02111-1307,  USA
+     Boston, MA  02110-1301, USA
      Voice:  +1-617-542-5942
      Fax:    +1-617-542-2652
--gnu@prep.ai.mit.edu
 ]
 
 BYTE: What are you going to do when you are done with the GNU system?

etc/calccard.tex

@@ -29,7 +29,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, 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -77,7 +78,8 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs Calc manual, write to the Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 \endgroup}
 

etc/cs-dired-ref.tex

@@ -18,8 +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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
@@ -66,7 +66,8 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 \endgroup}
 

etc/cs-refcard.tex

@@ -27,8 +27,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -82,7 +82,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 

etc/cs-survival.tex

@@ -37,8 +37,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % Czech hyphenation rules applied
 \chyph

etc/de-refcard.tex

@@ -23,8 +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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %

etc/dired-ref.tex

@@ -15,8 +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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
@@ -59,7 +59,8 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 \endgroup}
 

etc/edt-user.doc

@@ -20,7 +20,7 @@ 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.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 ============================================================================
 
@@ -840,8 +840,8 @@ G-C-\: Split Window                     |  FNDNXT  |   Yank   |   CUT    |
 
 ;; You should have received 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,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

etc/emacs.1

@@ -14,8 +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, Inc., 59 Temple Place - Suite 330,
+.\" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-.\" Boston, MA 02111-1307, USA.
+.\" Boston, MA 02110-1301, USA.
 .\"
 '\" t
 .TH EMACS 1 "2001 November 23"

etc/emacs.py

@@ -17,8 +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, Inc., 59 Temple Place - Suite 330,
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 import os, sys, traceback, inspect, rlcompleter, __main__
 

etc/fr-drdref.tex

@@ -16,8 +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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
@@ -61,7 +61,7 @@ la notice de copyright et cette note de permission soient pr\'eserv\'ees
 sur toutes les copies.
 
 Pour obtenir des copies du manuel de GNU Emacs, \'ecrivez \`a la Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 \endgroup}
 

etc/fr-refcard.tex

@@ -24,8 +24,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -71,7 +71,7 @@ la note de copyright et cette note de permission soient conserv\'ees sur
 toutes les copies.
 
 Pour les copies du manuel GNU Emacs, \'ecrivez \`a la Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 

etc/fr-survival.tex

@@ -38,8 +38,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
 

etc/gfdl.1

@@ -12,7 +12,7 @@ Copyright
 .if t \(co
 .if n (c)
 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

etc/gnus-tut.txt

@@ -43,8 +43,8 @@ heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 
 ;; You should have received 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,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 From lars Thu Feb 23 23:20:38 1995
 From: larsi@ifi.uio.no (ding)

etc/orgcard.tex

@@ -32,8 +32,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %

etc/pl-refcard.tex

@@ -48,8 +48,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -92,7 +92,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 

etc/ps-prin0.ps

@@ -17,8 +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, Inc., 59 Temple Place - Suite 330,
+% Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % As a special exception, the copyright holders of this module give
 % you permission to include the module in a Postscript file generated

etc/ps-prin1.ps

@@ -17,8 +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, Inc., 59 Temple Place - Suite 330,
+% Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % As a special exception, the copyright holders of this module give
 % you permission to include the module in a Postscript file generated

etc/refcard.tex

@@ -30,8 +30,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -80,7 +80,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 

etc/ru-refcard.tex

@@ -35,7 +35,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 

etc/sk-dired-ref.tex

@@ -18,8 +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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
@@ -67,7 +67,8 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 \endgroup}
 

etc/sk-refcard.tex

@@ -27,8 +27,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
@@ -84,7 +84,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \endgroup}
 

etc/sk-survival.tex

@@ -37,8 +37,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 % Slovak hyphenation rules applied
 \shyph

etc/survival.tex

@@ -41,8 +41,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, Inc., 59 Temple Place - Suite 330,
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02111-1307, USA.
+% Boston, MA 02110-1301, USA.
 
 \def\versionnumber{1.0}
 \def\year{2000}

etc/vipcard.tex

@@ -73,7 +73,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 \endgroup}
 

etc/viperCard.tex

@@ -81,7 +81,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 \endgroup}
 

leim/MISC-DIC/CTLau-b5.html

@@ -24,7 +24,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 #
 # File Format:

leim/MISC-DIC/CTLau.html

@@ -24,7 +24,7 @@
 # 
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # 
 #
 # File Format:

leim/Makefile.in

@@ -21,8 +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, Inc., 59 Temple Place - Suite 330,
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.

leim/SKK-DIC/SKK-JISYO.L

@@ -21,7 +21,8 @@
 ;; 
 ;; You should have received a copy of the GNU General Public License
 ;; along with SKK, see the file COPYING.  If not, write to the Free
-;; Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Software Foundation Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 ;; 
 ;; okuri-ari entries.
 ¤òs /ÀË/

leim/ja-dic/ja-dic.el

@@ -34,7 +34,8 @@
 ;; 
 ;; You should have received a copy of the GNU General Public License
 ;; along with SKK, see the file COPYING.  If not, write to the Free
-;; Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;; Software Foundation Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 ;; 
 ;; okuri-ari entries.
 

leim/leim-ext.el

@@ -20,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/makefile.w32-in

@@ -17,8 +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, Inc., 59 Temple Place - Suite 330,
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 srcdir=.
 

leim/quail/croatian.el

@@ -20,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 

leim/quail/cyril-jis.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/cyrillic.el

@@ -21,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/czech.el

@@ -20,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/ethiopic.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 

leim/quail/georgian.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/greek.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/hangul.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/hangul3.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/hanja-jis.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/hanja.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/hanja3.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/hebrew.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/indian.el

@@ -20,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/ipa.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/japanese.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/lao.el

@@ -22,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/latin-alt.el

@@ -20,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 

leim/quail/latin-ltx.el

@@ -22,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/latin-post.el

@@ -20,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 

leim/quail/latin-pre.el

@@ -20,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/lrt.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/py-punct.el

@@ -22,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/pypunct-b5.el

@@ -21,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/sgml-input.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/sisheng.el

@@ -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, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/slovak.el

@@ -21,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/symbol-ksc.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; 94.10.24   Written for Mule Ver.2.0 (koaunghi.un@zdv.uni-tuebingen.de)
 ;;; 94.11.04   Updated for Mule Ver.2.1 (koaunghi.un@zdv.uni-tuebingen.de)

leim/quail/thai.el

@@ -22,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/tibetan.el

@@ -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, 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;; Author: Toru TOMABECHI, <Toru.Tomabechi@orient.unil.ch>
 

leim/quail/uni-input.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/viqr.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/vntelex.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

leim/quail/welsh.el

@@ -19,8 +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, Inc., 59 Temple Place - Suite 330,
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02111-1307, USA.
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 

lib-src/Makefile.in

@@ -16,8 +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, Inc., 59 Temple Place - Suite 330,
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.

lib-src/b2m.pl

@@ -14,7 +14,7 @@
 
 # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
 # USA.
 
 # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>.

lib-src/cvtmail.c

@@ -14,8 +14,8 @@ 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,
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02111-1307, USA.  */
+Boston, MA 02110-1301, USA.  */
 
 /* cvtmail:
  * Program to convert oldstyle goslings emacs mail directories into

lib-src/digest-doc.c

@@ -17,8 +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, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02111-1307, USA.
+   Boston, MA 02110-1301, USA.
 
    See also sorted-doc.c, which produces similar output
    but in texinfo format and sorted by function/variable name.  */

lib-src/ebrowse.c

@@ -17,8 +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, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

lib-src/emacsclient.c

@@ -16,8 +16,8 @@ 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,
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02111-1307, USA.  */
+Boston, MA 02110-1301, USA.  */
 
 
 #define NO_SHORTNAMES

lib-src/emacstool.c

@@ -15,8 +15,8 @@ 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,
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02111-1307, USA.  */
+Boston, MA 02110-1301, USA.  */
 
 /*
  * For Emacs in SunView/Sun-Windows: (supported by Sun Unix v3.2 or greater)

lib-src/etags.c

@@ -16,7 +16,7 @@
 
  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 /*
  * Authors:

lib-src/fakemail.c

@@ -15,8 +15,8 @@ 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,
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02111-1307, USA.  */
+Boston, MA 02110-1301, USA.  */
 
 #define NO_SHORTNAMES
 #define _XOPEN_SOURCE 500	/* for cuserid */

lib-src/getopt.c

@@ -18,7 +18,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */

lib-src/getopt.h

@@ -14,7 +14,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef _GETOPT_H
 

lib-src/getopt1.c

@@ -15,7 +15,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

lib-src/grep-changelog

@@ -16,8 +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, Inc., 59 Temple Place - Suite 330,
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02111-1307, USA.
+# Boston, MA 02110-1301, USA.
 
 
 # Extract entries from ChangeLogs matching specified criteria.

lib-src/hexl.c

@@ -15,7 +15,7 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

lib-src/make-docfile.c

@@ -16,8 +16,8 @@ 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,
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02111-1307, USA.  */
+Boston, MA 02110-1301, 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.

lib-src/makefile.w32-in

@@ -15,8 +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, Inc., 59 Temple Place - Suite 330,
+#  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#  Boston, MA 02111-1307, USA.
+#  Boston, MA 02110-1301, USA.
 #
 
 ALL	      = make-docfile hexl ctags etags movemail ebrowse

lib-src/movemail.c

@@ -16,8 +16,8 @@ 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,
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02111-1307, USA.  */
+Boston, MA 02110-1301, 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

lib-src/ntlib.c

@@ -15,8 +15,8 @@ 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,
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02111-1307, USA.
+Boston, MA 02110-1301, USA.
 
    Geoff Voelker (voelker@cs.washington.edu)                         10-8-94
 */

lib-src/ntlib.h

@@ -15,8 +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, Inc., 59 Temple Place - Suite 330,
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02111-1307, USA.
+   Boston, MA 02110-1301, USA.
 
 */